@shuvi/toolpack 0.0.1-rc.9 → 1.0.0-rc.10

package/lib/babel/plugins/auto-css-modules.js

@@ -9,7 +9,7 @@ function default_1() {
         visitor: {
             ImportDeclaration(path, { opts }) {
                 const { specifiers, source, source: { value }, } = path.node;
-                if (specifiers.length && CSS_EXTNAMES.includes(path_1.extname(value))) {
+                if (specifiers.length && CSS_EXTNAMES.includes((0, path_1.extname)(value))) {
                     if (value.indexOf('?') >= 0) {
                         source.value = `${value}&${opts.flag || 'cssmodules'}`;
                     }

package/lib/babel/plugins/{loadable-plugin.d.ts → dynamic-plugin.d.ts}

@@ -19,6 +19,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
 */
 import { PluginObj, types as BabelTypes } from '@babel/core';
-export default function ({ types: t, }: {
+export default function ({ types: t }: {
     types: typeof BabelTypes;
 }): PluginObj;

package/lib/babel/plugins/{loadable-plugin.js → dynamic-plugin.js}

@@ -23,14 +23,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
 // This file is https://github.com/jamiebuilds/react-loadable/blob/master/src/babel.js
 // Modified to also look for `shuvi/dynamic`
 Object.defineProperty(exports, "__esModule", { value: true });
-function default_1({ types: t, }) {
+function default_1({ types: t }) {
     return {
         visitor: {
             ImportDeclaration(path) {
                 let source = path.node.source.value;
-                if (source !== '@shuvi/app')
+                if (source !== '@shuvi/runtime')
                     return;
-                let dynamicSpecifier = path.get('specifiers').find((specifier) => {
+                let dynamicSpecifier = path.get('specifiers').find(specifier => {
                     return specifier.node.imported.name === 'dynamic';
                 });
                 if (!dynamicSpecifier)
@@ -40,7 +40,7 @@ function default_1({ types: t, }) {
                 if (!binding) {
                     return;
                 }
-                binding.referencePaths.forEach((refPath) => {
+                binding.referencePaths.forEach(refPath => {
                     const callExpression = refPath.parentPath;
                     if (!callExpression.isCallExpression())
                         return;
@@ -68,7 +68,7 @@ function default_1({ types: t, }) {
                         return;
                     let properties = options.get('properties');
                     let propertiesMap = {};
-                    properties.forEach((property) => {
+                    properties.forEach(property => {
                         const key = property.get('key');
                         propertiesMap[key.node.name] = property;
                     });
@@ -89,17 +89,17 @@ function default_1({ types: t, }) {
                                 return;
                             const node = args[0].node;
                             dynamicImports.push(node);
-                        },
+                        }
                     });
                     if (!dynamicImports.length)
                         return;
-                    options.node.properties.push(t.objectProperty(t.identifier('webpack'), t.arrowFunctionExpression([], t.arrayExpression(dynamicImports.map((dynamicImport) => {
+                    options.node.properties.push(t.objectProperty(t.identifier('webpack'), t.arrowFunctionExpression([], t.arrayExpression(dynamicImports.map(dynamicImport => {
                         return t.callExpression(t.memberExpression(t.identifier('require'), t.identifier('resolveWeak')), [dynamicImport]);
                     })))));
                     options.node.properties.push(t.objectProperty(t.identifier('modules'), t.arrayExpression(dynamicImports)));
                 });
-            },
-        },
+            }
+        }
     };
 }
 exports.default = default_1;

package/lib/babel/plugins/optimize-hook-destructuring.d.ts

@@ -1,4 +1,4 @@
 import { PluginObj, types as BabelTypes } from '@babel/core';
-export default function ({ types: t, }: {
+export default function ({ types: t }: {
     types: typeof BabelTypes;
 }): PluginObj<any>;

package/lib/babel/plugins/optimize-hook-destructuring.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const isHook = /^use[A-Z]/;
 // matches only built-in hooks provided by React et al
 const isBuiltInHook = /^use(Callback|Context|DebugValue|Effect|ImperativeHandle|LayoutEffect|Memo|Reducer|Ref|State)$/;
-function default_1({ types: t, }) {
+function default_1({ types: t }) {
     const visitor = {
         CallExpression(path, state) {
             const onlyBuiltIns = state.opts.onlyBuiltIns;
@@ -44,7 +44,7 @@ function default_1({ types: t, }) {
                 }
                 return patterns.concat(t.objectProperty(t.numericLiteral(i), element));
             }, []));
-        },
+        }
     };
     return {
         name: 'optimize-hook-destructuring',
@@ -52,8 +52,8 @@ function default_1({ types: t, }) {
             // this is a workaround to run before preset-env destroys destructured assignments
             Program(path, state) {
                 path.traverse(visitor, state);
-            },
-        },
+            }
+        }
     };
 }
 exports.default = default_1;

package/lib/babel/preset.js

@@ -1,9 +1,29 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
+const path = __importStar(require("path"));
 const env = process.env.NODE_ENV;
 const isProduction = env === 'production';
 const isDevelopment = env === 'development';
@@ -69,7 +89,7 @@ exports.default = (api, options = {}) => {
                 }
             ],
             require('@babel/plugin-syntax-dynamic-import'),
-            require('./plugins/loadable-plugin'),
+            require('./plugins/dynamic-plugin'),
             require('@babel/plugin-proposal-class-properties'),
             [
                 require('@babel/plugin-proposal-object-rest-spread'),
@@ -83,7 +103,7 @@ exports.default = (api, options = {}) => {
                     // Undocumented option that lets us encapsulate our runtime, ensuring
                     // the correct version is used
                     // https://github.com/babel/babel/blob/090c364a90fe73d36a30707fc612ce037bdbbb24/packages/babel-plugin-transform-runtime/src/index.js#L35-L42
-                    absoluteRuntime: path_1.default.dirname(require.resolve('@babel/runtime/package.json')) }, options['transform-runtime'])
+                    absoluteRuntime: path.dirname(require.resolve('@babel/runtime/package.json')) }, options['transform-runtime'])
             ],
             isProduction && [
                 require('babel-plugin-transform-react-remove-prop-types'),

package/lib/constants.d.ts

@@ -1 +1,2 @@
 export declare const AppSourceRegexs: RegExp[];
+export declare const CommonChunkFilename = "static/common/[name].js";

package/lib/constants.js

@@ -1,3 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppSourceRegexs = [/[/\\]shuvi-app[/\\]/];
+exports.CommonChunkFilename = exports.AppSourceRegexs = void 0;
+exports.AppSourceRegexs = [
+    /([/\\]shuvi-app[/\\])|([/\\]\.shuvi[/\\])/
+];
+exports.CommonChunkFilename = 'static/common/[name].js';

package/lib/utils/bundle-require.d.ts

@@ -0,0 +1,33 @@
+import { BuildOptions, Plugin as EsbuildPlugin } from 'esbuild';
+export declare const PATH_SEG_RE: RegExp;
+export declare const JS_EXT_RE: RegExp;
+export declare type GetOutputFile = (filepath: string) => string;
+export interface Options {
+    cwd?: string;
+    /**
+     * esbuild options
+     */
+    esbuildOptions?: BuildOptions;
+    /**
+     * Get the path to the output file
+     * By default we simply replace the extension with `.bundled.js`
+     */
+    getOutputFile?: GetOutputFile;
+    /** External packages */
+    external?: (string | RegExp)[];
+    /**
+     * Preserve compiled temporary file for debugging
+     * Default to `process.env.BUNDLE_REQUIRE_PRESERVE`
+     */
+    preserveTemporaryFile?: boolean;
+}
+export declare const match: (id: string, patterns?: (string | RegExp)[]) => boolean;
+/**
+ * An esbuild plugin to mark node_modules as external
+ */
+export declare const externalPlugin: ({ external, notExternal }?: {
+    external?: (string | RegExp)[] | undefined;
+    notExternal?: (string | RegExp)[] | undefined;
+}) => EsbuildPlugin;
+export declare const replaceDirnamePlugin: () => EsbuildPlugin;
+export declare function bundleRequire(filepath: string, options?: Options): Promise<any>;

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,5 +1,19 @@
-export = formatWebpackMessages;
-declare function formatWebpackMessages(json: any): {
-    errors: any;
-    warnings: any;
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+interface StatsError {
+    moduleName?: string;
+    file?: string;
+    message?: string;
+}
+declare function formatWebpackMessages(json: {
+    warnings?: StatsError[];
+    errors?: StatsError[];
+}): {
+    errors: string[];
+    warnings: string[];
 };
+export default formatWebpackMessages;

package/lib/utils/formatWebpackMessages.js

@@ -1,21 +1,24 @@
+"use strict";
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-'use strict';
-const chalk = require('@shuvi/utils/lib/chalk').default;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("@shuvi/utils/lib/chalk"));
 const friendlySyntaxErrorLabel = 'Syntax error:';
 function isLikelyASyntaxError(message) {
     return message.indexOf(friendlySyntaxErrorLabel) !== -1;
 }
 // Cleans up webpack error messages.
-function formatMessage(message, isError) {
-    message =
-        (message.moduleName ? message.moduleName + '\n' : '') +
-            (message.file ? message.file + '\n' : '') +
-            message.message;
+function formatMessage(stats, isError) {
+    let message = (stats.moduleName ? stats.moduleName + '\n' : '') +
+        (stats.file ? stats.file + '\n' : '') +
+        stats.message;
     let lines = message.split('\n');
     // Strip Webpack-added headers off errors/warnings
     // https://github.com/webpack/webpack/blob/master/lib/ModuleError.js
@@ -54,12 +57,12 @@ function formatMessage(message, isError) {
         ];
     }
     // Add helpful message for users trying to use Sass for the first time
-    if (lines[1] && lines[1].match(/Cannot find module.+node-sass/)) {
-        lines[1] = 'To import Sass files, you first need to install node-sass.\n';
+    if (lines[1] && lines[1].match(/Cannot find module.+sass/)) {
+        lines[1] = 'To import Sass files, you first need to install sass.\n';
         lines[1] +=
-            'Run `npm install node-sass` or `yarn add node-sass` inside your workspace.';
+            'Run `npm install sass` or `yarn add sass` inside your workspace.';
     }
-    lines[0] = chalk.inverse(lines[0]);
+    lines[0] = chalk_1.default.inverse(lines[0]);
     message = lines.join('\n');
     // Internal stacks are generally useless so we strip them... with the
     // exception of stacks containing `webpack:` because they're normally
@@ -75,10 +78,10 @@ function formatMessage(message, isError) {
     return message.trim();
 }
 function formatWebpackMessages(json) {
-    const formattedErrors = json.errors.map(function (message) {
+    const formattedErrors = (json.errors || []).map(function (message) {
         return formatMessage(message, true);
     });
-    const formattedWarnings = json.warnings.map(function (message) {
+    const formattedWarnings = (json.warnings || []).map(function (message) {
         return formatMessage(message, false);
     });
     const result = { errors: formattedErrors, warnings: formattedWarnings };
@@ -88,4 +91,4 @@ function formatWebpackMessages(json) {
     }
     return result;
 }
-module.exports = formatWebpackMessages;
+exports.default = formatWebpackMessages;

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

@@ -1,15 +1,28 @@
 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;
     };
+    experimental?: Record<string, any>;
+    compiler?: Record<string, any>;
 }
 export { WebpackChain };
-export declare function baseWebpackChain({ dev, projectRoot, srcDirs, mediaFilename, buildManifestFilename, publicPath, env }: BaseOptions): WebpackChain;
+export declare function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, projectRoot, include, typescript, name, buildManifestFilename, publicPath, env, cacheDir }: BaseOptions): WebpackChain;