@umijs/bundler-webpack 4.0.69 → 4.0.70

package/dist/config/config.js

@@ -47,6 +47,7 @@ var import_compressPlugin = require("./compressPlugin");
 var import_copyPlugin = require("./copyPlugin");
 var import_cssRules = require("./cssRules");
 var import_definePlugin = require("./definePlugin");
+var import_detectCssModulesInDependence = require("./detectCssModulesInDependence");
 var import_detectDeadCodePlugin = require("./detectDeadCodePlugin");
 var import_fastRefreshPlugin = require("./fastRefreshPlugin");
 var import_forkTSCheckerPlugin = require("./forkTSCheckerPlugin");
@@ -147,6 +148,7 @@ async function getConfig(opts) {
   await (0, import_ssrPlugin.default)(applyOpts);
   await (0, import_compressPlugin.addCompressPlugin)(applyOpts);
   await (0, import_harmonyLinkingErrorPlugin.addHarmonyLinkingErrorPlugin)(applyOpts);
+  await (0, import_detectCssModulesInDependence.addDependenceCssModulesDetector)(applyOpts);
   if (userConfig.runtimePublicPath) {
     config.plugin("runtimePublicPath").use(import_RuntimePublicPathPlugin.RuntimePublicPathPlugin);
   }

package/dist/config/detectCssModulesInDependence.d.ts

@@ -0,0 +1,10 @@
+import Config from '@umijs/bundler-webpack/compiled/webpack-5-chain';
+import { IConfig } from '../types';
+interface IOpts {
+    userConfig: IConfig;
+    config: Config;
+    cwd: string;
+    extraBabelIncludes: Array<string | RegExp>;
+}
+export declare function addDependenceCssModulesDetector(opts: IOpts): Promise<void>;
+export {};

package/dist/config/detectCssModulesInDependence.js

@@ -0,0 +1,151 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/config/detectCssModulesInDependence.ts
+var detectCssModulesInDependence_exports = {};
+__export(detectCssModulesInDependence_exports, {
+  addDependenceCssModulesDetector: () => addDependenceCssModulesDetector
+});
+module.exports = __toCommonJS(detectCssModulesInDependence_exports);
+var import_utils = require("@umijs/utils");
+var import_path = require("path");
+async function addDependenceCssModulesDetector(opts) {
+  const { config, cwd, userConfig } = opts;
+  if (!userConfig.checkDepCssModules)
+    return;
+  const matchers = opts.extraBabelIncludes.map(function(p) {
+    if (import_utils.lodash.isRegExp(p)) {
+      return p;
+    }
+    let absPath;
+    if ((0, import_path.isAbsolute)(p)) {
+      absPath = p;
+    }
+    try {
+      if (p.startsWith("./")) {
+        absPath = require.resolve(p, { paths: [cwd] });
+      }
+      absPath = (0, import_path.dirname)(
+        import_utils.resolve.sync(`${p}/package.json`, {
+          basedir: cwd,
+          // same behavior as webpack, to ensure `include` paths matched
+          // ref: https://webpack.js.org/configuration/resolve/#resolvesymlinks
+          preserveSymlinks: false
+        })
+      );
+      return toRegExp(absPath);
+    } catch (e) {
+      if (e.code === "MODULE_NOT_FOUND") {
+        throw new Error("Cannot resolve extraBabelIncludes: " + p, {
+          cause: e
+        });
+      }
+      throw e;
+    }
+  });
+  config.plugin("dep-css-modules-detector").use(DetectCSsModulePlugin, [matchers]);
+}
+var _DetectCSsModulePlugin = class {
+  constructor(skipMatcher = []) {
+    this.skipMatcher = skipMatcher;
+  }
+  isCallRequireStyle(statement) {
+    if (
+      // var x= require(...) ?
+      statement.type === "CallExpression" && statement.callee.type === "Identifier" && statement.callee.name === "require" && // var x = require('xxxxx')
+      statement.arguments.length === 1 && statement.arguments[0].type === "Literal"
+    ) {
+      const requireArg = statement.arguments[0].value;
+      if (requireArg.endsWith(".less") || requireArg.endsWith(".css")) {
+        return true;
+      }
+    }
+    return false;
+  }
+  apply(compiler) {
+    compiler.hooks.normalModuleFactory.tap(
+      _DetectCSsModulePlugin.PLUGIN_NAME,
+      (factory) => {
+        factory.hooks.parser.for("javascript/auto").tap("lessDetector", (parser) => {
+          parser.hooks.import.tap(
+            "lessDetector",
+            (statement, source) => {
+              var _a, _b;
+              const specifiers = statement.specifiers.length;
+              if (specifiers > 0 && (source.endsWith(".less") || source.endsWith(".css")) && this.isJSModule(parser)) {
+                this.throwError((_b = (_a = parser.state) == null ? void 0 : _a.module) == null ? void 0 : _b.resource, compiler);
+              }
+            }
+          );
+          parser.hooks.program.tap(
+            _DetectCSsModulePlugin.PLUGIN_NAME,
+            (program) => {
+              var _a, _b, _c, _d;
+              if (this.isJSModule(parser)) {
+                for (const statement of program.body) {
+                  if (statement.type === "AssignmentExpression" && // x= require("x.less") or var x = require(".css") ?
+                  this.isCallRequireStyle(statement.right)) {
+                    this.throwError((_b = (_a = parser.state) == null ? void 0 : _a.module) == null ? void 0 : _b.resource, compiler);
+                  }
+                  if (statement.type === "VariableDeclarator" && // var x= require("x.less") or var x = require(".css") ?
+                  this.isCallRequireStyle(statement.init)) {
+                    this.throwError((_d = (_c = parser.state) == null ? void 0 : _c.module) == null ? void 0 : _d.resource, compiler);
+                  }
+                }
+              }
+            }
+          );
+        });
+      }
+    );
+  }
+  isJSModule(parser) {
+    var _a, _b;
+    let res = (_b = (_a = parser.state) == null ? void 0 : _a.module) == null ? void 0 : _b.resource;
+    if (res) {
+      if (this.skipMatcher.some((r) => r.test(res))) {
+        return false;
+      }
+      return res.indexOf("node_modules") >= 0 && (res.endsWith(".js") || res.endsWith(".jsx"));
+    }
+    return false;
+  }
+  throwError(file, c) {
+    const logger = c.getInfrastructureLogger(_DetectCSsModulePlugin.PLUGIN_NAME) || console;
+    logger.error(import_utils.chalk.red(`Dependence file ${file} contains css module`));
+    logger.error(
+      import_utils.chalk.red(
+        `Please add the package's name in 'babelExtraIncludes' or use non-css module in dependence`
+      )
+    );
+    throw Error(_DetectCSsModulePlugin.ERROR_NAME);
+  }
+};
+var DetectCSsModulePlugin = _DetectCSsModulePlugin;
+DetectCSsModulePlugin.PLUGIN_NAME = "depCssModulesDetector";
+DetectCSsModulePlugin.ERROR_NAME = "USE CSS-MODULES IN NODE_MODULES";
+var toRegExp = (test) => {
+  if (typeof test === "string") {
+    return new RegExp("^" + test.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"));
+  }
+  return test;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  addDependenceCssModulesDetector
+});

package/dist/dev.js

@@ -157,7 +157,7 @@ async function setup(opts) {
     rootDir: opts.rootDir,
     env: import_types.Env.development,
     entry: opts.entry,
-    userConfig: opts.config,
+    userConfig: { ...opts.config, forkTSChecker: false },
     disableCopy: true,
     hash: true,
     staticPathPrefix: import_mfsu.MF_DEP_PREFIX,

package/dist/schema.js

@@ -58,6 +58,7 @@ function getSchemas() {
     babelLoaderCustomize: ({ zod }) => zod.string(),
     cacheDirectoryPath: ({ zod }) => zod.string(),
     chainWebpack: ({ zod }) => zod.function(),
+    checkDepCssModules: ({ zod }) => zod.boolean().default(false),
     copy: ({ zod }) => zod.array(
       zod.union([
         zod.object({

package/dist/types.d.ts

@@ -125,6 +125,7 @@ export interface IConfig {
     babelLoaderCustomize?: string;
     analyze?: BundleAnalyzerPlugin.Options;
     esbuildMinifyIIFE?: boolean;
+    checkDepCssModules?: boolean;
     [key: string]: any;
 }
 export interface ISrcTranspilerOpts {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.69",
+  "version": "4.0.70",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -38,10 +38,10 @@
     "postcss-preset-env": "7.5.0",
     "react-error-overlay": "6.0.9",
     "react-refresh": "0.14.0",
-    "@umijs/babel-preset-umi": "4.0.69",
-    "@umijs/bundler-utils": "4.0.69",
-    "@umijs/mfsu": "4.0.69",
-    "@umijs/utils": "4.0.69"
+    "@umijs/bundler-utils": "4.0.70",
+    "@umijs/babel-preset-umi": "4.0.70",
+    "@umijs/mfsu": "4.0.70",
+    "@umijs/utils": "4.0.70"
   },
   "devDependencies": {
     "@swc/core": "1.3.24",