Skip to content
This repository was archived by the owner on Mar 17, 2021. It is now read-only.

Commit 6519eb2

Browse files
authoredFeb 12, 2019
chore: update webpack defaults (#67)
1 parent 062b267 commit 6519eb2

8 files changed

+2008
-2665
lines changed
 

‎.circleci/config.yml

+26-26
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ canary_tests: &canary_tests
2929
command: npm i --no-save webpack@next
3030
- run:
3131
name: Run Test.
32-
command: if [[ $(compver --name webpack --gte next --lt latest) < 1 ]] ; then printf "Next is older than Latest - Skipping Canary Suite"; else npm run ci:test; fi
32+
command: if [[ $(compver --name webpack --gte next --lt latest) < 1 ]] ; then printf "Next is older than Latest - Skipping Canary Suite"; else npm run ci:test || true; fi
3333

3434
version: 2
3535
jobs:
@@ -50,6 +50,28 @@ jobs:
5050
key: dependency-cache-{{ checksum "package-lock.json" }}
5151
paths:
5252
- ./node_modules
53+
analysis:
54+
docker:
55+
- image: webpackcontrib/circleci-node-base:latest
56+
steps:
57+
- checkout
58+
- restore_cache:
59+
key: dependency-cache-{{ checksum "package-lock.json" }}
60+
- run:
61+
name: Install Latest NPM.
62+
command: npm i -g npm@latest
63+
- run:
64+
name: NPM Install.
65+
command: npm ci
66+
- run:
67+
name: Run linting.
68+
command: npm run lint
69+
- run:
70+
name: Run NPM Audit.
71+
command: npm run security
72+
- run:
73+
name: Validate Commit Messages.
74+
command: npm run ci:lint:commits
5375
node6-latest:
5476
docker:
5577
- image: webpackcontrib/circleci-node6:latest
@@ -78,32 +100,10 @@ jobs:
78100
name: Submit coverage data to codecov.
79101
command: bash <(curl -s https://codecov.io/bash)
80102
when: on_success
81-
node10-canary:
103+
node8-canary:
82104
docker:
83-
- image: webpackcontrib/circleci-node10:latest
105+
- image: webpackcontrib/circleci-node8:latest
84106
<<: *canary_tests
85-
analysis:
86-
docker:
87-
- image: webpackcontrib/circleci-node-base:latest
88-
steps:
89-
- checkout
90-
- restore_cache:
91-
key: dependency-cache-{{ checksum "package-lock.json" }}
92-
- run:
93-
name: Install Latest NPM.
94-
command: npm i -g npm@latest
95-
- run:
96-
name: NPM Install.
97-
command: npm ci
98-
- run:
99-
name: Run linting.
100-
command: npm run lint
101-
- run:
102-
name: Run NPM Audit.
103-
command: npm run security
104-
- run:
105-
name: Validate Commit Messages.
106-
command: npm run ci:lint:commits
107107

108108
workflows:
109109
version: 2
@@ -136,7 +136,7 @@ workflows:
136136
filters:
137137
tags:
138138
only: /.*/
139-
- node10-canary:
139+
- node8-canary:
140140
requires:
141141
- analysis
142142
- node6-latest

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ insert_final_newline = true
99
trim_trailing_whitespace = true
1010

1111
[*.md]
12-
insert_final_newline = false
12+
insert_final_newline = true
1313
trim_trailing_whitespace = false

‎.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ This PR contains a:
3232
migration path for existing applications.
3333
-->
3434

35-
### Additional Info
35+
### Additional Info

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ Thumbs.db
1313
.vscode
1414
*.sublime-project
1515
*.sublime-workspace
16+
*.iml

‎README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ module.exports = {
4444
rules: [
4545
{
4646
test: /\.txt$/i,
47-
use: 'raw-loader'
48-
}
49-
]
50-
}
51-
}
47+
use: 'raw-loader',
48+
},
49+
],
50+
},
51+
};
5252
```
5353

5454
Or from the command-line:
@@ -89,11 +89,11 @@ Please take a moment to read our contributing guidelines if you haven't yet done
8989
[node-url]: https://nodejs.org
9090
[deps]: https://david-dm.org/webpack-contrib/raw-loader.svg
9191
[deps-url]: https://david-dm.org/webpack-contrib/raw-loader
92-
[tests]: https://img.shields.io/circleci/project/github/webpack-contrib/raw-loader.svg
92+
[tests]: https://img.shields.io/circleci/project/github/webpack-contrib/raw-loader.svg
9393
[tests-url]: https://circleci.com/gh/webpack-contrib/raw-loader
9494
[cover]: https://codecov.io/gh/webpack-contrib/raw-loader/branch/master/graph/badge.svg
9595
[cover-url]: https://codecov.io/gh/webpack-contrib/raw-loader
9696
[chat]: https://img.shields.io/badge/gitter-webpack%2Fwebpack-brightgreen.svg
9797
[chat-url]: https://gitter.im/webpack/webpack
9898
[size]: https://packagephobia.now.sh/badge?p=raw-loader
99-
[size-url]: https://packagephobia.now.sh/result?p=raw-loader
99+
[size-url]: https://packagephobia.now.sh/result?p=raw-loader

‎appveyor.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,28 @@ cache:
99
- '%APPDATA%\npm-cache'
1010
environment:
1111
matrix:
12-
- nodejs_version: '11'
13-
webpack_version: latest
14-
job_part: test
15-
- nodejs_version: '10'
12+
- nodejs_version: '6'
1613
webpack_version: latest
1714
job_part: test
1815
- nodejs_version: '8'
1916
webpack_version: latest
2017
job_part: test
21-
- nodejs_version: '6'
18+
- nodejs_version: '10'
2219
webpack_version: latest
2320
job_part: test
24-
- nodejs_version: '6'
21+
- nodejs_version: '11'
2522
webpack_version: latest
26-
job_part: next
23+
job_part: test
24+
- nodejs_version: '8'
25+
webpack_version: next
26+
job_part: test
2727
build: 'off'
2828
matrix:
2929
fast_finish: true
30+
allow_failures:
31+
- nodejs_version: '8'
32+
webpack_version: next
33+
job_part: test
3034
install:
3135
- ps: Install-Product node $env:nodejs_version x64
3236
- npm i -g npm@latest
@@ -35,8 +39,7 @@ install:
3539
before_test:
3640
- cmd: npm install webpack@%webpack_version%
3741
test_script:
38-
- node --version
3942
- node --version
4043
- npm --version
4144
- cmd: FOR /F %%I in ('compver --name webpack --gte %webpack_version% --lt latest') do SET COMPARED_VERSION_RESULT=%%I
42-
- cmd: IF %COMPARED_VERSION_RESULT% NEQ -1 (npm run ci:test) ELSE (ECHO "Next is older than Latest - Skipping Canary Suite")
45+
- cmd: IF %COMPARED_VERSION_RESULT% NEQ -1 (npm run ci:%job_part%) ELSE (ECHO "Next is older than Latest - Skipping Canary Suite")

‎package-lock.json

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

‎package.json

+12-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,19 @@
1212
"node": ">= 6.9.0"
1313
},
1414
"scripts": {
15-
"lint": "eslint --cache 'index.js' test",
15+
"start": "npm run build -- -w",
16+
"commitlint": "commitlint",
17+
"commitmsg": "commitlint -e $GIT_PARAMS",
18+
"lint": "eslint --cache index.js test",
1619
"release": "standard-version",
1720
"security": "npm audit",
1821
"test": "jest",
1922
"test:watch": "jest --watch",
2023
"test:coverage": "jest --collectCoverageFrom='index.js' --coverage",
2124
"ci:lint": "npm run lint && npm run security",
22-
"ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}",
2325
"ci:test": "npm run test -- --runInBand",
2426
"ci:coverage": "npm run test:coverage -- --runInBand",
27+
"ci:lint:commits": "commitlint --from=origin/master --to=${CIRCLE_SHA1}",
2528
"defaults": "webpack-defaults"
2629
},
2730
"files": [
@@ -42,24 +45,26 @@
4245
"@babel/preset-env": "^7.1.6",
4346
"@commitlint/cli": "^7.1.6",
4447
"@commitlint/config-conventional": "^7.1.2",
48+
"@webpack-contrib/defaults": "^3.0.5",
4549
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
46-
"babel-core": "^7.0.0-bridge.0",
47-
"babel-jest": "^23.6.0",
50+
"babel-jest": "^24.1.0",
4851
"cross-env": "^5.2.0",
4952
"del": "^3.0.0",
5053
"del-cli": "^1.1.0",
5154
"eslint": "^5.10.0",
5255
"eslint-plugin-import": "^2.14.0",
5356
"eslint-plugin-prettier": "^3.0.0",
5457
"husky": "^1.2.0",
55-
"jest": "^23.6.0",
58+
"jest": "^24.1.0",
5659
"lint-staged": "^8.1.0",
5760
"memory-fs": "^0.4.1",
5861
"prettier": "^1.11.1",
5962
"standard-version": "^4.3.0",
60-
"webpack": "^4.3.0",
61-
"webpack-defaults": "^2.1.1"
63+
"webpack": "^4.3.0"
6264
},
65+
"keywords": [
66+
"webpack"
67+
],
6368
"babel": {
6469
"presets": [
6570
[

0 commit comments

Comments
 (0)
This repository has been archived.