fix: experimentalUseImportModule

use old publicPath logic add CI tests for experimentalUseImportModule disable auxiliaryAssets test with experimentalUseImportModule
webpack-contrib · Apr 14, 2021 · e8934b8 · e8934b8
1 parent e83bc84
commit e8934b8
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 44 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -50,22 +50,19 @@ jobs:
         uses: wagoid/commitlint-github-action@v1
 
   test:
-    name: Test - ${{ matrix.os }} - Node v${{ matrix.node-version }}, Webpack ${{ matrix.webpack-version }}
+    name: Test - ${{ matrix.os }} - Node v${{ matrix.node-version }}, Webpack ${{ matrix.webpack-version }}, experimentalUseImportModule ${{ matrix.experimental-use-import-module }}
 
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [10.x, 12.x, 14.x]
         webpack-version: [4, latest]
-        experimental-use-import-module: [false]
-        include:
-          - os: 'ubuntu-latest'
-            node-version: 14.x
-            webpack-version: latest
+        experimental-use-import-module: [false, true]
+        exclude:
+          - webpack-version: 4
             experimental-use-import-module: true
 
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental-use-import-module }}
 
     steps:
       - name: Setup Git

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
     "standard-version": "^9.1.0",
-    "webpack": "^5.32.0",
+    "webpack": "^5.33.2",
     "webpack-cli": "^4.5.0",
     "webpack-dev-server": "^3.7.2"
   },

diff --git a/src/loader.js b/src/loader.js
@@ -174,6 +174,19 @@ export function pitch(request) {
     return callback(null, resultSource);
   };
 
+  const publicPath =
+    typeof options.publicPath === 'string'
+      ? options.publicPath === 'auto'
+        ? ''
+        : options.publicPath === '' || options.publicPath.endsWith('/')
+        ? options.publicPath
+        : `${options.publicPath}/`
+      : typeof options.publicPath === 'function'
+      ? options.publicPath(this.resourcePath, this.rootContext)
+      : this._compilation.outputOptions.publicPath === 'auto'
+      ? ''
+      : this._compilation.outputOptions.publicPath;
+
   if (optionsFromPlugin.experimentalUseImportModule) {
     if (!this.importModule) {
       callback(
@@ -183,11 +196,12 @@ export function pitch(request) {
       );
       return;
     }
+    console.log(publicPath);
     this.importModule(
       `${this.resourcePath}.webpack[javascript/auto]!=!${request}`,
       {
         layer: options.layer,
-        publicPath: options.publicPath,
+        publicPath,
       },
       (err, exports) => {
         if (err) {
@@ -206,18 +220,6 @@ export function pitch(request) {
   this.addDependency(this.resourcePath);
 
   const childFilename = '*';
-  const publicPath =
-    typeof options.publicPath === 'string'
-      ? options.publicPath === 'auto'
-        ? ''
-        : options.publicPath === '' || options.publicPath.endsWith('/')
-        ? options.publicPath
-        : `${options.publicPath}/`
-      : typeof options.publicPath === 'function'
-      ? options.publicPath(this.resourcePath, this.rootContext)
-      : this._compilation.outputOptions.publicPath === 'auto'
-      ? ''
-      : this._compilation.outputOptions.publicPath;
 
   const outputOptions = {
     filename: childFilename,

diff --git a/test/cases/auxiliaryAssets/test.filter.js b/test/cases/auxiliaryAssets/test.filter.js
@@ -1,3 +1,4 @@
 const webpack = require('webpack');
 
-module.exports = () => webpack.version[0] !== '4';
+module.exports = () =>
+  webpack.version[0] !== '4' && !process.env.EXPERIMENTAL_USE_IMPORT_MODULE;
diff --git a/test/manual/webpack.config.js b/test/manual/webpack.config.js
@@ -10,6 +10,11 @@ const ENABLE_ES_MODULE =
     ? Boolean(process.env.ES_MODULE)
     : true;
 
+const ENABLE_EXPERIMENTAL_USE_IMPORT_MODULE =
+  typeof process.env.EXPERIMENTAL_USE_IMPORT_MODULE !== 'undefined'
+    ? Boolean(process.env.EXPERIMENTAL_USE_IMPORT_MODULE)
+    : true;
+
 module.exports = {
   mode: 'development',
   output: {
@@ -58,6 +63,7 @@ module.exports = {
     new Self({
       filename: '[name].css',
       chunkFilename: '[name].chunk.css',
+      experimentalUseImportModule: ENABLE_EXPERIMENTAL_USE_IMPORT_MODULE,
     }),
   ],
   devServer: {