refactor: Apply webpack-defaults #542

joshwiens · 2017-06-12T11:23:06Z

Apply webpack-defaults tooling updates
Apply webpack-defaults grammar updates
Apply webpack-defaults style updates
Convert existing tests to Jest from Mocha

The desired effect here is to update style & grammar without changing the way etwp works.

Note, this is being merged into #540 making this refactoring etwp & webpack v3 only

Closes #477

- this needs to be rewritten to allow for better assertions

- Convert to ES6+ Class - Convert to ES6+ default export - Convert to const / let - Uses import syntax - Convert errors to templates

codecov · 2017-06-12T11:54:48Z

Codecov Report

Merging #542 into feature/webpack3 will decrease coverage by 2.59%.
The diff coverage is 87.37%.

@@                 Coverage Diff                 @@
##           feature/webpack3     #542     +/-   ##
===================================================
- Coverage             89.97%   87.37%   -2.6%     
===================================================
  Files                     4        7      +3     
  Lines                   349      301     -48     
  Branches                 73       68      -5     
===================================================
- Hits                    314      263     -51     
- Misses                   35       36      +1     
- Partials                  0        2      +2

Impacted Files	Coverage Δ
src/cjs.js	`0% <0%> (ø)`
src/lib/OrderUndefinedError.js	`14.28% <14.28%> (ø)`
src/lib/ExtractedModule.js	`88.57% <88.57%> (ø)`
src/loader.js	`88.7% <88.7%> (ø)`
src/index.js	`89.62% <89.62%> (ø)`
src/lib/helpers.js	`89.74% <89.74%> (ø)`
src/lib/ExtractTextPluginCompilation.js	`90.9% <90.9%> (ø)`
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 92e4349...decd7b9. Read the comment docs.

michael-ciniawsky · 2017-06-12T12:20:29Z

src/index.js

+      before = [before];
+    }
+    options = mergeOptions({ omit: before.length, remove: true }, options);
+    delete options.loader;


I think we can remove it, since it was already deprecated in v2.0.0 (*)

https://github.com/d3viant0ne/extract-text-webpack-plugin/blob/960bc9392ed967a91f85519f7ee252a30ac394d8/src/schema/loader.json#L29-L34

michael-ciniawsky · 2017-06-12T12:20:42Z

src/index.js

+    delete options.loader;
+    delete options.use;
+    delete options.fallback;
+    delete options.fallbackLoader;


michael-ciniawsky · 2017-06-12T12:22:31Z

src/index.js

+    } else {
+      validateOptions(path.resolve(__dirname, './schema/loader.json'), options, 'Extract Text Plugin (Loader)');
+    }
+    let loader = options.use || options.loader;


*

+ options.use - options.use || options.loader

michael-ciniawsky · 2017-06-12T12:23:45Z

src/index.js

+      validateOptions(path.resolve(__dirname, './schema/loader.json'), options, 'Extract Text Plugin (Loader)');
+    }
+    let loader = options.use || options.loader;
+    let before = options.fallback || options.fallbackLoader || [];


*

+ options.fallback || [] - options.fallback || options.fallbackLoader || []

michael-ciniawsky · 2017-06-12T12:25:24Z

src/index.js

+        '    fallback: string | object | loader[]\n' +
+        '    publicPath: string\n');
+    }
+    if (options.fallbackLoader) {


*

- if (options.fallbackLoader) { - console.warn('fallbackLoader option has been deprecated - replace with "fallback"'); - }

michael-ciniawsky · 2017-06-12T12:26:04Z

src/index.js

+    if (options.fallbackLoader) {
+      console.warn('fallbackLoader option has been deprecated - replace with "fallback"');
+    }
+    if (options.loader) {


*

- if (options.loader) { - console.warn('loader option has been deprecated - replace with "use"'); - }

bebraw

Check module.exports. Apart from that looks ok to me.

sokra · 2017-06-16T06:54:02Z

src/index.js

+
+export default ExtractTextPlugin;
+
+ExtractTextPlugin.prototype.mergeNonInitialChunks = function (chunk, intoChunk, checkedChunks) { // eslint-disable-line func-names


Why ain't this methods in the class with class method syntax?

sokra · 2017-06-16T06:55:23Z

src/index.js

+  return source;
+};
+
+ExtractTextPlugin.extract = ExtractTextPlugin.prototype.extract.bind(ExtractTextPlugin);


This can be a static method. This way it's also correct but difficult to understand

sokra · 2017-06-16T06:57:33Z

src/lib/helpers.js

+}
+
+export function isFunction(a) {
+  return isType('Function', a);


why not typeof a === "function"?

sokra · 2017-06-16T07:06:28Z

test/webpack-integration.test.js


 var cases = process.env.CASES ? process.env.CASES.split(",") : fs.readdirSync(path.join(__dirname, "cases"));

-describe("TestCases", function() {
+describe("Webpack Integration Tests", function() {
 	cases.forEach(function(testCase) {


spacing in this file is inconsistent

joshwiens · 2017-06-16T21:48:26Z

Thanks Tobias, I'll get everything updated this evening.

- refactor: Migrate extracted module to lib - refactor: Migrate order undefined to lib - refactor: Extract etwp helper functions - refactor: Extract compilation to stand alone class - refactor: Proxy plugin module from cjs.js - refactor: Modernize loader syntax - Convert to ES6+ Class - Convert to ES6+ default export - Convert to const / let - Uses import syntax - Convert errors to templates - refactor: Convert tests & configs to import syntax - refactor: Use indexOf in helpers - refactor: Modernize plugin syntax - Convert to ES6+ Class - Convert to ES6+ default export - Convert to const / let - Uses import syntax - Convert errors to templates - refactor: Modernize ExtractedModule syntax - Convert to ES6+ Class - Convert to ES6+ default export - Convert to const / let - Uses import syntax - Convert errors to templates - refactor: Removes fallbackLoader & loader deprecation warnings - refactor: Removes single option deprecation warning - refactor: Removes options.loader & options.fallbackLoader BREAKING CHANGE: Enforces `peerDependencies` of `"webpack": ">= 3.0.0-rc.0 || ^3.0.0"`. BREAKING CHANGE: Enforces `engines` of `"node": ">=4.3.0 < 5.0.0 || >= 5.10`

- 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"`.

joshwiens added 20 commits June 12, 2017 01:26

chore: Init webpack-defaults

cf6d307

style: Convert to single quotes

bc07c0e

refactor: Convert specs to Jest

c0534a1

refactor: Migrate to src folder

7015ef0

chore: Update lock file

428ee39

chore: Clean up devDependencies

c43fa94

test: Convert cases to snapshots

0c44af8

- this needs to be rewritten to allow for better assertions

refactor: Migrate extracted module to lib

32e1f42

refactor: Migrate order undefined to lib

3fbdf66

refactor: Extract etwp helper functions

2ca9cc9

test: Use equal and snapshot temporarily

49ad21e

refactor: Extract compilation to stand alone class

bda6004

refactor: Proxy both loader & plugin from cjs

ed1f68e

refactor: Modernize loader syntax

d7df331

- Convert to ES6+ Class - Convert to ES6+ default export - Convert to const / let - Uses import syntax - Convert errors to templates

refactor: Convert tests & configs to import syntax

15074da

refactor: Use indexOf in helpers

466ffbf

refactor: Modernize plugin syntax

e3799dd

- Convert to ES6+ Class - Convert to ES6+ default export - Convert to const / let - Uses import syntax - Convert errors to templates

refactor: Modernize ExtractedModule syntax

3bfe9d2

- Convert to ES6+ Class - Convert to ES6+ default export - Convert to const / let - Uses import syntax - Convert errors to templates

test: Update test naming & snapshot

56a1095

style: Convert unnamed func to arrows

6e700dc

joshwiens added pr_action: Review type: Refactor labels Jun 12, 2017

joshwiens mentioned this pull request Jun 12, 2017

refactor: Apply webpack-defaults & webpack 3.x support #540

Merged

12 tasks

ci(appveyor): Install npm@5

960bc93

joshwiens force-pushed the d3viant0ne/feature/webpack3/webpack-defaults branch from ae7168b to 960bc93 Compare June 12, 2017 12:01

joshwiens requested review from bebraw, alexander-akait and michael-ciniawsky June 12, 2017 12:18

michael-ciniawsky suggested changes Jun 12, 2017

View reviewed changes

joshwiens added 3 commits June 12, 2017 12:29

refactor: Removes fallbackLoader & loader deprecation warnings

3d2997c

refactor: Removes single option deprecation warning

94bbdaf

refactor: Removes options.loader & options.fallbackLoader

0d645a9

joshwiens added semver: Major pr_action: Rework and removed pr_action: Review labels Jun 12, 2017

bebraw approved these changes Jun 14, 2017

View reviewed changes

sokra reviewed Jun 16, 2017

View reviewed changes

michael-ciniawsky mentioned this pull request Jun 20, 2017

fix: split async CSS correctly #546

Closed

joshwiens added 3 commits June 20, 2017 15:59

refactor: Switch to consistant typeof

337ee36

style: Consistent spacing and lint fixes

fe166b7

refactor: Move non initial chunks to class method

9262804

joshwiens added pr_action: Review and removed pr_action: Rework labels Jun 20, 2017

joshwiens force-pushed the d3viant0ne/feature/webpack3/webpack-defaults branch from 26c5949 to 9262804 Compare June 20, 2017 21:47

refactor: Don't need .default for loader

84d858e

alexander-akait approved these changes Jun 20, 2017

View reviewed changes

joshwiens added 2 commits June 20, 2017 17:59

chore: Drops had devDep on webpack

29eb120

ci: Update for webpack 3.x

decd7b9

joshwiens merged commit 3e78452 into webpack-contrib:feature/webpack3 Jun 21, 2017

joshwiens deleted the d3viant0ne/feature/webpack3/webpack-defaults branch June 21, 2017 01:40

joshwiens added pr_action: Merge ready and removed pr_action: Review labels Jul 16, 2017

joshwiens self-assigned this Aug 13, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Apply webpack-defaults #542

refactor: Apply webpack-defaults #542

joshwiens commented Jun 12, 2017 •

edited

codecov bot commented Jun 12, 2017 •

edited

michael-ciniawsky Jun 12, 2017 •

edited

michael-ciniawsky Jun 12, 2017

michael-ciniawsky Jun 12, 2017

michael-ciniawsky Jun 12, 2017

michael-ciniawsky Jun 12, 2017

michael-ciniawsky Jun 12, 2017

bebraw left a comment

sokra Jun 16, 2017

sokra Jun 16, 2017

sokra Jun 16, 2017

sokra Jun 16, 2017

joshwiens commented Jun 16, 2017


		export default ExtractTextPlugin;

		ExtractTextPlugin.prototype.mergeNonInitialChunks = function (chunk, intoChunk, checkedChunks) { // eslint-disable-line func-names

refactor: Apply webpack-defaults #542

refactor: Apply webpack-defaults #542

Conversation

joshwiens commented Jun 12, 2017 • edited

codecov bot commented Jun 12, 2017 • edited

Codecov Report

michael-ciniawsky Jun 12, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bebraw left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joshwiens commented Jun 16, 2017

joshwiens commented Jun 12, 2017 •

edited

codecov bot commented Jun 12, 2017 •

edited

michael-ciniawsky Jun 12, 2017 •

edited