Merge pull request #477 from mzgoddard/fix-things->_>

mzgoddard · web-flow · commit e5563c9698bb · 2018-12-09T16:51:01.000-05:00
Apply fixes in #444 and #436 and for the DLL plugin
diff --git a/index.js b/index.js
@@ -433,10 +433,8 @@ class HardSourceWebpackPlugin {
     const TransformModuleErrorsPlugin = require('./lib/TransformModuleErrorsPlugin');
     const SupportExtractTextPlugin = require('./lib/SupportExtractTextPlugin');
     let SupportMiniCssExtractPlugin;
-    let ExcludeMiniCssModulePlugin;
     if (webpackFeatures.generator) {
       SupportMiniCssExtractPlugin = require('./lib/SupportMiniCssExtractPlugin');
-      ExcludeMiniCssModulePlugin = require('./lib/ExcludeMiniCssModulePlugin');
     }
     const TransformDependencyBlockPlugin = require('./lib/TransformDependencyBlockPlugin');
     const TransformBasicDependencyPlugin = require('./lib/TransformBasicDependencyPlugin');
@@ -479,7 +477,6 @@ class HardSourceWebpackPlugin {
 
     if (SupportMiniCssExtractPlugin) {
       new SupportMiniCssExtractPlugin().apply(compiler);
-      new ExcludeMiniCssModulePlugin().apply(compiler);
     }
 
     new TransformDependencyBlockPlugin({
diff --git a/lib/ExcludeMiniCssModulePlugin.js b/lib/ExcludeMiniCssModulePlugin.js
diff --git a/lib/SerializerAppend.js b/lib/SerializerAppend.js
@@ -436,11 +436,13 @@ class AppendSerializer {
     }
 
     return _lock(_this, mustLock, promise =>
-      promise.then(() => _read()).catch(e =>
-        _closeLog(_this).then(() => {
-          throw e;
-        }),
-      ),
+      promise
+        .then(() => _read())
+        .catch(e =>
+          _closeLog(_this).then(() => {
+            throw e;
+          }),
+        ),
     );
   }
 
diff --git a/lib/TransformBasicDependencyPluginLegacy.js b/lib/TransformBasicDependencyPluginLegacy.js
@@ -111,6 +111,7 @@ const DependencySchemas2 = [
     'originModule',
     'range',
     'rangeStatement',
+    'prefix',
   ],
   ['HarmonyExportHeaderDependency', 'range', 'rangeStatement'],
   [
@@ -248,6 +249,7 @@ const DependencySchemas3 = [
     'originModule',
     'range',
     'rangeStatement',
+    'prefix',
   ],
   ['HarmonyExportHeaderDependency', 'range', 'rangeStatement'],
   [
@@ -692,11 +694,10 @@ class TransformBasicDependencyPluginLegacy {
         if (frozen && dependency.getWarnings) {
           const warnings = dependency.getWarnings();
           if (warnings && warnings.length) {
-            frozen.warnings = warnings.map(
-              ({ stack }) =>
-                stack.includes('\n    at pluginCompat.tap')
-                  ? stack.split('\n    at pluginCompat.tap')[0]
-                  : stack.split('\n    at Compiler.pluginCompat.tap')[0],
+            frozen.warnings = warnings.map(({ stack }) =>
+              stack.includes('\n    at pluginCompat.tap')
+                ? stack.split('\n    at pluginCompat.tap')[0]
+                : stack.split('\n    at Compiler.pluginCompat.tap')[0],
             );
           }
         }
diff --git a/lib/schema-4/basic-dependency.json b/lib/schema-4/basic-dependency.json
@@ -27,7 +27,8 @@
     "HarmonyExportExpressionDependency",
     "originModule",
     "range",
-    "rangeStatement"
+    "rangeStatement",
+    "prefix"
   ],
   ["HarmonyExportHeaderDependency", "range", "rangeStatement"],
   [
diff --git a/lib/schema-4/index.js b/lib/schema-4/index.js
@@ -549,13 +549,15 @@ const HarmonyExportExpressionDependencySerial = serial.serial('HarmonyExportExpr
         originModule: null,
         range: dependency.range,
         rangeStatement: dependency.rangeStatement,
+        prefix: dependency.prefix,
       };
     },
     thaw(thawed, frozen, extra, methods) {
       return new HarmonyExportExpressionDependency(
         extra.module,
         frozen.range,
         frozen.rangeStatement,
+        frozen.prefix,
       );
     },
   },
diff --git a/lib/util/parity.js b/lib/util/parity.js
@@ -91,12 +91,10 @@ class ParityCache {
 }
 
 const createParityToken = (id, ids = null) => {
-  const token = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(
-    /[xy]/g,
-    c =>
-      c === 'x'
-        ? ((Math.random() * 16) | 0).toString(16)
-        : (((Math.random() * 4) | 0) + 8).toString(16),
+  const token = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c =>
+    c === 'x'
+      ? ((Math.random() * 16) | 0).toString(16)
+      : (((Math.random() * 4) | 0) + 8).toString(16),
   );
 
   return new ParityToken(id, token, ids);
diff --git a/package.json b/package.json
@@ -74,6 +74,7 @@
     "node-object-hash": "^1.2.0",
     "pkg-dir": "^3.0.0",
     "rimraf": "^2.6.2",
+    "semver": "^5.6.0",
     "tapable": "^1.0.0-beta.5",
     "webpack-sources": "^1.0.1",
     "write-json-file": "^2.3.0"
diff --git a/tests/fixtures/plugin-dll-reference-scope/dll-4.27.js b/tests/fixtures/plugin-dll-reference-scope/dll-4.27.js
diff --git a/tests/fixtures/plugin-dll-reference-scope/dll-manifest-4.27.json b/tests/fixtures/plugin-dll-reference-scope/dll-manifest-4.27.json
@@ -0,0 +1 @@
+{"name":"dll_b44bb155bbcb19ee9c89","content":{"./fib.js":{"id":1,"buildMeta":{"providedExports":true}}}}
diff --git a/tests/fixtures/plugin-dll-reference-scope/webpack.config.js b/tests/fixtures/plugin-dll-reference-scope/webpack.config.js
@@ -1,3 +1,6 @@
+var semver = require('semver');
+var webpackVersion = require('webpack/package.json').version;
+
 var DllReferencePlugin = require('webpack').DllReferencePlugin;
 var HardSourceWebpackPlugin = require('../../..');
 
@@ -19,7 +22,9 @@ module.exports = {
     new DllReferencePlugin({
       scope: '.',
       extensions: ['', '.js'],
-      manifest: require('./dll-manifest.json'),
+      manifest: semver.satisfies(webpackVersion, '>=4.27') ?
+        require('./dll-manifest-4.27.json') :
+        require('./dll-manifest.json'),
       // manifest: __dirname + '/dll-manifest.json',
     }),
   ],
diff --git a/tests/fixtures/plugin-dll-reference/dll-4.27.js b/tests/fixtures/plugin-dll-reference/dll-4.27.js
diff --git a/tests/fixtures/plugin-dll-reference/dll-manifest-4.27.json b/tests/fixtures/plugin-dll-reference/dll-manifest-4.27.json
@@ -0,0 +1 @@
+{"name":"dll_b44bb155bbcb19ee9c89","content":{"./fib.js":{"id":1,"buildMeta":{"providedExports":true}}}}
diff --git a/tests/fixtures/plugin-dll-reference/webpack.config.js b/tests/fixtures/plugin-dll-reference/webpack.config.js
@@ -1,3 +1,6 @@
+var semver = require('semver');
+var webpackVersion = require('webpack/package.json').version;
+
 var DllReferencePlugin = require('webpack').DllReferencePlugin;
 var HardSourceWebpackPlugin = require('../../..');
 
@@ -18,7 +21,9 @@ module.exports = {
     }),
     new DllReferencePlugin({
       context: __dirname,
-      manifest: require('./dll-manifest.json'),
+      manifest: semver.satisfies(webpackVersion, '>=4.27') ?
+        require('./dll-manifest-4.27.json') :
+        require('./dll-manifest.json'),
       // manifest: __dirname + '/dll-manifest.json',
     }),
   ],
diff --git a/tests/plugins-webpack-4.js b/tests/plugins-webpack-4.js
@@ -19,7 +19,7 @@ describeWP(4)('plugin webpack 4 use', function() {
 
   itCompilesTwice.skipIf([c.miniCss])('plugin-mini-css-extract');
   itCompilesTwice.skipIf([c.miniCss])('plugin-mini-css-extract', {exportStats: true});
-  // itCompilesHardModules.skipIf([c.miniCss])('plugin-mini-css-extract', ['./index.css']);
+  itCompilesHardModules.skipIf([c.miniCss])('plugin-mini-css-extract', ['./index.css']);
 
   itCompilesTwice.skipIf([c.miniCss])('plugin-mini-css-extract-file');
   itCompilesTwice.skipIf([c.miniCss])('plugin-mini-css-extract-file', {exportStats: true});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"name":"dll_b44bb155bbcb19ee9c89","content":{"./fib.js":{"id":1,"buildMeta":{"providedExports":true}}}}`