Skip to content

Commit 108cccd

Browse files
committed
Merge branch 'dev'
2 parents 1e601ae + 99000aa commit 108cccd

File tree

4 files changed

+5
-31
lines changed

4 files changed

+5
-31
lines changed

template/framework-base/_package.json

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
88
"donaldshen <[email protected]>"
99
],
10-
"keywords": [
11-
"vue",
12-
"nuxt"
13-
],
10+
"keywords": ["vue", "nuxt"],
1411
"private": true,
1512
"engines": {
1613
"npm": ">= 5.2.0"
@@ -51,7 +48,6 @@
5148
"@commitlint/config-conventional": "8.2.0",
5249
"babel-eslint": "8.2.6",
5350
"babel-jest": "24.9.0",
54-
"core-js": "3.6.4",
5551
"cross-env": "5.2.1",
5652
"eslint": "4.19.1",
5753
"eslint-config-prettier": "6.8.0",
@@ -82,20 +78,9 @@
8278
}
8379
},
8480
"lint-staged": {
85-
"*.{js,vue}": [
86-
"eslint --fix",
87-
"git add"
88-
],
89-
"*.{vue,less}": [
90-
"stylelint --fix",
91-
"git add"
92-
],
93-
"*.{md,json}": [
94-
"prettier --write",
95-
"git add"
96-
]
81+
"*.{js,vue}": ["eslint --fix", "git add"],
82+
"*.{vue,less}": ["stylelint --fix", "git add"],
83+
"*.{md,json}": ["prettier --write", "git add"]
9784
},
98-
"browserslist": [
99-
"defaults"
100-
]
85+
"browserslist": ["defaults"]
10186
}

template/framework-base/nuxt.config.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,6 @@ module.exports = {
6767
publicPath,
6868
extractCSS: isProd,
6969
babel: {
70-
presets: [
71-
[
72-
'@babel/env',
73-
{
74-
useBuiltIns: 'usage',
75-
corejs: 3,
76-
},
77-
],
78-
],
7970
plugins: [
8071
'@babel/plugin-proposal-optional-chaining',
8172
'@babel/plugin-proposal-nullish-coalescing-operator',

test/snapshots/index.test.js.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ Generated by [AVA](https://ava.li).
124124
'@commitlint/config-conventional': '8.2.0',
125125
'babel-eslint': '8.2.6',
126126
'babel-jest': '24.9.0',
127-
'core-js': '3.6.4',
128127
'cross-env': '5.2.1',
129128
eslint: '4.19.1',
130129
'eslint-config-prettier': '6.8.0',
@@ -300,7 +299,6 @@ Generated by [AVA](https://ava.li).
300299
'babel-eslint': '8.2.6',
301300
'babel-jest': '24.9.0',
302301
'babel-plugin-import': '1.13.0',
303-
'core-js': '3.6.4',
304302
'cross-env': '5.2.1',
305303
eslint: '4.19.1',
306304
'eslint-config-prettier': '6.8.0',

test/snapshots/index.test.js.snap

-15 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)