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

package/lib/webpack/config/node.js

@@ -1,55 +1,48 @@
 "use strict";
-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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const detectTypescript_1 = require("@shuvi/utils/lib/detectTypescript");
+exports.createNodeWebpackChain = void 0;
 const base_1 = require("./base");
 const external_1 = require("./parts/external");
 const style_1 = require("./parts/style");
-const resolve_1 = require("./parts/resolve");
-function createNodeWebpackChain(_a) {
-    var { webpackHelpers } = _a, baseOptions = __rest(_a, ["webpackHelpers"]);
-    const chain = base_1.baseWebpackChain(baseOptions);
-    const { useTypeScript } = detectTypescript_1.getTypeScriptInfo(baseOptions.projectRoot);
+function createNodeWebpackChain(options) {
+    const { webpackHelpers, typescript, dev } = options;
+    const chain = (0, base_1.baseWebpackChain)(options);
+    const useTypeScript = !!(typescript === null || typescript === void 0 ? void 0 : typescript.useTypeScript);
     chain.target('node');
-    chain.devtool(false);
-    const extensions = [
-        ...(useTypeScript ? ['.tsx', '.ts'] : []),
+    chain.devtool(dev ? 'cheap-module-source-map' : false);
+    chain.resolve.extensions.merge([
+        ...(useTypeScript ? ['.ts', '.tsx'] : []),
         '.js',
         '.mjs',
         '.jsx',
         '.json',
         '.wasm'
-    ];
-    chain.resolve.extensions.merge(baseOptions.target
-        ? resolve_1.resolvePreferTarget(baseOptions.target, extensions)
-        : extensions);
+    ]);
     // fix: Can't reexport the named export 'BREAK' from non EcmaScript module
     // related issue: https://github.com/graphql/graphql-js/issues/1272
     chain.resolve.mainFields.clear().add('main').add('module');
     chain.output.libraryTarget('commonjs2');
     chain.optimization.minimize(false);
-    webpackHelpers.addExternals(chain, external_1.nodeExternals({ projectRoot: baseOptions.projectRoot }));
+    webpackHelpers.addExternals(chain, (0, external_1.nodeExternals)({
+        projectRoot: options.projectRoot,
+        include: options.include
+    }));
     chain.module
         .rule('main')
         .oneOf('js')
-        .use('shuvi-babel-loader')
-        .tap(options => (Object.assign(Object.assign({}, options), { isNode: true })));
+        .use('shuvi-swc-loader')
+        .tap(options => (Object.assign(Object.assign({}, options), { isServer: true })));
     chain.plugin('private/build-manifest').tap(([options]) => [
         Object.assign(Object.assign({}, options), { modules: false })
     ]);
     chain.plugin('define').tap(([options]) => [
         Object.assign(Object.assign({}, options), { __BROWSER__: false })
     ]);
-    return style_1.withStyle(chain, { ssr: true });
+    return (0, style_1.withStyle)(chain, {
+        ssr: true,
+        parcelCss: options.parcelCss,
+        filename: 'static/css/[contenthash:8].css',
+        chunkFilename: 'static/css/[contenthash:8].chunk.css'
+    });
 }
 exports.createNodeWebpackChain = createNodeWebpackChain;

package/lib/webpack/config/parts/external.d.ts

@@ -1,4 +1,5 @@
-import { ExternalsFunction } from '@shuvi/types/src/bundler';
-export declare function nodeExternals({ projectRoot }: {
+import { ExternalsFunction } from '../../types';
+export declare function nodeExternals({ projectRoot, include }: {
+    include: string[];
     projectRoot: string;
 }): ExternalsFunction;

package/lib/webpack/config/parts/external.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.nodeExternals = void 0;
 // import resolve from "resolve";
 const constants_1 = require("../../../constants");
 function match(value, tests) {
@@ -21,7 +22,7 @@ function match(value, tests) {
     }
     return matched;
 }
-function nodeExternals({ projectRoot }) {
+function nodeExternals({ projectRoot, include }) {
     const nodeExternal = ({ context, request }, next) => {
         function transpiled() {
             return next(null, undefined);
@@ -30,9 +31,14 @@ function nodeExternals({ projectRoot }) {
             return next(null, `commonjs ${request}`);
         }
         const notExternalModules = [];
-        const externalModules = [/shuvi[/\\]lib[/\\]lib[/\\]runtimeConfig/];
+        const externalModules = [
+            /platform-shared[/\\](esm|lib)[/\\]shared[/\\]shuvi-singleton-runtimeConfig/
+        ];
         // make sure we don't externalize anything that is
         // supposed to be transpiled
+        if (match(request, include)) {
+            return transpiled();
+        }
         if (match(request, constants_1.AppSourceRegexs)) {
             return transpiled();
         }
@@ -42,15 +48,15 @@ function nodeExternals({ projectRoot }) {
         if (match(request, externalModules)) {
             return external();
         }
+        // Relative requires don't need custom resolution, because they
+        // are relative to requests we've already resolved here.
+        // Absolute requires (require('/foo')) are extremely uncommon, but
+        // also have no need for customization as they're already resolved.
+        const start = request.charAt(0);
+        if (start === '.' || request.startsWith('/')) {
+            return transpiled();
+        }
         next(null, 'next');
-        // // Relative requires don't need custom resolution, because they
-        // // are relative to requests we've already resolved here.
-        // // Absolute requires (require('/foo')) are extremely uncommon, but
-        // // also have no need for customization as they're already resolved.
-        // const start = request.charAt(0);
-        // if (start === "." || request.startsWith("/")) {
-        //   return transpiled();
-        // }
         // let res;
         // try {
         //   res = resolve.sync(request, { basedir: context });

package/lib/webpack/config/parts/helpers.d.ts

@@ -1,2 +1,4 @@
-import { IWebpackHelpers } from '@shuvi/types/src/bundler';
+import { IWebpackHelpers } from '../../types';
 export declare const webpackHelpers: () => IWebpackHelpers;
+export declare function shouldUseRelativeAssetPaths(publicPath: string): boolean;
+export declare function splitChunksFilter(chunk: any): boolean;

package/lib/webpack/config/parts/helpers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpackHelpers = () => {
+exports.splitChunksFilter = exports.shouldUseRelativeAssetPaths = exports.webpackHelpers = void 0;
+const webpackHelpers = () => {
     const externalFns = [];
     const defaultExternalsFn = ({ context, request }, callback) => {
         let callbackCalled = false;
@@ -42,3 +43,15 @@ exports.webpackHelpers = () => {
         }
     };
 };
+exports.webpackHelpers = webpackHelpers;
+function shouldUseRelativeAssetPaths(publicPath) {
+    return publicPath === './';
+}
+exports.shouldUseRelativeAssetPaths = shouldUseRelativeAssetPaths;
+function splitChunksFilter(chunk) {
+    const excludes = {
+        'static/polyfill': true
+    };
+    return excludes[chunk.name] !== true;
+}
+exports.splitChunksFilter = splitChunksFilter;

package/lib/webpack/config/parts/resolve.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePreferTarget = void 0;
 function resolvePreferTarget(target, extensions) {
     return extensions.reduce((res, ext) => {
         res.push(`.${target}${ext}`);

package/lib/webpack/config/parts/style.d.ts

@@ -1,9 +1,12 @@
-import Config from 'webpack-chain';
+import { WebpackChain as Config } from '../base';
 interface StyleOptions {
+    filename: string;
+    chunkFilename: string;
     publicPath?: string;
     extractCss?: boolean;
     sourceMap?: boolean;
     ssr?: boolean;
+    parcelCss?: boolean;
 }
-export declare function withStyle(chain: Config, { extractCss, sourceMap, ssr, publicPath }: StyleOptions): Config;
+export declare function withStyle(chain: Config, { extractCss, sourceMap, ssr, publicPath, parcelCss, filename, chunkFilename }: StyleOptions): Config;
 export {};

package/lib/webpack/config/parts/style.js

@@ -1,27 +1,49 @@
 "use strict";
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.withStyle = void 0;
 const constants_1 = require("@shuvi/shared/lib/constants");
 const Rule_1 = __importDefault(require("webpack-chain/src/Rule"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
-const loader_utils_1 = __importDefault(require("loader-utils"));
-const path_1 = __importDefault(require("path"));
-function shouldUseRelativeAssetPaths(publicPath) {
-    return publicPath === './';
-}
+const loaderUtils = __importStar(require("loader-utils"));
+const path = __importStar(require("path"));
+const helpers_1 = require("./helpers");
 function getCSSModuleLocalIdent(context, localIdentName, localName, options) {
     // Use the filename or folder name, based on some uses the index.js / index.module.(css|scss|sass) project style
     const fileNameOrFolder = context.resourcePath.match(/index\.module\.(css|scss|sass)$/)
         ? '[folder]'
         : '[name]';
     // Create a hash based on a the file location and class name. Will be unique across a project, and close to globally unique.
-    const hash = loader_utils_1.default.getHashDigest(
+    const hash = loaderUtils.getHashDigest(
     // @ts-ignore
-    path_1.default.posix.relative(context.rootContext, context.resourcePath) + localName, 'md5', 'base64', 5);
+    path.posix.relative(context.rootContext, context.resourcePath) + localName, 'md5', 'base64', 5);
     // Use loaderUtils to find the file or folder name
-    const className = loader_utils_1.default.interpolateName(context, fileNameOrFolder + '_' + localName + '__' + hash, options);
+    const className = loaderUtils.interpolateName(context, fileNameOrFolder + '_' + localName + '__' + hash, options);
     // remove the .module that appears in every classname when based on the file.
     return className.replace('.module_', '_');
 }
@@ -29,32 +51,53 @@ function getCSSModuleLocalIdent(context, localIdentName, localName, options) {
 const cssRegex = /\.css$/;
 const cssModuleQueryRegex = /cssmodules/;
 const sassRegex = /\.(scss|sass)$/;
-function ssrCssRule({ test, resourceQuery, scss }) {
+function ssrCssRule({ test, resourceQuery, scss, parcelCss }) {
     const rule = new Rule_1.default();
     rule.test(test);
     if (resourceQuery) {
         rule.resourceQuery(resourceQuery);
     }
-    rule
-        .use('css-loader')
-        .loader(require.resolve('css-loader'))
-        .options({
-        sourceMap: false,
-        importLoaders: scss ? 1 : 0,
-        esModule: true,
-        modules: {
-            getLocalIdent: getCSSModuleLocalIdent,
-            exportOnlyLocals: true
-        }
-    });
+    if (parcelCss) {
+        rule
+            .use('parcel-css-loader')
+            .loader('@shuvi/parcel-css-loader')
+            .options({
+            sourceMap: false,
+            importLoaders: scss ? 1 : 0,
+            esModule: true,
+            modules: {
+                exportOnlyLocals: true
+            }
+        });
+    }
+    else {
+        rule
+            .use('css-loader')
+            .loader(require.resolve('css-loader'))
+            .options({
+            sourceMap: false,
+            importLoaders: scss ? 1 : 0,
+            esModule: true,
+            modules: {
+                getLocalIdent: getCSSModuleLocalIdent,
+                exportOnlyLocals: true
+            }
+        });
+    }
     if (scss) {
-        rule.use('sass-loader').loader(require.resolve('sass-loader')).options({
-            sourceMap: false
+        rule
+            .use('sass-loader')
+            .loader(require.resolve('sass-loader'))
+            .options({
+            sourceMap: false,
+            sassOptions: {
+                outputStyle: 'expanded'
+            }
         });
     }
     return rule;
 }
-function cssRule({ publicPath, test, resourceQuery, cssModule, extractCss, sourceMap, scss }) {
+function cssRule({ publicPath, test, resourceQuery, cssModule, parcelCss, extractCss, sourceMap, scss }) {
     const rule = new Rule_1.default();
     rule.test(test);
     if (resourceQuery) {
@@ -69,7 +112,7 @@ function cssRule({ publicPath, test, resourceQuery, cssModule, extractCss, sourc
         rule
             .use('extract-loader')
             .loader(mini_css_extract_plugin_1.default.loader)
-            .options(Object.assign({}, (publicPath && shouldUseRelativeAssetPaths(publicPath)
+            .options(Object.assign({}, (publicPath && (0, helpers_1.shouldUseRelativeAssetPaths)(publicPath)
             ? {
                 // path relative to outdir from the generated css file
                 publicPath: '../../'
@@ -101,42 +144,58 @@ function cssRule({ publicPath, test, resourceQuery, cssModule, extractCss, sourc
             esModule: true
         });
     }
-    rule
-        .use('css-loader')
-        .loader(require.resolve('css-loader'))
-        .options(Object.assign({ sourceMap, importLoaders: scss ? 2 : 1, esModule: true }, (cssModule && {
-        modules: {
-            getLocalIdent: getCSSModuleLocalIdent
-            // exportOnlyLocals: true,
-        }
-    })));
-    rule
-        .use('postcss-loader')
-        .loader(require.resolve('postcss-loader'))
-        .options({
-        sourceMap,
-        postcssOptions: {
-            plugins: [
-                // Make Flexbox behave like the spec cross-browser.
-                require('postcss-flexbugs-fixes'),
-                // Run Autoprefixer and compile new CSS features.
-                require('postcss-preset-env')({
-                    autoprefixer: {
-                        flexbox: 'no-2009'
-                    },
-                    stage: 3
-                })
-            ]
-        }
-    });
+    if (parcelCss) {
+        rule
+            .use('parcel-css-loader')
+            .loader('@shuvi/parcel-css-loader')
+            .options(Object.assign({ sourceMap, importLoaders: scss ? 2 : 1, esModule: true }, (cssModule && {
+            modules: {}
+        })));
+    }
+    else {
+        rule
+            .use('css-loader')
+            .loader(require.resolve('css-loader'))
+            .options(Object.assign({ sourceMap, importLoaders: scss ? 2 : 1, esModule: true }, (cssModule && {
+            modules: {
+                getLocalIdent: getCSSModuleLocalIdent
+                // exportOnlyLocals: true,
+            }
+        })));
+        rule
+            .use('postcss-loader')
+            .loader(require.resolve('postcss-loader'))
+            .options({
+            sourceMap,
+            postcssOptions: {
+                plugins: [
+                    // Make Flexbox behave like the spec cross-browser.
+                    require('postcss-flexbugs-fixes'),
+                    // Run Autoprefixer and compile new CSS features.
+                    require('postcss-preset-env')({
+                        autoprefixer: {
+                            flexbox: 'no-2009'
+                        },
+                        stage: 3
+                    })
+                ]
+            }
+        });
+    }
     if (scss) {
-        rule.use('sass-loader').loader(require.resolve('sass-loader')).options({
-            sourceMap
+        rule
+            .use('sass-loader')
+            .loader(require.resolve('sass-loader'))
+            .options({
+            sourceMap,
+            sassOptions: {
+                outputStyle: 'expanded'
+            }
         });
     }
     return rule;
 }
-function withStyle(chain, { extractCss, sourceMap, ssr, publicPath }) {
+function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, parcelCss, filename, chunkFilename }) {
     const oneOfs = chain.module.rule('main').oneOfs;
     if (ssr) {
         oneOfs.set('css-module', 
@@ -144,14 +203,16 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath }) {
         ssrCssRule({
             test: cssRegex,
             resourceQuery: cssModuleQueryRegex,
-            scss: false
+            scss: false,
+            parcelCss
         }).after('js'));
         oneOfs.set('scss-module', 
         // @ts-ignore
         ssrCssRule({
             test: sassRegex,
             resourceQuery: cssModuleQueryRegex,
-            scss: true
+            scss: true,
+            parcelCss
         }).after('css-module'));
         const ignoreRule = new Rule_1.default();
         ignoreRule
@@ -167,8 +228,8 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath }) {
     if (extractCss) {
         chain.plugin('mini-css-extract-plugin').use(mini_css_extract_plugin_1.default, [
             {
-                filename: 'static/css/[contenthash:8].css',
-                chunkFilename: 'static/css/[contenthash:8].chunk.css'
+                filename,
+                chunkFilename
             }
         ]);
     }
@@ -178,6 +239,7 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath }) {
         test: cssRegex,
         resourceQuery: cssModuleQueryRegex,
         cssModule: true,
+        parcelCss,
         scss: false,
         extractCss,
         sourceMap,
@@ -188,6 +250,7 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath }) {
     cssRule({
         test: cssRegex,
         cssModule: false,
+        parcelCss,
         scss: false,
         extractCss,
         sourceMap,
@@ -199,6 +262,7 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath }) {
         test: sassRegex,
         resourceQuery: cssModuleQueryRegex,
         cssModule: true,
+        parcelCss,
         scss: true,
         extractCss,
         sourceMap,
@@ -209,6 +273,7 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath }) {
     cssRule({
         test: sassRegex,
         cssModule: false,
+        parcelCss,
         scss: true,
         extractCss,
         sourceMap,

package/lib/webpack/dynamic-dll/bundler/index.d.ts

@@ -0,0 +1,22 @@
+import { Configuration } from 'webpack';
+import WebpackChain from 'webpack-chain';
+import { ModuleSnapshot } from '../moduleCollector';
+export interface BuildOptions {
+    outputDir: string;
+    configWebpack?: (chain: WebpackChain) => WebpackChain;
+    shared?: ShareConfig;
+    externals?: Configuration['externals'];
+    esmFullSpecific?: Boolean;
+    force?: boolean;
+}
+export declare type ShareConfig = Record<string, any>;
+declare type OnBuildComplete = (error?: null | Error) => void;
+export declare class Bundler {
+    private _nextBuild;
+    private _completeFns;
+    private _isBuilding;
+    build(snapshot: ModuleSnapshot, options: BuildOptions): Promise<void>;
+    private _buildDll;
+    onBuildComplete(fn: OnBuildComplete): void;
+}
+export {};