Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 7ae32d9

Browse files
joshwiensjoshwiens
authored
refactor: Apply webpack-defaults & webpack 3.x support (#540)
- refactor: Pass a unique compiler name to get child compilation [483](#483) - refactor: Apply webpack-defaults [542](#542) BREAKING CHANGE: Enforces `engines` of `"node": ">=4.3.0 < 5.0.0 || >= 5.10` - refactor: DeprecationWarning: Chunk.modules [543](#543) BREAKING CHANGE: Updates to `Chunk.mapModules`. This release is not backwards compatible with `Webpack 2.x` due to breaking changes in webpack/webpack#4764 - fix: css generation order issue see: webpack/webpack#5225 BREAKING CHANGE: Enforces `peerDependencies` of `"webpack": "^3.1.0"`.
1 parent dd43832 commit 7ae32d9

File tree

90 files changed

+11205
-1135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+11205
-1135
lines changed

‎.babelrc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"presets": [
3+
[
4+
"env",
5+
{
6+
"useBuiltIns": true,
7+
"targets": {
8+
"node": "4.3"
9+
},
10+
"exclude": [
11+
"transform-async-to-generator",
12+
"transform-regenerator"
13+
]
14+
}
15+
]
16+
],
17+
"plugins": [
18+
[
19+
"transform-object-rest-spread",
20+
{
21+
"useBuiltIns": true
22+
}
23+
]
24+
],
25+
"env": {
26+
"test": {
27+
"presets": [
28+
"env"
29+
],
30+
"sourceMap" : "inline",
31+
"plugins": [
32+
"transform-object-rest-spread"
33+
]
34+
}
35+
}
36+
}

‎.editorconfig

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
# EditorConfig is awesome: http://EditorConfig.org
2-
3-
# top-most EditorConfig file
1+
# editorconfig.org
42
root = true
53

6-
# Unix-style newlines with a newline ending every file
74
[*]
85
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
98
end_of_line = lf
109
insert_final_newline = true
11-
indent_style = tab
12-
indent_size = 4
10+
trim_trailing_whitespace = true
1311

14-
# Matches the exact files either package.json or .travis.yml
1512
[{package.json,.travis.yml}]
1613
indent_style = space
1714
indent_size = 2
15+
16+
[.md]
17+
insert_final_newline = false
18+
trim_trailing_whitespace = false

‎.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/node_modules
2+
/dist
3+
/test/cases
4+
/test/js

‎.eslintrc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
{
2-
"env": {
3-
"node": true
4-
},
5-
"rules": {
6-
"strict": 0,
7-
"curly": 0,
8-
"quotes": 0,
9-
"no-shadow": 0,
10-
"no-underscore-dangle": 0
11-
}
2+
"extends": "webpack",
3+
"rules": {
4+
"prefer-destructuring": 1,
5+
"prefer-rest-params": 0,
6+
"class-methods-use-this": 1,
7+
"no-plusplus": 1,
8+
"consistent-return": 0,
9+
"no-param-reassign": 0
10+
}
1211
}

‎.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
* text=auto
2+
3+
package-lock.json -diff
4+
bin/* eol=lf

‎.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
<!--
12
1. Check the version of package you are using. If it's not the newest version, update and try again (see changelog while updating!).
23
2. If the issue is still there, write a minimal project showing the problem and expected output.
34
3. Link to the project and mention Node version and OS in your report.
45
56
**IMPORTANT! You should use [Stack Overflow](https://stackoverflow.com/) for support related questions.**
7+
-->

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
<!--
12
1. [Read and sign the CLA](https://cla.js.foundation/webpack/webpack.js.org). This needs to be done only once. PRs that haven't signed it won't be accepted.
23
2. Check out the [development guide](https://webpack.js.org/development/) for the API and development guidelines.
34
3. Read through the PR diff carefully as sometimes this can reveal issues. The work will be reviewed, but this can save some effort.
4-
4. Remove these instructions from your PR as they are for your eyes only.
5+
-->

‎.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,16 @@
88
/.idea
99

1010
.DS_Store
11+
12+
logs
13+
*.log
14+
npm-debug.log*
15+
.eslintcache
16+
/dist
17+
/local
18+
/reports
19+
Thumbs.db
20+
.idea
21+
.vscode
22+
*.sublime-project
23+
*.sublime-workspace

‎.travis.yml

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,48 @@
11
sudo: false
2+
dist: trusty
23
language: node_js
3-
node_js:
4-
- node
5-
- 6
6-
- 4
7-
script: npm run travis
8-
4+
branches:
5+
only:
6+
- master
7+
jobs:
8+
fast_finish: true
9+
allow_failures:
10+
- env: WEBPACK_VERSION=canary
11+
include:
12+
- &test-latest
13+
stage: Webpack latest
14+
node_js: 6
15+
env: WEBPACK_VERSION=latest JOB_PART=test
16+
script: npm run travis:$JOB_PART
17+
- <<: *test-latest
18+
node_js: 4.3
19+
env: WEBPACK_VERSION=latest JOB_PART=test
20+
script: npm run travis:$JOB_PART
21+
- <<: *test-latest
22+
node_js: 8
23+
env: WEBPACK_VERSION=latest JOB_PART=lint
24+
script: npm run travis:$JOB_PART
25+
- <<: *test-latest
26+
node_js: 8
27+
env: WEBPACK_VERSION=latest JOB_PART=coverage
28+
script: npm run travis:$JOB_PART
29+
after_success: 'bash <(curl -s https://codecov.io/bash)'
30+
- stage: Webpack canary
31+
before_script: npm i --no-save git://github.com/webpack/webpack.git#master
32+
script: npm run travis:$JOB_PART
33+
node_js: 8
34+
env: WEBPACK_VERSION=canary JOB_PART=test
35+
before_install:
36+
- 'if [[ `npm -v` != 5* ]]; then npm i -g npm@^5.0.0; fi'
37+
- nvm --version
38+
- node --version
39+
- npm --version
40+
before_script:
41+
- |-
42+
if [ "$WEBPACK_VERSION" ]; then
43+
npm i --no-save webpack@$WEBPACK_VERSION
44+
fi
45+
script:
46+
- 'npm run travis:$JOB_PART'
947
after_success:
10-
- cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
11-
- cat ./coverage/coverage.json | node_modules/codecov.io/bin/codecov.io.js
12-
- rm -rf ./coverage
48+
- 'bash <(curl -s https://codecov.io/bash)'

‎CHANGELOG.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,84 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
<a name="3.0.0-rc.2"></a>
6+
# [3.0.0-rc.2](https://github.com/webpack-contrib/extract-text-webpack-plugin/compare/v3.0.0-rc.1...v3.0.0-rc.2) (2017-07-10)
7+
8+
9+
### Bug Fixes
10+
11+
* Modules shouldn't be passed to sort ([#568](https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/568)) ([113cabb](https://github.com/webpack-contrib/extract-text-webpack-plugin/commit/113cabb))
12+
13+
14+
15+
<a name="3.0.0-rc.1"></a>
16+
# [3.0.0-rc.1](https://github.com/webpack-contrib/extract-text-webpack-plugin/compare/v3.0.0-rc.0...v3.0.0-rc.1) (2017-07-07)
17+
18+
19+
### Bug Fixes
20+
21+
* Module sorting ([27e3a28](https://github.com/webpack-contrib/extract-text-webpack-plugin/commit/27e3a28))
22+
23+
24+
25+
<a name="3.0.0-rc.0"></a>
26+
# [3.0.0-rc.0](https://github.com/webpack-contrib/extract-text-webpack-plugin/compare/v3.0.0-beta.3...v3.0.0-rc.0) (2017-07-07)
27+
28+
29+
### Code Refactoring
30+
31+
* Update deprecated `chunk.modules` functions ([#553](https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/553)) ([be7936d](https://github.com/webpack-contrib/extract-text-webpack-plugin/commit/be7936d))
32+
33+
34+
### BREAKING CHANGES
35+
36+
* Updates to `Chunk.mapModules | forEachModule | getNumberOfModules`. This release is not backwards compatible with `Webpack 2.x` due to breaking changes in webpack/webpack#4764
37+
38+
39+
40+
<a name="3.0.0-beta.3"></a>
41+
# [3.0.0-beta.3](https://github.com/webpack-contrib/extract-text-webpack-plugin/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2017-06-24)
42+
43+
### Bug Fixes
44+
45+
* Distribute schema with package ([5d0c28f](https://github.com/webpack-contrib/extract-text-webpack-plugin/commit/5d0c28f))
46+
47+
48+
<a name="3.0.0-beta.2"></a>
49+
# [3.0.0-beta.2](https://github.com/webpack-contrib/extract-text-webpack-plugin/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2017-06-24)
50+
51+
* Skipped due to deployment issues with schema
52+
53+
<a name="3.0.0-beta.1"></a>
54+
# [3.0.0-beta.1](https://github.com/webpack-contrib/extract-text-webpack-plugin/compare/v3.0.0-beta.0...v3.0.0-beta.1) (2017-06-24)
55+
56+
57+
* Skipped due to deployment issues with schema
58+
59+
60+
<a name="3.0.0-beta.0"></a>
61+
# [3.0.0-beta.0](https://github.com/webpack-contrib/extract-text-webpack-plugin/compare/v2.1.2...v3.0.0-beta.0) (2017-06-23)
62+
63+
64+
### Bug Fixes
65+
66+
* add missing `options.ignoreOrder` details in Error message ([#539](https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/539)) ([dd43832](https://github.com/webpack-contrib/extract-text-webpack-plugin/commit/dd43832))
67+
68+
69+
### Code Refactoring
70+
71+
* Apply webpack-defaults ([#542](https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/542)) ([292e217](https://github.com/webpack-contrib/extract-text-webpack-plugin/commit/292e217))
72+
* Chunk.modules deprecation warning ([28171b2](https://github.com/webpack-contrib/extract-text-webpack-plugin/commit/28171b2))
73+
74+
75+
### BREAKING CHANGES
76+
77+
* Updates to `Chunk.mapModules`. This release is not backwards compatible with `Webpack 2.x` due to breaking changes in webpack/webpack#4764
78+
* Enforces `peerDependencies` of `"webpack": ">= 3.0.0-rc.0 || ^3.0.0"`.
79+
* Enforces `engines` of `"node": ">=4.3.0 < 5.0.0 || >= 5.10`
80+
81+
82+
583
<a name="2.1.2"></a>
684
## [2.1.2](https://github.com/webpack-contrib/extract-text-webpack-plugin/compare/v2.1.1...v2.1.2) (2017-06-08)
785

‎ExtractedModule.js

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

‎OrderUndefinedError.js

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

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
```bash
2222
# for webpack 2
23-
npm install --save-dev extract-text-webpack-plugin
23+
npm install --save-dev extract-text-webpack-plugin@2.1.2
2424
# for webpack 1
2525
npm install --save-dev [email protected]
2626
```

‎appveyor.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
branches:
2+
only:
3+
- master
4+
init:
5+
- git config --global core.autocrlf input
6+
environment:
7+
matrix:
8+
- nodejs_version: '8'
9+
webpack_version: latest
10+
job_part: test
11+
- nodejs_version: '6'
12+
webpack_version: latest
13+
job_part: test
14+
- nodejs_version: '4.3'
15+
webpack_version: latest
16+
job_part: test
17+
build: 'off'
18+
matrix:
19+
fast_finish: true
20+
install:
21+
- ps: Install-Product node $env:nodejs_version x64
22+
- npm install
23+
before_test:
24+
- cmd: npm install webpack@%webpack_version%
25+
test_script:
26+
- node --version
27+
- npm --version
28+
- cmd: npm run appveyor:%job_part%

0 commit comments

Comments
 (0)