@shuvi/toolpack 0.0.1-rc.8 → 1.0.0-rc.1

package/lib/utils/bundle-require.js

@@ -0,0 +1,143 @@
+"use strict";
+// modified from https://github.com/egoist/bundle-require/blob/dd96549a9b995d6a827baee022eb324fd2fac2ef/src/index.ts
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bundleRequire = exports.replaceDirnamePlugin = exports.externalPlugin = exports.match = exports.JS_EXT_RE = exports.PATH_SEG_RE = void 0;
+const fs_1 = require("fs");
+const path = __importStar(require("path"));
+const esbuild_1 = require("esbuild");
+exports.PATH_SEG_RE = /\/|\\/g;
+const CACHE_DIR = path.join(process.cwd(), './node_modules/.bundle-require');
+function inferLoader(ext) {
+    if (ext === '.mjs' || ext === '.cjs')
+        return 'js';
+    return ext.slice(1);
+}
+exports.JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/;
+const defaultGetOutputFile = (filepath) => path.join(CACHE_DIR, filepath
+    .replace(exports.PATH_SEG_RE, '_')
+    .replace(exports.JS_EXT_RE, `.bundled_${Date.now()}.cjs`));
+const match = (id, patterns) => {
+    if (!patterns)
+        return false;
+    return patterns.some(p => {
+        if (p instanceof RegExp) {
+            return p.test(id);
+        }
+        return id === p || id.startsWith(p + '/');
+    });
+};
+exports.match = match;
+/**
+ * An esbuild plugin to mark node_modules as external
+ */
+const externalPlugin = ({ external, notExternal } = {}) => {
+    return {
+        name: 'bundle-require:external',
+        setup(ctx) {
+            ctx.onResolve({ filter: /.*/ }, (args) => __awaiter(this, void 0, void 0, function* () {
+                if (args.path[0] === '.' || path.isAbsolute(args.path)) {
+                    // Fallback to default
+                    return;
+                }
+                if ((0, exports.match)(args.path, external)) {
+                    return {
+                        external: true
+                    };
+                }
+                if ((0, exports.match)(args.path, notExternal)) {
+                    // Should be resolved by esbuild
+                    return;
+                }
+                // Most like importing from node_modules, mark external
+                return {
+                    external: true
+                };
+            }));
+        }
+    };
+};
+exports.externalPlugin = externalPlugin;
+const replaceDirnamePlugin = () => {
+    return {
+        name: 'bundle-require:replace-path',
+        setup(ctx) {
+            ctx.onLoad({ filter: exports.JS_EXT_RE }, (args) => __awaiter(this, void 0, void 0, function* () {
+                const contents = yield fs_1.promises.readFile(args.path, 'utf-8');
+                return {
+                    contents: contents
+                        .replace(/[^"'\\]\b__filename\b[^"'\\]/g, match => match.replace('__filename', JSON.stringify(args.path)))
+                        .replace(/[^"'\\]\b__dirname\b[^"'\\]/g, match => match.replace('__dirname', JSON.stringify(path.dirname(args.path))))
+                        .replace(/[^"'\\]\bimport\.meta\.url\b[^"'\\]/g, match => match.replace('import.meta.url', JSON.stringify(`file://${args.path}`))),
+                    loader: inferLoader(path.extname(args.path))
+                };
+            }));
+        }
+    };
+};
+exports.replaceDirnamePlugin = replaceDirnamePlugin;
+function bundleRequire(filepath, options = {}) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!exports.JS_EXT_RE.test(filepath)) {
+            throw new Error(`${filepath} is not a valid JS file`);
+        }
+        const cwd = options.cwd || process.cwd();
+        const getOutputFile = options.getOutputFile || defaultGetOutputFile;
+        const outfile = getOutputFile(filepath);
+        const preserveTemporaryFile = (_a = options.preserveTemporaryFile) !== null && _a !== void 0 ? _a : !!process.env.BUNDLE_REQUIRE_PRESERVE;
+        const extractResult = (result) => __awaiter(this, void 0, void 0, function* () {
+            let mod;
+            try {
+                mod = yield require(outfile);
+            }
+            finally {
+                if (!preserveTemporaryFile) {
+                    // Remove the outfile after executed
+                    yield fs_1.promises.unlink(outfile);
+                }
+            }
+            return mod;
+        });
+        const result = yield (0, esbuild_1.build)(Object.assign(Object.assign({}, options.esbuildOptions), { entryPoints: [filepath], absWorkingDir: cwd, outfile, format: 'cjs', platform: 'node', sourcemap: 'inline', bundle: true, metafile: true, write: true, watch: false, plugins: [
+                ...(((_b = options.esbuildOptions) === null || _b === void 0 ? void 0 : _b.plugins) || []),
+                (0, exports.externalPlugin)({
+                    external: options.external
+                }),
+                (0, exports.replaceDirnamePlugin)()
+            ] }));
+        return extractResult(result);
+    });
+}
+exports.bundleRequire = bundleRequire;

package/lib/utils/forkTsCheckerWebpackPlugin.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCodeFrameFormatter = void 0;
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
 var CodeFrameFormatter_1 = require("fork-ts-checker-webpack-plugin/lib/formatter/CodeFrameFormatter");
-exports.createCodeFrameFormatter = CodeFrameFormatter_1.createCodeFrameFormatter;
+Object.defineProperty(exports, "createCodeFrameFormatter", { enumerable: true, get: function () { return CodeFrameFormatter_1.createCodeFrameFormatter; } });
 exports.default = fork_ts_checker_webpack_plugin_1.default;

package/lib/utils/formatWebpackMessages.d.ts

@@ -1,4 +1,4 @@
-export = formatWebpackMessages;
+export default formatWebpackMessages;
 declare function formatWebpackMessages(json: any): {
     errors: any;
     warnings: any;

package/lib/utils/formatWebpackMessages.js

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require('@shuvi/utils/lib/chalk').default;
 const friendlySyntaxErrorLabel = 'Syntax error:';
 function isLikelyASyntaxError(message) {
@@ -88,4 +89,4 @@ function formatWebpackMessages(json) {
     }
     return result;
 }
-module.exports = formatWebpackMessages;
+exports.default = formatWebpackMessages;

package/lib/utils/hotDevClient/eventsource.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEventSourceWrapper = void 0;
 const eventCallbacks = [];
 function EventSourceWrapper(options) {
     var source;

package/lib/utils/hotDevClient/index.js

@@ -25,6 +25,29 @@ SOFTWARE.
 */
 // This file is based on https://github.com/facebook/create-react-app/blob/v1.1.4/packages/react-dev-utils/webpackHotDevClient.js
 // It's been edited to rely on webpack-hot-middleware.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -34,13 +57,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -91,7 +107,7 @@ function connect(options) {
             ErrorOverlay.stopReportingRuntimeErrors();
         });
     }
-    eventsource_1.getEventSourceWrapper(options).addMessageListener(event => {
+    (0, eventsource_1.getEventSourceWrapper)(options).addMessageListener(event => {
         // This is the heartbeat event
         if (event.data === '\uD83D\uDC93') {
             return;
@@ -125,8 +141,9 @@ function clearOutdatedErrors() {
         }
     }
 }
-function afterApplyUpdate(hasUpdates) {
+function afterApplyUpdate() {
     tryDismissErrorOverlay();
+    console.log('[Fast Refresh] Done.');
 }
 // Successful compilation.
 function handleSuccess() {
@@ -136,18 +153,21 @@ function handleSuccess() {
     hasCompileErrors = false;
     // Attempt to apply hot updates or reload.
     if (isHotUpdate) {
-        tryApplyUpdates(function onHotUpdateSuccess(hasUpdates) {
+        tryApplyUpdates(function onHotUpdateSuccess() {
             // Only dismiss it when we're sure it's a hot update.
             // Otherwise it would flicker right before the reload.
-            afterApplyUpdate(hasUpdates);
+            afterApplyUpdate();
         });
     }
 }
 // Compilation with warnings (e.g. ESLint).
 function handleWarnings(warnings) {
     clearOutdatedErrors();
+    var isHotUpdate = !isFirstCompilation;
+    isFirstCompilation = false;
+    hasCompileErrors = false;
     // Print warnings to the console.
-    const formatted = formatWebpackMessages_1.default({
+    const formatted = (0, formatWebpackMessages_1.default)({
         warnings: warnings,
         errors: []
     });
@@ -158,9 +178,18 @@ function handleWarnings(warnings) {
                     'You can find a complete log in the terminal.');
                 break;
             }
-            console.warn(strip_ansi_1.default(formatted.warnings[i]));
+            console.warn((0, strip_ansi_1.default)(formatted.warnings[i]));
         }
     }
+    // Attempt to apply hot updates or reload.
+    if (isHotUpdate) {
+        tryApplyUpdates(function onSuccessfulHotUpdate() {
+            // Only dismiss it when we're sure it's a hot update.
+            // Otherwise it would flicker right before the reload.
+            tryDismissErrorOverlay();
+            afterApplyUpdate();
+        });
+    }
 }
 // Compilation with errors (e.g. syntax error or missing modules).
 function handleErrors(errors) {
@@ -168,7 +197,7 @@ function handleErrors(errors) {
     isFirstCompilation = false;
     hasCompileErrors = true;
     // "Massage" webpack messages.
-    var formatted = formatWebpackMessages_1.default({
+    var formatted = (0, formatWebpackMessages_1.default)({
         errors: errors,
         warnings: []
     });
@@ -177,7 +206,7 @@ function handleErrors(errors) {
     // Also log them to the console.
     if (typeof console !== 'undefined' && typeof console.error === 'function') {
         for (var i = 0; i < formatted.errors.length; i++) {
-            console.error(strip_ansi_1.default(formatted.errors[i]));
+            console.error((0, strip_ansi_1.default)(formatted.errors[i]));
         }
     }
 }
@@ -196,7 +225,9 @@ function processMessage(e) {
     const obj = JSON.parse(e.data);
     switch (obj.action) {
         case 'building': {
-            console.log('[HMR] bundle ' + (obj.name ? "'" + obj.name + "' " : '') + 'rebuilding');
+            console.log('[Fast Refresh] bundle ' +
+                (obj.name ? "'" + obj.name + "' " : '') +
+                'rebuilding');
             break;
         }
         case 'built':
@@ -242,44 +273,86 @@ function isUpdateAvailable() {
 function canApplyUpdates() {
     return module.hot.status() === 'idle';
 }
+function waitForReady() {
+    return new Promise((resolve, reject) => {
+        if (module.hot.status() !== 'prepare') {
+            reject();
+        }
+        const handler = status => {
+            module.hot.removeStatusHandler(handler);
+            if (status === 'ready') {
+                resolve();
+            }
+            if (status === 'abort' || status === 'fail') {
+                reject();
+            }
+        };
+        module.hot.addStatusHandler(handler);
+    });
+}
 // Attempt to update code on the fly, fall back to a hard reload.
 function tryApplyUpdates(onHotUpdateSuccess) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!module.hot) {
             // HotModuleReplacementPlugin is not in Webpack configuration.
             console.error('HotModuleReplacementPlugin is not in Webpack configuration.');
-            // window.location.reload();
+            window.location.reload();
             return;
         }
         if (!isUpdateAvailable() || !canApplyUpdates()) {
             ErrorOverlay.dismissBuildError();
+            // HMR failed, need to refresh
+            const hmrStatus = module.hot.status();
+            if (hmrStatus === 'abort' || hmrStatus === 'fail') {
+                window.location.reload();
+            }
             return;
         }
         function handleApplyUpdates(err, updatedModules) {
-            const needForcedReload = err || !updatedModules || hadRuntimeError;
+            const needForcedReload = err || hadRuntimeError;
             if (needForcedReload) {
-                if (err) {
-                    console.warn('Error while applying updates, reloading page', err);
-                }
                 if (hadRuntimeError) {
-                    console.warn('Had runtime error previously, reloading page');
+                    hadRuntimeError = false;
+                    window.location.reload();
+                }
+                else {
+                    ErrorOverlay.reportRuntimeError(err);
+                    hadRuntimeError = true;
                 }
-                window.location.reload();
-                return;
             }
-            const hasUpdates = Boolean(updatedModules.length);
             if (typeof onHotUpdateSuccess === 'function') {
                 // Maybe we want to do something.
-                onHotUpdateSuccess(hasUpdates);
+                onHotUpdateSuccess();
             }
             if (isUpdateAvailable()) {
                 // While we were updating, there was a new update! Do it again.
-                tryApplyUpdates();
+                tryApplyUpdates(onHotUpdateSuccess);
             }
         }
-        // https://webpack.github.io/docs/hot-module-replacement.html#check
         try {
-            const updatedModules = yield module.hot.check(/* autoApply */ true);
+            // https://webpack.js.org/api/hot-module-replacement/#check
+            let updatedModules = yield module.hot.check(/* autoApply */ false);
+            if (!updatedModules) {
+                return;
+            }
+            // if there is another updating, delay the update
+            // multiple hotupdate occurs during import() will cause hmr error
+            // so we delay the adjacent hotupdates
+            // import() == loade module script ----> require(module)
+            //                                  |
+            //                                  |
+            //     if applyUpdate happens here, require will cause a error
+            if (isUpdateAvailable()) {
+                yield new Promise(resolve => {
+                    setTimeout(resolve, 50);
+                });
+            }
+            if (updatedModules) {
+                if (module.hot.status() !== 'ready') {
+                    yield waitForReady();
+                }
+                updatedModules = yield module.hot.apply();
+            }
             handleApplyUpdates(null, updatedModules);
         }
         catch (err) {

package/lib/utils/load-sources.d.ts

@@ -0,0 +1,3 @@
+export function minify(src: any, opts: any): Promise<any>;
+export function minifySync(src: any, opts: any): any;
+export function bundle(options: any): Promise<any>;

package/lib/utils/load-sources.js

@@ -0,0 +1,94 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bundle = exports.minifySync = exports.minify = void 0;
+const fs = require('fs');
+const { platform, arch } = require('os');
+const path = require('path');
+const { platformArchTriples } = require('@napi-rs/triples');
+const ArchName = arch();
+const PlatformName = platform();
+let bindings;
+let loadError;
+const triples = platformArchTriples[PlatformName][ArchName];
+for (const triple of triples) {
+    try {
+        const swcSource = path.join(__dirname, '../../swc-source');
+        const localFilePath = path.join(swcSource, `native/shuvi-swc.${triple.platformArchABI}.node`);
+        if (fs.existsSync(localFilePath)) {
+            console.log('Using locally built binary of shuvi-swc');
+            try {
+                bindings = require(localFilePath);
+            }
+            catch (e) {
+                if ((e === null || e === void 0 ? void 0 : e.code) !== 'MODULE_NOT_FOUND') {
+                    loadError = e;
+                }
+            }
+            break;
+        }
+        break;
+    }
+    catch (e) {
+        bindings = require(`@shuvi/swc-${triple.platformArchABI}`);
+    }
+}
+if (!bindings) {
+    if (loadError) {
+        console.error(loadError);
+    }
+    console.error(`Failed to load SWC binary`);
+    process.exit(1);
+}
+else {
+    loadError = null;
+}
+function transform(src, options) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        const isModule = typeof src !== 'string' && !Buffer.isBuffer(src);
+        options = options || {};
+        if ((_a = options === null || options === void 0 ? void 0 : options.jsc) === null || _a === void 0 ? void 0 : _a.parser) {
+            options.jsc.parser.syntax = (_b = options.jsc.parser.syntax) !== null && _b !== void 0 ? _b : 'ecmascript';
+        }
+        return bindings.transform(isModule ? JSON.stringify(src) : src, isModule, toBuffer(options));
+    });
+}
+function transformSync(src, options) {
+    var _a, _b;
+    const isModule = typeof src !== 'string' && !Buffer.isBuffer(src);
+    options = options || {};
+    if ((_a = options === null || options === void 0 ? void 0 : options.jsc) === null || _a === void 0 ? void 0 : _a.parser) {
+        options.jsc.parser.syntax = (_b = options.jsc.parser.syntax) !== null && _b !== void 0 ? _b : 'ecmascript';
+    }
+    return bindings.transformSync(isModule ? JSON.stringify(src) : src, isModule, toBuffer(options));
+}
+function toBuffer(t) {
+    return Buffer.from(JSON.stringify(t));
+}
+function minify(src, opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return bindings.minify(toBuffer(src), toBuffer(opts !== null && opts !== void 0 ? opts : {}));
+    });
+}
+exports.minify = minify;
+function minifySync(src, opts) {
+    return bindings.minifySync(toBuffer(src), toBuffer(opts !== null && opts !== void 0 ? opts : {}));
+}
+exports.minifySync = minifySync;
+function bundle(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return bindings.bundle(toBuffer(options));
+    });
+}
+exports.bundle = bundle;
+module.exports.transform = transform;
+module.exports.transformSync = transformSync;

package/lib/webpack/config/base.d.ts

@@ -1,15 +1,26 @@
 import WebpackChain from 'webpack-chain';
+declare type TsCompilerOptions = import('typescript').CompilerOptions;
 export interface BaseOptions {
     dev: boolean;
+    parcelCss: boolean;
+    name: string;
     projectRoot: string;
-    srcDirs: string[];
-    mediaFilename: string;
+    outputDir: string;
+    cacheDir: string;
+    include: string[];
+    typescript?: {
+        useTypeScript: boolean;
+        typeScriptPath?: string;
+        tsConfigPath?: string;
+        tsCompilerOptions?: TsCompilerOptions;
+        resolvedBaseUrl?: string;
+    };
     buildManifestFilename: string;
     target?: string;
     publicPath?: string;
     env?: {
-        [x: string]: string;
+        [x: string]: string | undefined;
     };
 }
 export { WebpackChain };
-export declare function baseWebpackChain({ dev, projectRoot, srcDirs, mediaFilename, buildManifestFilename, publicPath, env }: BaseOptions): WebpackChain;
+export declare function baseWebpackChain({ dev, outputDir, parcelCss, projectRoot, include, typescript, name, buildManifestFilename, publicPath, env, cacheDir }: BaseOptions): WebpackChain;