Skip to content

Commit 57b0c8c

Browse files
michael-ciniawskyjoshwiens
michael-ciniawsky
authored and
joshwiens
committed
build(defaults): update webpack-defaults v1.6.0...2.0.0 (#161)
1 parent 94b21d4 commit 57b0c8c

File tree

10 files changed

+244
-60
lines changed

10 files changed

+244
-60
lines changed

‎.circleci/config.yml

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
unit_tests: &unit_tests
2+
steps:
3+
- checkout
4+
- setup_remote_docker
5+
- restore_cache:
6+
key: dependency-cache-{{ checksum "package.json" }}
7+
- run:
8+
name: NPM Rebuild
9+
command: npm rebuild
10+
- run:
11+
name: Run unit tests.
12+
command: npm run ci:test
13+
canary_tests: &canary_tests
14+
steps:
15+
- checkout
16+
- setup_remote_docker
17+
- restore_cache:
18+
key: dependency-cache-{{ checksum "package.json" }}
19+
- run:
20+
name: NPM Rebuild
21+
command: npm rebuild
22+
- run:
23+
name: Install Webpack Canary
24+
command: npm i --no-save webpack@next
25+
- run:
26+
name: Run unit tests.
27+
command: npm run ci:test
28+
29+
version: 2
30+
jobs:
31+
dependency_cache:
32+
docker:
33+
- image: webpackcontrib/circleci-node-base:latest
34+
steps:
35+
- checkout
36+
- setup_remote_docker
37+
- restore_cache:
38+
key: dependency-cache-{{ checksum "package.json" }}
39+
- run:
40+
name: Install Dependencies
41+
command: npm install
42+
- save_cache:
43+
key: dependency-cache-{{ checksum "package.json" }}
44+
paths:
45+
- ./node_modules
46+
47+
node8_webpack_latest:
48+
docker:
49+
- image: webpackcontrib/circleci-node8:latest
50+
steps:
51+
- checkout
52+
- setup_remote_docker
53+
- restore_cache:
54+
key: dependency-cache-{{ checksum "package.json" }}
55+
- run:
56+
name: NPM Rebuild
57+
command: npm rebuild
58+
- run:
59+
name: Run unit tests.
60+
command: npm run ci:coverage
61+
- run:
62+
name: Submit coverage data to codecov.
63+
command: bash <(curl -s https://codecov.io/bash)
64+
when: on_success
65+
node6_webpack_latest:
66+
docker:
67+
- image: webpackcontrib/circleci-node6:latest
68+
<<: *unit_tests
69+
node9_webpack_latest:
70+
docker:
71+
- image: webpackcontrib/circleci-node9:latest
72+
<<: *unit_tests
73+
node8_webpack_canary:
74+
docker:
75+
- image: webpackcontrib/circleci-node8:latest
76+
<<: *canary_tests
77+
analysis:
78+
docker:
79+
- image: webpackcontrib/circleci-node-base:latest
80+
steps:
81+
- checkout
82+
- setup_remote_docker
83+
- restore_cache:
84+
key: dependency-cache-{{ checksum "package.json" }}
85+
- run:
86+
name: NPM Rebuild
87+
command: npm rebuild
88+
- run:
89+
name: Run linting.
90+
command: npm run lint
91+
- run:
92+
name: Run NSP Security Check.
93+
command: npm run security
94+
- run:
95+
name: Validate Commit Messages
96+
command: npm run ci:lint:commits
97+
publish:
98+
docker:
99+
- image: webpackcontrib/circleci-node-base:latest
100+
steps:
101+
- checkout
102+
- setup_remote_docker
103+
- restore_cache:
104+
key: dependency-cache-{{ checksum "package.json" }}
105+
- run:
106+
name: NPM Rebuild
107+
command: npm rebuild
108+
- run:
109+
name: Validate Commit Messages
110+
command: npm run release:validate
111+
- run:
112+
name: Publish to NPM
113+
command: printf "noop running conventional-github-releaser"
114+
115+
version: 2.0
116+
workflows:
117+
version: 2
118+
validate-publish:
119+
jobs:
120+
- dependency_cache
121+
- node6_webpack_latest:
122+
requires:
123+
- dependency_cache
124+
filters:
125+
tags:
126+
only: /.*/
127+
- node8_webpack_latest:
128+
requires:
129+
- dependency_cache
130+
filters:
131+
tags:
132+
only: /.*/
133+
- node9_webpack_latest:
134+
requires:
135+
- dependency_cache
136+
filters:
137+
tags:
138+
only: /.*/
139+
- node8_webpack_canary:
140+
requires:
141+
- dependency_cache
142+
filters:
143+
tags:
144+
only: /.*/
145+
- analysis:
146+
requires:
147+
- node6_webpack_latest
148+
- node8_webpack_latest
149+
- node9_webpack_latest
150+
filters:
151+
tags:
152+
only: /.*/
153+
- publish:
154+
requires:
155+
- node6_webpack_latest
156+
- node8_webpack_latest
157+
- node9_webpack_latest
158+
- analysis
159+
filters:
160+
branches:
161+
only:
162+
- master

‎.eslintrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.eslintrc.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module.exports = {
2+
root: true,
3+
plugins: ['prettier'],
4+
extends: ['@webpack-contrib/eslint-config-webpack'],
5+
rules: {
6+
'prettier/prettier': [
7+
'error',
8+
{ singleQuote: true, trailingComma: 'es5', arrowParens: 'always' },
9+
],
10+
},
11+
};

‎.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# These are the default owners for everything in
2+
# webpack-contrib
3+
@webpack-contrib/org-maintainers
4+
5+
# Add repository specific users / groups
6+
# below here for libs that are not maintained by the org.

‎.prettierrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "es5",
4+
"arrowParens": "always"
5+
}

‎.travis.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ environment:
1313
webpack_version: latest
1414
job_part: test
1515
- nodejs_version: '8'
16-
webpack_version: 4.0.0-alpha.0
16+
webpack_version: next
1717
job_part: test
1818
build: 'off'
1919
matrix:
@@ -27,4 +27,4 @@ before_test:
2727
test_script:
2828
- node --version
2929
- npm --version
30-
- cmd: npm run appveyor:%job_part%
30+
- cmd: npm run ci:%job_part%

‎codecov.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
coverage:
2+
precision: 2
3+
round: down
4+
range: 70...100
5+
6+
status:
7+
project: no
8+
patch: yes
9+
10+
comment: 'off'

‎commitlint.config.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/* eslint-disable */
2+
const Configuration = {
3+
extends: ['@commitlint/config-angular'],
4+
5+
rules: {
6+
'body-leading-blank': [1, 'always'],
7+
'footer-leading-blank': [1, 'always'],
8+
'header-max-length': [2, 'always', 72],
9+
'scope-case': [2, 'always', 'lower-case'],
10+
'subject-case': [2, 'never', ['start-case', 'pascal-case', 'upper-case']],
11+
'subject-empty': [2, 'never'],
12+
'subject-full-stop': [2, 'never', '.'],
13+
'type-case': [2, 'always', 'lower-case'],
14+
'type-empty': [2, 'never'],
15+
'type-enum': [
16+
'build',
17+
'chore',
18+
'ci',
19+
'docs',
20+
'feat',
21+
'fix',
22+
'perf',
23+
'refactor',
24+
'revert',
25+
'style',
26+
'test',
27+
],
28+
},
29+
};
30+
31+
module.exports = Configuration;

‎package.json

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,36 @@
1818
"schema-utils": "^0.4.2"
1919
},
2020
"devDependencies": {
21+
"@commitlint/cli": "^5.0.0",
22+
"@commitlint/config-angular": "^5.0.0",
23+
"@webpack-contrib/eslint-config-webpack": "^2.0.0",
2124
"babel-cli": "^6.0.0",
2225
"babel-jest": "^21.0.0",
2326
"babel-plugin-transform-object-rest-spread": "^6.0.0",
2427
"babel-polyfill": "^6.0.0",
2528
"babel-preset-env": "^1.0.0",
29+
"conventional-github-releaser": "^2.0.0",
2630
"cross-env": "^5.0.0",
2731
"del": "^3.0.0",
2832
"del-cli": "^1.0.0",
2933
"eslint": "^4.0.0",
30-
"eslint-config-webpack": "^1.0.0",
3134
"eslint-plugin-import": "^2.0.0",
35+
"eslint-plugin-prettier": "^2.0.0",
3236
"file-loader": "^1.0.0",
37+
"husky": "^0.14.3",
3338
"jest": "^21.0.0",
3439
"jsdom": "^11.0.0",
3540
"lint-staged": "^6.0.0",
3641
"memory-fs": "^0.4.0",
3742
"nsp": "^3.0.0",
3843
"pre-commit": "^1.0.0",
44+
"prettier": "^1.9.2",
3945
"standard-version": "^4.0.0",
4046
"webpack": "^3.0.0",
41-
"webpack-defaults": "^1.6.0"
47+
"webpack-defaults": "^2.0.0-beta.0"
4248
},
4349
"peerDependencies": {
44-
"webpack": "^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0"
50+
"webpack": "^3.0.0 || ^4.0.0"
4551
},
4652
"scripts": {
4753
"start": "npm run build -- -w",
@@ -55,11 +61,16 @@
5561
"test": "jest",
5662
"test:watch": "jest --watch",
5763
"test:coverage": "jest --collectCoverageFrom='src/**/*.js' --coverage",
58-
"travis:coverage": "npm run test:coverage -- --runInBand",
59-
"travis:lint": "npm run lint && npm run security",
60-
"travis:test": "npm run test -- --runInBand",
64+
"commitlint": "commitlint",
65+
"commitmsg": "commitlint -e $GIT_PARAMS",
66+
"ci:lint": "npm run lint && npm run security",
67+
"ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}",
68+
"ci:test": "npm run test -- --runInBand",
69+
"ci:coverage": "npm run test:coverage -- --runInBand",
6170
"appveyor:test": "npm run test",
6271
"webpack-defaults": "webpack-defaults",
72+
"release:ci": "conventional-github-releaser -p angular",
73+
"release:validate": "commitlint --from=$(git describe --tags --abbrev=0) --to=$(git rev-parse HEAD)",
6374
"release": "standard-version"
6475
},
6576
"repository": "https://github.com/webpack-contrib/html-loader.git",

0 commit comments

Comments
 (0)