@umijs/bundler-esbuild 4.0.0-rc.12 → 4.0.0-rc.15

package/dist/build.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,40 +11,47 @@ const alias_1 = __importDefault(require("./plugins/alias"));
 const externals_1 = __importDefault(require("./plugins/externals"));
 const less_1 = __importDefault(require("./plugins/less"));
 const style_1 = require("./plugins/style");
-function build(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const outputPath = opts.config.outputPath || (0, path_1.join)(opts.cwd, 'dist');
-        if (opts.clean) {
-            utils_1.rimraf.sync(outputPath);
-        }
-        return yield (0, esbuild_1.build)({
-            entryPoints: opts.entry,
-            bundle: true,
-            format: opts.format || 'iife',
-            logLevel: 'error',
-            // splitting: true,
-            sourcemap: opts.sourcemap,
-            outdir: outputPath,
-            metafile: true,
-            plugins: [
-                (0, less_1.default)(Object.assign({ modifyVars: opts.config.theme, javascriptEnabled: true, alias: opts.config.alias, 
-                    // ref: https://github.com/umijs/umi-next/pull/214
-                    inlineStyle: opts.inlineStyle, config: opts.config }, opts.config.lessLoader)),
-                opts.config.alias && (0, alias_1.default)(addCwdPrefix(opts.config.alias, opts.cwd)),
-                opts.config.externals && (0, externals_1.default)(opts.config.externals),
-                (0, style_1.style)({
-                    inlineStyle: opts.inlineStyle,
-                    config: opts.config,
-                }),
-            ].filter(Boolean),
-            define: Object.assign({ 
-                // __dirname sham
-                __dirname: JSON.stringify('__dirname'), 'process.env.NODE_ENV': JSON.stringify(opts.mode || 'development') }, opts.config.define),
-            loader: {
-                '.svg': 'dataurl',
-                '.ttf': 'dataurl',
-            },
-        });
+async function build(opts) {
+    const outputPath = opts.config.outputPath || (0, path_1.join)(opts.cwd, 'dist');
+    if (opts.clean) {
+        utils_1.rimraf.sync(outputPath);
+    }
+    return await (0, esbuild_1.build)({
+        entryPoints: opts.entry,
+        bundle: true,
+        format: opts.format || 'iife',
+        logLevel: 'error',
+        // splitting: true,
+        sourcemap: opts.sourcemap,
+        outdir: outputPath,
+        metafile: true,
+        plugins: [
+            (0, less_1.default)({
+                modifyVars: opts.config.theme,
+                javascriptEnabled: true,
+                alias: opts.config.alias,
+                // ref: https://github.com/umijs/umi-next/pull/214
+                inlineStyle: opts.inlineStyle,
+                config: opts.config,
+                ...opts.config.lessLoader,
+            }),
+            opts.config.alias && (0, alias_1.default)(addCwdPrefix(opts.config.alias, opts.cwd)),
+            opts.config.externals && (0, externals_1.default)(opts.config.externals),
+            (0, style_1.style)({
+                inlineStyle: opts.inlineStyle,
+                config: opts.config,
+            }),
+        ].filter(Boolean),
+        define: {
+            // __dirname sham
+            __dirname: JSON.stringify('__dirname'),
+            'process.env.NODE_ENV': JSON.stringify(opts.mode || 'development'),
+            ...opts.config.define,
+        },
+        loader: {
+            '.svg': 'dataurl',
+            '.ttf': 'dataurl',
+        },
     });
 }
 exports.build = build;

package/dist/cli.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -38,11 +29,11 @@ if ((0, fs_1.existsSync)(configFile)) {
 }
 Object.assign(config, args);
 if (command === 'build') {
-    (() => __awaiter(void 0, void 0, void 0, function* () {
+    (async () => {
         process.env.NODE_ENV = 'production';
         (0, assert_1.default)(entry, `Build failed: entry not found.`);
         try {
-            yield (0, build_1.build)({
+            await (0, build_1.build)({
                 config,
                 cwd,
                 entry: {
@@ -53,7 +44,7 @@ if (command === 'build') {
         catch (e) {
             console.error(e);
         }
-    }))();
+    })();
 }
 else {
     error(`Unsupported command ${command}.`);

package/dist/plugins/alias.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -21,11 +12,9 @@ const resolver = enhanced_resolve_1.default.create({
     // TODO: support exports
     exportsFields: [],
 });
-function resolve(context, path) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            resolver(context, path, (err, result) => err ? reject(err) : resolve(result));
-        });
+async function resolve(context, path) {
+    return new Promise((resolve, reject) => {
+        resolver(context, path, (err, result) => err ? reject(err) : resolve(result));
     });
 }
 // https://esbuild.github.io/plugins/#resolve-callbacks
@@ -43,22 +32,22 @@ exports.default = (options = {}) => {
                 else {
                     filter = new RegExp(`^${key}$`);
                 }
-                onResolve({ filter: filter }, (args) => __awaiter(this, void 0, void 0, function* () {
-                    const path = yield resolve(args.importer, args.path.replace(filter, value));
+                onResolve({ filter: filter }, async (args) => {
+                    const path = await resolve(args.importer, args.path.replace(filter, value));
                     return {
                         path,
                     };
-                }));
+                });
                 if (!key.endsWith('/') &&
                     (0, fs_1.existsSync)(value) &&
                     (0, fs_1.statSync)(value).isDirectory()) {
                     const filter = new RegExp(`^${addSlashAffix(key)}`);
-                    onResolve({ filter }, (args) => __awaiter(this, void 0, void 0, function* () {
-                        const path = yield resolve(args.importer, args.path.replace(filter, addSlashAffix(value)));
+                    onResolve({ filter }, async (args) => {
+                        const path = await resolve(args.importer, args.path.replace(filter, addSlashAffix(value)));
                         return {
                             path,
                         };
-                    }));
+                    });
                 }
             });
         },

package/dist/plugins/less.js

@@ -1,24 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -47,27 +27,25 @@ const resolver = enhanced_resolve_1.default.create({
     // TODO: support exports
     exportsFields: [],
 });
-function resolve(context, path) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            resolver(context, path, (err, result) => err ? reject(err) : resolve(result));
-        });
+async function resolve(context, path) {
+    return new Promise((resolve, reject) => {
+        resolver(context, path, (err, result) => err ? reject(err) : resolve(result));
     });
 }
-const aliasLessImports = (ctx, alias, importer) => __awaiter(void 0, void 0, void 0, function* () {
+const aliasLessImports = async (ctx, alias, importer) => {
     const importRegex = /@import(?:\s+\((.*)\))?\s+['"](.*)['"]/;
     const globalImportRegex = /@import(?:\s+\((.*)\))?\s+['"](.*)['"]/g;
     const match = ctx.match(globalImportRegex) || [];
     for (const el of match) {
         const [imp, _, filePath] = el.match(importRegex) || [];
-        let aliaPath = yield (0, exports.aliasLessImportPath)(filePath, alias, importer);
+        let aliaPath = await (0, exports.aliasLessImportPath)(filePath, alias, importer);
         if (aliaPath) {
             ctx = ctx.replace(imp, el.replace(filePath, aliaPath));
         }
     }
     return ctx;
-});
-const aliasLessImportPath = (filePath, alias, importer) => __awaiter(void 0, void 0, void 0, function* () {
+};
+const aliasLessImportPath = async (filePath, alias, importer) => {
     // ～ 写法在 esbuild 中无实际意义
     let aliaPath = filePath.startsWith('~')
         ? filePath.replace('~', '')
@@ -79,23 +57,23 @@ const aliasLessImportPath = (filePath, alias, importer) => __awaiter(void 0, voi
             pathSegments[0] = alias[key];
             aliaPath = pathSegments.join('/');
             aliaPath = path_1.default.extname(aliaPath) ? aliaPath : `${aliaPath}.less`;
-            return yield resolve(importer, aliaPath);
+            return await resolve(importer, aliaPath);
         }
     }
     return null;
-});
+};
 exports.aliasLessImportPath = aliasLessImportPath;
 exports.default = (options = {}) => {
-    const { alias, inlineStyle, config } = options, lessOptions = __rest(options, ["alias", "inlineStyle", "config"]);
+    const { alias, inlineStyle, config, ...lessOptions } = options;
     return {
         name: 'less',
         setup({ onResolve, onLoad }) {
-            onResolve({ filter: /\.less$/, namespace: 'file' }, (args) => __awaiter(this, void 0, void 0, function* () {
+            onResolve({ filter: /\.less$/, namespace: 'file' }, async (args) => {
                 let filePath = args.path;
                 let isMatchedAlias = false;
                 // first match alias
                 if (!!alias) {
-                    const aliasMatchPath = yield (0, exports.aliasLessImportPath)(filePath, alias, args.path);
+                    const aliasMatchPath = await (0, exports.aliasLessImportPath)(filePath, alias, args.path);
                     if (aliasMatchPath) {
                         isMatchedAlias = true;
                         filePath = aliasMatchPath;
@@ -105,7 +83,7 @@ exports.default = (options = {}) => {
                 if (!isMatchedAlias) {
                     const isImportFromDeps = !path_1.default.isAbsolute(filePath) && !filePath.startsWith('.');
                     if (isImportFromDeps) {
-                        filePath = yield resolve(process.cwd(), filePath);
+                        filePath = await resolve(process.cwd(), filePath);
                     }
                     else {
                         filePath = path_1.default.resolve(process.cwd(), path_1.default.relative(process.cwd(), args.resolveDir), args.path);
@@ -115,7 +93,7 @@ exports.default = (options = {}) => {
                     path: filePath,
                     namespace: inlineStyle ? 'less-file' : 'file',
                 };
-            }));
+            });
             if (inlineStyle) {
                 onResolve({ filter: /\.less$/, namespace: 'less-file' }, (args) => {
                     return { path: args.path, namespace: 'less-content' };
@@ -125,32 +103,36 @@ exports.default = (options = {}) => {
                     namespace: 'style-helper',
                     sideEffects: false,
                 }));
-                onLoad({ filter: /.*/, namespace: 'less-file' }, (args) => __awaiter(this, void 0, void 0, function* () {
-                    return ({
-                        contents: `
+                onLoad({ filter: /.*/, namespace: 'less-file' }, async (args) => ({
+                    contents: `
             import { injectStyle } from "__style_helper__"
             import css from ${JSON.stringify(args.path)}
             injectStyle(css)
             export default{}
           `,
-                    });
                 }));
             }
-            onLoad({ filter: /\.less$/, namespace: inlineStyle ? 'less-content' : 'file' }, (args) => __awaiter(this, void 0, void 0, function* () {
-                let content = yield fs_1.promises.readFile(args.path, 'utf-8');
+            onLoad({ filter: /\.less$/, namespace: inlineStyle ? 'less-content' : 'file' }, async (args) => {
+                let content = await fs_1.promises.readFile(args.path, 'utf-8');
                 if (!!alias) {
-                    content = yield aliasLessImports(content, alias, args.path);
+                    content = await aliasLessImports(content, alias, args.path);
                 }
                 const dir = path_1.default.dirname(args.path);
                 const filename = path_1.default.basename(args.path);
                 try {
-                    const result = yield less_1.default.render(content, Object.assign(Object.assign({ plugins: [
+                    const result = await less_1.default.render(content, {
+                        plugins: [
                             new less_plugin_aliases_1.default({
                                 prefix: '~',
                                 aliases: alias || {},
                             }),
-                        ], filename, rootpath: dir }, lessOptions), { paths: [...(lessOptions.paths || []), dir] }));
-                    const postcssrResult = yield (0, postcssProcess_1.postcssProcess)(config, result.css, args.path);
+                        ],
+                        filename,
+                        rootpath: dir,
+                        ...lessOptions,
+                        paths: [...(lessOptions.paths || []), dir],
+                    });
+                    const postcssrResult = await (0, postcssProcess_1.postcssProcess)(config, result.css, args.path);
                     return {
                         contents: postcssrResult.css,
                         loader: inlineStyle ? 'text' : 'css',
@@ -173,7 +155,7 @@ exports.default = (options = {}) => {
                         resolveDir: dir,
                     };
                 }
-            }));
+            });
         },
     };
 };

package/dist/plugins/style.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -56,9 +47,8 @@ function style({ minify = true, charset = 'utf8', inlineStyle, config, } = {}) {
                     namespace: 'style-helper',
                     sideEffects: false,
                 }));
-                onLoad({ filter: /.*/, namespace: 'style-helper' }, () => __awaiter(this, void 0, void 0, function* () {
-                    return ({
-                        contents: `
+                onLoad({ filter: /.*/, namespace: 'style-helper' }, async () => ({
+                    contents: `
             export function injectStyle(text) {
               if (typeof document !== 'undefined') {
                 var style = document.createElement('style')
@@ -68,24 +58,21 @@ function style({ minify = true, charset = 'utf8', inlineStyle, config, } = {}) {
               }
             }
           `,
-                    });
                 }));
-                onLoad({ filter: /.*/, namespace: 'style-stub' }, (args) => __awaiter(this, void 0, void 0, function* () {
-                    return ({
-                        contents: `
+                onLoad({ filter: /.*/, namespace: 'style-stub' }, async (args) => ({
+                    contents: `
             import { injectStyle } from "__style_helper__"
             import css from ${JSON.stringify(args.path)}
             injectStyle(css)
           `,
-                    });
                 }));
             }
             onLoad({
                 filter: inlineStyle ? /.*/ : /\.css$/,
                 namespace: inlineStyle ? 'style-content' : 'file',
-            }, (args) => __awaiter(this, void 0, void 0, function* () {
-                const options = Object.assign({ entryPoints: [args.path] }, opt);
-                const { errors, warnings, outputFiles } = yield esbuild_1.default.build(options);
+            }, async (args) => {
+                const options = { entryPoints: [args.path], ...opt };
+                const { errors, warnings, outputFiles } = await esbuild_1.default.build(options);
                 if (errors.length > 0) {
                     return {
                         errors,
@@ -96,7 +83,7 @@ function style({ minify = true, charset = 'utf8', inlineStyle, config, } = {}) {
                 }
                 const dir = path_1.default.dirname(args.path);
                 try {
-                    const result = yield (0, postcssProcess_1.postcssProcess)(config, outputFiles[0].text, args.path);
+                    const result = await (0, postcssProcess_1.postcssProcess)(config, outputFiles[0].text, args.path);
                     return {
                         errors,
                         warnings,
@@ -120,7 +107,7 @@ function style({ minify = true, charset = 'utf8', inlineStyle, config, } = {}) {
                         resolveDir: dir,
                     };
                 }
-            }));
+            });
         },
     };
 }

package/dist/utils/postcssProcess.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,19 +6,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.postcssProcess = void 0;
 const postcss_1 = __importDefault(require("postcss"));
 const getBrowserlist_1 = require("./getBrowserlist");
-function postcssProcess(config, css, path) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield (0, postcss_1.default)([
-            require('postcss-flexbugs-fixes'),
-            require('postcss-preset-env')({
-                browsers: (0, getBrowserlist_1.getBrowserlist)((config === null || config === void 0 ? void 0 : config.targets) || {}),
-                autoprefixer: Object.assign({ flexbox: 'no-2009' }, config === null || config === void 0 ? void 0 : config.autoprefixer),
-                stage: 3,
-            }),
-        ].concat((config === null || config === void 0 ? void 0 : config.extraPostCSSPlugins) || [])).process(css, {
-            from: path,
-            to: path,
-        });
+async function postcssProcess(config, css, path) {
+    return await (0, postcss_1.default)([
+        require('postcss-flexbugs-fixes'),
+        require('postcss-preset-env')({
+            browsers: (0, getBrowserlist_1.getBrowserlist)((config === null || config === void 0 ? void 0 : config.targets) || {}),
+            autoprefixer: {
+                flexbox: 'no-2009',
+                ...config === null || config === void 0 ? void 0 : config.autoprefixer,
+            },
+            stage: 3,
+        }),
+    ].concat((config === null || config === void 0 ? void 0 : config.extraPostCSSPlugins) || [])).process(css, {
+        from: path,
+        to: path,
     });
 }
 exports.postcssProcess = postcssProcess;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-esbuild",
-  "version": "4.0.0-rc.12",
+  "version": "4.0.0-rc.15",
   "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",
@@ -19,13 +19,13 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.12",
-    "@umijs/utils": "4.0.0-rc.12",
+    "@umijs/bundler-utils": "4.0.0-rc.15",
+    "@umijs/utils": "4.0.0-rc.15",
     "enhanced-resolve": "5.9.2",
     "less-plugin-aliases": "^1.0.3",
     "postcss": "^8.4.12",