Skip to content

Commit 2293eb0

Browse files
authoredFeb 20, 2019
chore: update defaults (#895)
1 parent 2a2ee7b commit 2293eb0

File tree

5 files changed

+1844
-2986
lines changed

5 files changed

+1844
-2986
lines changed
 

‎.eslintrc.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ module.exports = {
33
plugins: ['prettier'],
44
extends: ['@webpack-contrib/eslint-config-webpack'],
55
rules: {
6-
'prettier/prettier': [
7-
'error',
8-
{ singleQuote: true, trailingComma: 'es5', arrowParens: 'always' },
9-
],
6+
'prettier/prettier': ['error'],
107
},
11-
};
8+
};

‎.prettierrc

-5
This file was deleted.

‎package-lock.json

+1,824-2,964
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+13-7
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@
1313
},
1414
"scripts": {
1515
"start": "npm run build -- -w",
16+
"prebuild": "npm run clean",
1617
"build": "cross-env NODE_ENV=production babel src -d dist --ignore 'src/**/*.test.js' --copy-files",
1718
"clean": "del-cli dist",
1819
"commitlint": "commitlint",
1920
"commitmsg": "commitlint -e $GIT_PARAMS",
2021
"lint": "eslint --cache src test",
21-
"prebuild": "npm run clean",
2222
"prepublish": "npm run build",
2323
"release": "standard-version",
2424
"security": "npm audit",
25-
"test": "jest",
25+
"test:only": "jest",
2626
"test:watch": "jest --watch",
2727
"test:coverage": "jest --collectCoverageFrom='src/**/*.js' --coverage",
28+
"pretest": "npm run lint",
29+
"test": "npm run test:only",
2830
"ci:lint": "npm run lint && npm run security",
29-
"ci:test": "npm run test -- --runInBand",
31+
"ci:test": "npm run test:only -- --runInBand",
3032
"ci:coverage": "npm run test:coverage -- --runInBand",
3133
"ci:lint:commits": "commitlint --from=origin/master --to=${CIRCLE_SHA1}",
3234
"defaults": "webpack-defaults"
@@ -60,8 +62,7 @@
6062
"@commitlint/config-conventional": "^7.1.2",
6163
"@webpack-contrib/defaults": "^3.0.0",
6264
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
63-
"babel-core": "^7.0.0-bridge.0",
64-
"babel-jest": "^23.6.0",
65+
"babel-jest": "^24.1.0",
6566
"cross-env": "^5.2.0",
6667
"del": "^3.0.0",
6768
"del-cli": "^1.1.0",
@@ -70,15 +71,15 @@
7071
"eslint-plugin-prettier": "^3.0.0",
7172
"file-loader": "^3.0.1",
7273
"husky": "^1.2.0",
73-
"jest": "^23.6.0",
74+
"jest": "^24.1.0",
7475
"lint-staged": "^8.1.0",
7576
"memory-fs": "^0.4.1",
7677
"postcss-loader": "^3.0.0",
7778
"postcss-preset-env": "^6.4.0",
7879
"prettier": "^1.15.2",
7980
"sass": "^1.15.1",
8081
"sass-loader": "^7.1.0",
81-
"standard-version": "^4.0.0",
82+
"standard-version": "^5.0.0",
8283
"strip-ansi": "^5.0.0",
8384
"webpack": "^4.26.1"
8485
},
@@ -117,5 +118,10 @@
117118
"extends": [
118119
"@commitlint/config-conventional"
119120
]
121+
},
122+
"prettier": {
123+
"singleQuote": true,
124+
"trailingComma": "es5",
125+
"arrowParens": "always"
120126
}
121127
}

‎test/__snapshots__/sourceMap-option.test.js.snap

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Array [
9898
"",
9999
Object {
100100
"file": "basic.css",
101-
"mappings": "AAAA;EACE,WAAW;CACZ",
101+
"mappings": "AAAA;EACE,UAAU;AACZ",
102102
"names": Array [],
103103
"sourceRoot": "",
104104
"sources": Array [
@@ -131,7 +131,7 @@ Array [
131131
"",
132132
Object {
133133
"file": "basic.css",
134-
"mappings": "AAAA;EACE,WAAW;CACZ",
134+
"mappings": "AAAA;EACE,UAAU;AACZ",
135135
"names": Array [],
136136
"sourceRoot": "",
137137
"sources": Array [
@@ -164,7 +164,7 @@ Array [
164164
"",
165165
Object {
166166
"file": "basic.css",
167-
"mappings": "AAAA;ECCE,WAAW;CACZ",
167+
"mappings": "AAAA;ECCE,UAAU;AACZ",
168168
"names": Array [],
169169
"sourceRoot": "",
170170
"sources": Array [
@@ -199,7 +199,7 @@ Array [
199199
"",
200200
Object {
201201
"file": "basic.css",
202-
"mappings": "AAAA;ECCE,WAAW;CACZ",
202+
"mappings": "AAAA;ECCE,UAAU;AACZ",
203203
"names": Array [],
204204
"sourceRoot": "",
205205
"sources": Array [
@@ -234,7 +234,7 @@ Array [
234234
"",
235235
Object {
236236
"file": "basic.css",
237-
"mappings": "AAAA;EACE,WAAW;CACZ",
237+
"mappings": "AAAA;EACE,UAAU;AACZ",
238238
"names": Array [],
239239
"sourceRoot": "",
240240
"sources": Array [

0 commit comments

Comments
 (0)
Please sign in to comment.