@umijs/bundler-webpack 4.0.41 → 4.0.43

package/compiled/mini-css-extract-plugin/loader.js

@@ -1,7 +1,6 @@
 "use strict";
 
 const path = require("path");
-
 const {
   findModuleById,
   evalModuleCode,
@@ -9,29 +8,22 @@ const {
   ABSOLUTE_PUBLIC_PATH,
   BASE_URI,
   SINGLE_DOT_PATH_SEGMENT,
-  stringifyRequest
+  stringifyRequest,
+  stringifyLocal
 } = require("./utils");
-
 const schema = require("./loader-options.json");
-
 const MiniCssExtractPlugin = require("./index");
-/** @typedef {import("schema-utils/declarations/validate").Schema} Schema */
 
+/** @typedef {import("schema-utils/declarations/validate").Schema} Schema */
 /** @typedef {import("webpack").Compiler} Compiler */
-
 /** @typedef {import("webpack").Compilation} Compilation */
-
 /** @typedef {import("webpack").Chunk} Chunk */
-
 /** @typedef {import("webpack").Module} Module */
-
 /** @typedef {import("webpack").sources.Source} Source */
-
 /** @typedef {import("webpack").AssetInfo} AssetInfo */
-
 /** @typedef {import("webpack").NormalModule} NormalModule */
-
 /** @typedef {import("./index.js").LoaderOptions} LoaderOptions */
+/** @typedef {{ [key: string]: string | function }} Locals */
 
 /** @typedef {any} TODO */
 
@@ -48,17 +40,16 @@ const MiniCssExtractPlugin = require("./index");
 
 /**
  * @param {string} content
- * @param {{ loaderContext: import("webpack").LoaderContext<LoaderOptions>, options: LoaderOptions, locals: {[key: string]: string } | undefined }} context
+ * @param {{ loaderContext: import("webpack").LoaderContext<LoaderOptions>, options: LoaderOptions, locals: Locals | undefined }} context
  * @returns {string}
  */
-
-
 function hotLoader(content, context) {
   const accept = context.locals ? "" : "module.hot.accept(undefined, cssReload);";
   return `${content}
     if(module.hot) {
       // ${Date.now()}
-      var cssReload = require(${stringifyRequest(context.loaderContext, path.join(__dirname, "hmr/hotModuleReplacement.js"))})(module.id, ${JSON.stringify({ ...context.options,
+      var cssReload = require(${stringifyRequest(context.loaderContext, path.join(__dirname, "hmr/hotModuleReplacement.js"))})(module.id, ${JSON.stringify({
+    ...context.options,
     locals: !!context.locals
   })});
       module.hot.dispose(cssReload);
@@ -66,32 +57,25 @@ function hotLoader(content, context) {
     }
   `;
 }
+
 /**
  * @this {import("webpack").LoaderContext<LoaderOptions>}
  * @param {string} request
  */
-
-
 function pitch(request) {
   // @ts-ignore
-  const options = this.getOptions(
-  /** @type {Schema} */
-  schema);
+  const options = this.getOptions( /** @type {Schema} */schema);
+  const emit = typeof options.emit !== "undefined" ? options.emit : true;
   const callback = this.async();
-  const optionsFromPlugin =
-  /** @type {TODO} */
-  this[MiniCssExtractPlugin.pluginSymbol];
-
+  const optionsFromPlugin = /** @type {TODO} */this[MiniCssExtractPlugin.pluginSymbol];
   if (!optionsFromPlugin) {
     callback(new Error("You forgot to add 'mini-css-extract-plugin' plugin (i.e. `{ plugins: [new MiniCssExtractPlugin()] }`), please read https://github.com/webpack-contrib/mini-css-extract-plugin#getting-started"));
     return;
   }
-
   const {
     webpack
-  } =
-  /** @type {Compiler} */
-  this._compiler;
+  } = /** @type {Compiler} */this._compiler;
+
   /**
    * @param {TODO} originalExports
    * @param {Compilation} [compilation]
@@ -99,62 +83,47 @@ function pitch(request) {
    * @param {Map<string, AssetInfo>} [assetsInfo]
    * @returns {void}
    */
-
   const handleExports = (originalExports, compilation, assets, assetsInfo) => {
-    /** @type {{[key: string]: string } | undefined} */
+    /** @type {Locals | undefined} */
     let locals;
     let namedExport;
     const esModule = typeof options.esModule !== "undefined" ? options.esModule : true;
+
     /**
      * @param {Dependency[] | [null, object][]} dependencies
      */
-
     const addDependencies = dependencies => {
       if (!Array.isArray(dependencies) && dependencies != null) {
         throw new Error(`Exported value was not extracted as an array: ${JSON.stringify(dependencies)}`);
       }
-
       const identifierCountMap = new Map();
-      const emit = typeof options.emit !== "undefined" ? options.emit : true;
       let lastDep;
-
       for (const dependency of dependencies) {
-        if (!
-        /** @type {Dependency} */
-        dependency.identifier || !emit) {
+        if (! /** @type {Dependency} */dependency.identifier || !emit) {
           // eslint-disable-next-line no-continue
           continue;
         }
-
-        const count = identifierCountMap.get(
-        /** @type {Dependency} */
-        dependency.identifier) || 0;
+        const count = identifierCountMap.get( /** @type {Dependency} */dependency.identifier) || 0;
         const CssDependency = MiniCssExtractPlugin.getCssDependency(webpack);
-        /** @type {NormalModule} */
 
-        this._module.addDependency(lastDep = new CssDependency(
-        /** @type {Dependency} */
-        dependency,
-        /** @type {Dependency} */
+        /** @type {NormalModule} */
+        this._module.addDependency(lastDep = new CssDependency( /** @type {Dependency} */
+        dependency, /** @type {Dependency} */
         dependency.context, count));
-
-        identifierCountMap.set(
-        /** @type {Dependency} */
+        identifierCountMap.set( /** @type {Dependency} */
         dependency.identifier, count + 1);
       }
-
       if (lastDep && assets) {
         lastDep.assets = assets;
         lastDep.assetsInfo = assetsInfo;
       }
     };
-
     try {
       // eslint-disable-next-line no-underscore-dangle
       const exports = originalExports.__esModule ? originalExports.default : originalExports;
-      namedExport = // eslint-disable-next-line no-underscore-dangle
+      namedExport =
+      // eslint-disable-next-line no-underscore-dangle
       originalExports.__esModule && (!originalExports.default || !("locals" in originalExports.default));
-
       if (namedExport) {
         Object.keys(originalExports).forEach(key => {
           if (key !== "default") {
@@ -162,27 +131,24 @@ function pitch(request) {
               locals = {};
             }
 
+            /** @type {Locals} */
             locals[key] = originalExports[key];
           }
         });
       } else {
         locals = exports && exports.locals;
       }
-      /** @type {Dependency[] | [null, object][]} */
-
 
+      /** @type {Dependency[] | [null, object][]} */
       let dependencies;
-
       if (!Array.isArray(exports)) {
         dependencies = [[null, exports]];
       } else {
         dependencies = exports.map(([id, content, media, sourceMap, supports, layer]) => {
           let identifier = id;
           let context;
-
           if (compilation) {
-            const module =
-            /** @type {Module} */
+            const module = /** @type {Module} */
             findModuleById(compilation, id);
             identifier = module.identifier();
             ({
@@ -192,7 +158,6 @@ function pitch(request) {
             // TODO check if this context is used somewhere
             context = this.rootContext;
           }
-
           return {
             identifier,
             context,
@@ -200,69 +165,56 @@ function pitch(request) {
             media,
             supports,
             layer,
-            sourceMap: sourceMap ? Buffer.from(JSON.stringify(sourceMap)) : // eslint-disable-next-line no-undefined
+            sourceMap: sourceMap ? Buffer.from(JSON.stringify(sourceMap)) :
+            // eslint-disable-next-line no-undefined
             undefined
           };
         });
       }
-
       addDependencies(dependencies);
     } catch (e) {
-      callback(
-      /** @type {Error} */
-      e);
+      callback( /** @type {Error} */e);
       return;
     }
-
-    const result = locals ? namedExport ? Object.keys(locals).map(key => `\nexport var ${key} = ${JSON.stringify(
-    /** @type {{[key: string]: string }} */
-    locals[key])};`).join("") : `\n${esModule ? "export default" : "module.exports ="} ${JSON.stringify(locals)};` : esModule ? `\nexport {};` : "";
+    const result = locals ? namedExport ? Object.keys(locals).map(key => `\nexport var ${key} = ${stringifyLocal( /** @type {Locals} */locals[key])};`).join("") : `\n${esModule ? "export default" : "module.exports ="} ${JSON.stringify(locals)};` : esModule ? `\nexport {};` : "";
     let resultSource = `// extracted by ${MiniCssExtractPlugin.pluginName}`;
-    resultSource += this.hot ? hotLoader(result, {
+
+    // only attempt hotreloading if the css is actually used for something other than hash values
+    resultSource += this.hot && emit ? hotLoader(result, {
       loaderContext: this,
       options,
       locals
     }) : result;
     callback(null, resultSource);
   };
-
   let {
     publicPath
-  } =
-  /** @type {Compilation} */
+  } = /** @type {Compilation} */
   this._compilation.outputOptions;
-
   if (typeof options.publicPath === "string") {
     // eslint-disable-next-line prefer-destructuring
     publicPath = options.publicPath;
   } else if (typeof options.publicPath === "function") {
     publicPath = options.publicPath(this.resourcePath, this.rootContext);
   }
-
   if (publicPath === "auto") {
     publicPath = AUTO_PUBLIC_PATH;
   }
-
   if (typeof optionsFromPlugin.experimentalUseImportModule === "undefined" && typeof this.importModule === "function" || optionsFromPlugin.experimentalUseImportModule) {
     if (!this.importModule) {
       callback(new Error("You are using 'experimentalUseImportModule' but 'this.importModule' is not available in loader context. You need to have at least webpack 5.33.2."));
       return;
     }
-
     let publicPathForExtract;
-
     if (typeof publicPath === "string") {
       const isAbsolutePublicPath = /^[a-zA-Z][a-zA-Z\d+\-.]*?:/.test(publicPath);
       publicPathForExtract = isAbsolutePublicPath ? publicPath : `${ABSOLUTE_PUBLIC_PATH}${publicPath.replace(/\./g, SINGLE_DOT_PATH_SEGMENT)}`;
     } else {
       publicPathForExtract = publicPath;
     }
-
     this.importModule(`${this.resourcePath}.webpack[javascript/auto]!=!!!${request}`, {
       layer: options.layer,
-      publicPath:
-      /** @type {string} */
-      publicPathForExtract,
+      publicPath: /** @type {string} */publicPathForExtract,
       baseUri: `${BASE_URI}/`
     },
     /**
@@ -274,12 +226,10 @@ function pitch(request) {
         callback(error);
         return;
       }
-
       handleExports(exports);
     });
     return;
   }
-
   const loaders = this.loaders.slice(this.loaderIndex + 1);
   this.addDependency(this.resourcePath);
   const childFilename = "*";
@@ -287,19 +237,20 @@ function pitch(request) {
     filename: childFilename,
     publicPath
   };
+  const childCompiler = /** @type {Compilation} */
+  this._compilation.createChildCompiler(`${MiniCssExtractPlugin.pluginName} ${request}`, outputOptions);
 
-  const childCompiler =
-  /** @type {Compilation} */
-  this._compilation.createChildCompiler(`${MiniCssExtractPlugin.pluginName} ${request}`, outputOptions); // The templates are compiled and executed by NodeJS - similar to server side rendering
+  // The templates are compiled and executed by NodeJS - similar to server side rendering
   // Unfortunately this causes issues as some loaders require an absolute URL to support ES Modules
   // The following config enables relative URL support for the child compiler
-
-
-  childCompiler.options.module = { ...childCompiler.options.module
+  childCompiler.options.module = {
+    ...childCompiler.options.module
   };
-  childCompiler.options.module.parser = { ...childCompiler.options.module.parser
+  childCompiler.options.module.parser = {
+    ...childCompiler.options.module.parser
   };
-  childCompiler.options.module.parser.javascript = { ...childCompiler.options.module.parser.javascript,
+  childCompiler.options.module.parser.javascript = {
+    ...childCompiler.options.module.parser.javascript,
     url: "relative"
   };
   const {
@@ -356,8 +307,8 @@ function pitch(request) {
       }
     });
   });
-  /** @type {string | Buffer} */
 
+  /** @type {string | Buffer} */
   let source;
   childCompiler.hooks.compilation.tap(MiniCssExtractPlugin.pluginName,
   /**
@@ -365,8 +316,9 @@ function pitch(request) {
    */
   compilation => {
     compilation.hooks.processAssets.tap(MiniCssExtractPlugin.pluginName, () => {
-      source = compilation.assets[childFilename] && compilation.assets[childFilename].source(); // Remove all chunk assets
+      source = compilation.assets[childFilename] && compilation.assets[childFilename].source();
 
+      // Remove all chunk assets
       compilation.chunks.forEach(chunk => {
         chunk.files.forEach(file => {
           compilation.deleteAsset(file);
@@ -379,61 +331,43 @@ function pitch(request) {
       callback(error);
       return;
     }
-
-    if (
-    /** @type {Compilation} */
-    compilation.errors.length > 0) {
-      callback(
-      /** @type {Compilation} */
-      compilation.errors[0]);
+    if ( /** @type {Compilation} */compilation.errors.length > 0) {
+      callback( /** @type {Compilation} */compilation.errors[0]);
       return;
     }
-    /** @type {{ [name: string]: Source }} */
-
 
+    /** @type {{ [name: string]: Source }} */
     const assets = Object.create(null);
     /** @type {Map<string, AssetInfo>} */
-
     const assetsInfo = new Map();
-
-    for (const asset of
-    /** @type {Compilation} */
-    compilation.getAssets()) {
+    for (const asset of /** @type {Compilation} */compilation.getAssets()) {
       assets[asset.name] = asset.source;
       assetsInfo.set(asset.name, asset.info);
     }
-    /** @type {Compilation} */
-
 
+    /** @type {Compilation} */
     compilation.fileDependencies.forEach(dep => {
       this.addDependency(dep);
     }, this);
-    /** @type {Compilation} */
 
+    /** @type {Compilation} */
     compilation.contextDependencies.forEach(dep => {
       this.addContextDependency(dep);
     }, this);
-
     if (!source) {
       callback(new Error("Didn't get a result from child compiler"));
       return;
     }
-
     let originalExports;
-
     try {
       originalExports = evalModuleCode(this, source, request);
     } catch (e) {
-      callback(
-      /** @type {Error} */
-      e);
+      callback( /** @type {Error} */e);
       return;
     }
-
     handleExports(originalExports, compilation, assets, assetsInfo);
   });
 }
-
 module.exports = {
   default: function loader() {},
   pitch

package/compiled/mini-css-extract-plugin/package.json

@@ -1 +1 @@
-{"name":"mini-css-extract-plugin","author":"Tobias Koppers @sokra","license":"MIT","types":"types/index.d.ts"}
+{"name":"mini-css-extract-plugin","version":"2.7.2","author":"Tobias Koppers @sokra","license":"MIT","types":"types/index.d.ts"}

package/compiled/mini-css-extract-plugin/utils.js

@@ -1,135 +1,116 @@
 "use strict";
 
 const NativeModule = require("module");
-
 const path = require("path");
-/** @typedef {import("webpack").Compilation} Compilation */
 
+/** @typedef {import("webpack").Compilation} Compilation */
 /** @typedef {import("webpack").Module} Module */
-
 /** @typedef {import("webpack").LoaderContext<any>} LoaderContext */
 
 /**
  * @returns {boolean}
  */
-
-
 function trueFn() {
   return true;
 }
+
 /**
  * @param {Compilation} compilation
  * @param {string | number} id
  * @returns {null | Module}
  */
-
-
 function findModuleById(compilation, id) {
   const {
     modules,
     chunkGraph
   } = compilation;
-
   for (const module of modules) {
     const moduleId = typeof chunkGraph !== "undefined" ? chunkGraph.getModuleId(module) : module.id;
-
     if (moduleId === id) {
       return module;
     }
   }
-
   return null;
 }
+
 /**
  * @param {LoaderContext} loaderContext
  * @param {string | Buffer} code
  * @param {string} filename
  * @returns {object}
  */
-
-
 function evalModuleCode(loaderContext, code, filename) {
   // @ts-ignore
-  const module = new NativeModule(filename, loaderContext); // @ts-ignore
+  const module = new NativeModule(filename, loaderContext);
 
+  // @ts-ignore
   module.paths = NativeModule._nodeModulePaths(loaderContext.context); // eslint-disable-line no-underscore-dangle
-
-  module.filename = filename; // @ts-ignore
-
+  module.filename = filename;
+  // @ts-ignore
   module._compile(code, filename); // eslint-disable-line no-underscore-dangle
 
-
   return module.exports;
 }
+
 /**
  * @param {string} a
  * @param {string} b
  * @returns {0 | 1 | -1}
  */
-
-
 function compareIds(a, b) {
   if (typeof a !== typeof b) {
     return typeof a < typeof b ? -1 : 1;
   }
-
   if (a < b) {
     return -1;
   }
-
   if (a > b) {
     return 1;
   }
-
   return 0;
 }
+
 /**
  * @param {Module} a
  * @param {Module} b
  * @returns {0 | 1 | -1}
  */
-
-
 function compareModulesByIdentifier(a, b) {
   return compareIds(a.identifier(), b.identifier());
 }
-
 const MODULE_TYPE = "css/mini-extract";
 const AUTO_PUBLIC_PATH = "__mini_css_extract_plugin_public_path_auto__";
 const ABSOLUTE_PUBLIC_PATH = "webpack:///mini-css-extract-plugin/";
 const BASE_URI = "webpack://";
 const SINGLE_DOT_PATH_SEGMENT = "__mini_css_extract_plugin_single_dot_path_segment__";
+
 /**
  * @param {string} str
  * @returns {boolean}
  */
-
 function isAbsolutePath(str) {
   return path.posix.isAbsolute(str) || path.win32.isAbsolute(str);
 }
-
 const RELATIVE_PATH_REGEXP = /^\.\.?[/\\]/;
+
 /**
  * @param {string} str
  * @returns {boolean}
  */
-
 function isRelativePath(str) {
   return RELATIVE_PATH_REGEXP.test(str);
-} // TODO simplify for the next major release
+}
 
+// TODO simplify for the next major release
 /**
  * @param {LoaderContext} loaderContext
  * @param {string} request
  * @returns {string}
  */
-
-
 function stringifyRequest(loaderContext, request) {
   if (typeof loaderContext.utils !== "undefined" && typeof loaderContext.utils.contextify === "function") {
     return JSON.stringify(loaderContext.utils.contextify(loaderContext.context || loaderContext.rootContext, request));
   }
-
   const splitted = request.split("!");
   const {
     context
@@ -139,40 +120,35 @@ function stringifyRequest(loaderContext, request) {
     const splittedPart = part.match(/^(.*?)(\?.*)/);
     const query = splittedPart ? splittedPart[2] : "";
     let singlePath = splittedPart ? splittedPart[1] : part;
-
     if (isAbsolutePath(singlePath) && context) {
       singlePath = path.relative(context, singlePath);
-
       if (isAbsolutePath(singlePath)) {
         // If singlePath still matches an absolute path, singlePath was on a different drive than context.
         // In this case, we leave the path platform-specific without replacing any separators.
         // @see https://github.com/webpack/loader-utils/pull/14
         return singlePath + query;
       }
-
       if (isRelativePath(singlePath) === false) {
         // Ensure that the relative path starts at least with ./ otherwise it would be a request into the modules directory (like node_modules).
         singlePath = `./${singlePath}`;
       }
     }
-
     return singlePath.replace(/\\/g, "/") + query;
   }).join("!"));
 }
+
 /**
  * @param {string} filename
  * @param {string} outputPath
  * @param {boolean} enforceRelative
  * @returns {string}
  */
-
-
 function getUndoPath(filename, outputPath, enforceRelative) {
   let depth = -1;
-  let append = ""; // eslint-disable-next-line no-param-reassign
+  let append = "";
 
+  // eslint-disable-next-line no-param-reassign
   outputPath = outputPath.replace(/[\\/]$/, "");
-
   for (const part of filename.split(/[/\\]+/)) {
     if (part === "..") {
       if (depth > -1) {
@@ -182,13 +158,12 @@ function getUndoPath(filename, outputPath, enforceRelative) {
         const i = outputPath.lastIndexOf("/");
         const j = outputPath.lastIndexOf("\\");
         const pos = i < 0 ? j : j < 0 ? i : Math.max(i, j);
-
         if (pos < 0) {
           return `${outputPath}/`;
         }
+        append = `${outputPath.slice(pos + 1)}/${append}`;
 
-        append = `${outputPath.slice(pos + 1)}/${append}`; // eslint-disable-next-line no-param-reassign
-
+        // eslint-disable-next-line no-param-reassign
         outputPath = outputPath.slice(0, pos);
       }
     } else if (part !== ".") {
@@ -196,10 +171,17 @@ function getUndoPath(filename, outputPath, enforceRelative) {
       depth++;
     }
   }
-
   return depth > 0 ? `${"../".repeat(depth)}${append}` : enforceRelative ? `./${append}` : append;
 }
 
+/**
+ *
+ * @param {string | function} value
+ * @returns {string}
+ */
+function stringifyLocal(value) {
+  return typeof value === "function" ? value.toString() : JSON.stringify(value);
+}
 module.exports = {
   trueFn,
   findModuleById,
@@ -211,5 +193,6 @@ module.exports = {
   BASE_URI,
   SINGLE_DOT_PATH_SEGMENT,
   stringifyRequest,
+  stringifyLocal,
   getUndoPath
 };