@umijs/bundler-esbuild 4.0.0-rc.20 → 4.0.0-rc.23

package/dist/plugins/externals.d.ts

@@ -1,3 +1,3 @@
 import { Plugin } from '@umijs/bundler-utils/compiled/esbuild';
-declare const _default: (options?: Record<string, string> | undefined) => Plugin;
+declare const _default: (options?: Record<string, string>) => Plugin;
 export default _default;

package/dist/plugins/less-plugin-alias/index.d.ts

@@ -0,0 +1,9 @@
+interface Options {
+    alias: Record<string, string>;
+}
+export default class LessAliasPlugin {
+    private options;
+    constructor(options: Options);
+    install(less: LessStatic, pluginManager: Less.PluginManager): void;
+}
+export {};

package/dist/plugins/less-plugin-alias/index.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@umijs/utils");
+const utils_2 = require("./utils");
+function matches(pattern, importee) {
+    if (pattern instanceof RegExp) {
+        return pattern.test(importee);
+    }
+    if (importee.length < pattern.length) {
+        return false;
+    }
+    if (importee === pattern) {
+        return true;
+    }
+    return importee.startsWith(pattern + '/');
+}
+class LessAliasPlugin {
+    constructor(options) {
+        this.options = options;
+    }
+    install(less, pluginManager) {
+        const alias = (0, utils_2.parseAlias)(this.options.alias);
+        function resolveId(filename) {
+            if (!filename) {
+                return null;
+            }
+            // First match is supposed to be the correct one
+            const matchedEntry = alias.find((entry) => matches(entry.find, filename));
+            if (!matchedEntry) {
+                return filename;
+            }
+            const resolvedPath = filename.replace(matchedEntry.find, matchedEntry.replacement);
+            return resolvedPath;
+        }
+        class AliasePlugin extends less.FileManager {
+            loadFile(filename, currentDirectory, options, enviroment) {
+                let resolved;
+                try {
+                    resolved = resolveId(filename);
+                }
+                catch (error) {
+                    utils_1.logger.error(error);
+                }
+                if (!resolved) {
+                    const error = new Error(`[less-plugin-alias]: '${filename}' not found.`);
+                    utils_1.logger.error(error);
+                    throw error;
+                }
+                return super.loadFile(resolved, currentDirectory, options, enviroment);
+            }
+            loadFileSync(filename, currentDirectory, options, enviroment) {
+                let resolved;
+                try {
+                    resolved = resolveId(filename);
+                }
+                catch (error) {
+                    utils_1.logger.error(error);
+                }
+                if (!resolved) {
+                    const error = new Error(`[less-plugin-alias]: '${filename}' not found.`);
+                    utils_1.logger.error(error);
+                    throw error;
+                }
+                return super.loadFileSync(resolved, currentDirectory, options, enviroment);
+            }
+        }
+        pluginManager.addFileManager(new AliasePlugin());
+    }
+}
+exports.default = LessAliasPlugin;

package/dist/plugins/less-plugin-alias/types.d.ts

@@ -0,0 +1,4 @@
+export interface Alias {
+    find: string | RegExp;
+    replacement: string;
+}

package/dist/plugins/less-plugin-alias/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/plugins/less-plugin-alias/utils.d.ts

@@ -0,0 +1,2 @@
+import { Alias } from './types';
+export declare function parseAlias(alias: Record<string, string>): Alias[];

package/dist/plugins/less-plugin-alias/utils.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseAlias = void 0;
+function hoistAlias(alias) {
+    function getFinalReplacement(oAlias, replacement, index) {
+        //过滤重复配置，防止死循环
+        const newAlias = oAlias.slice();
+        newAlias.splice(index, 1);
+        //遍历找到需要深层替换的配置
+        for (let i = 0; i < newAlias.length; i++) {
+            if (newAlias[i].find.test(replacement)) {
+                replacement = replacement.replace(newAlias[i].find, newAlias[i].replacement);
+                return getFinalReplacement(newAlias, replacement, i);
+            }
+        }
+        return replacement;
+    }
+    alias.forEach((rule, index, alias) => {
+        rule.replacement = getFinalReplacement(alias, rule.replacement, index);
+    });
+    return alias;
+}
+function parseAlias(alias) {
+    const wholeAlias = [
+        // to support less-loader ~ for local deps, refer: https://github.com/vitejs/vite/issues/2185
+        { find: /^~/, replacement: '' },
+    ];
+    const userAlias = Object.entries(alias).map(([name, target]) => ({
+        find: new RegExp(`^~?${name.replace(/(?<!\$)$/, '(?=/|$)')}`),
+        replacement: target,
+    }));
+    wholeAlias.unshift(...userAlias);
+    return hoistAlias(wholeAlias);
+}
+exports.parseAlias = parseAlias;

package/dist/plugins/less.js

@@ -7,10 +7,10 @@ exports.aliasLessImportPath = void 0;
 const less_1 = __importDefault(require("@umijs/bundler-utils/compiled/less"));
 const enhanced_resolve_1 = __importDefault(require("enhanced-resolve"));
 const fs_1 = require("fs");
-const less_plugin_aliases_1 = __importDefault(require("less-plugin-aliases"));
 const path_1 = __importDefault(require("path"));
 const postcssProcess_1 = require("../utils/postcssProcess");
 const sortByAffix_1 = require("../utils/sortByAffix");
+const less_plugin_alias_1 = __importDefault(require("./less-plugin-alias"));
 const resolver = enhanced_resolve_1.default.create({
     mainFields: ['module', 'browser', 'main'],
     extensions: [
@@ -122,9 +122,8 @@ exports.default = (options = {}) => {
                 try {
                     const result = await less_1.default.render(content, {
                         plugins: [
-                            new less_plugin_aliases_1.default({
-                                prefix: '~',
-                                aliases: alias || {},
+                            new less_plugin_alias_1.default({
+                                alias: alias || {},
                             }),
                         ],
                         filename,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-esbuild",
-  "version": "4.0.0-rc.20",
+  "version": "4.0.0-rc.23",
   "description": "@umijs/bundler-esbuild",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-esbuild#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -24,10 +24,9 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.20",
-    "@umijs/utils": "4.0.0-rc.20",
+    "@umijs/bundler-utils": "4.0.0-rc.23",
+    "@umijs/utils": "4.0.0-rc.23",
     "enhanced-resolve": "5.9.3",
-    "less-plugin-aliases": "^1.0.3",
     "postcss": "^8.4.13",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-preset-env": "7.5.0"