@shuvi/toolpack 1.0.0-rc.12 → 1.0.0-rc.13

package/lib/constants.d.ts

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

package/lib/constants.js

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

package/lib/webpack/config/base.js

@@ -75,7 +75,7 @@ function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, p
         // This saves chunks with the name given via `import()`
         chunkFilename: `static/chunks/${dev ? '[name]' : '[name].[contenthash:8]'}.js`,
         hotUpdateChunkFilename: 'static/webpack/[id].[fullhash].hot-update.js',
-        hotUpdateMainFilename: 'static/webpack/[fullhash].hot-update.json',
+        hotUpdateMainFilename: 'static/webpack/[runtime].[fullhash].hot-update.json',
         strictModuleExceptionHandling: true,
         // crossOriginLoading: crossOrigin,
         webassemblyModuleFilename: 'static/wasm/[modulehash:8].wasm',
@@ -99,7 +99,7 @@ function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, p
                 default: false,
                 vendors: {
                     name: 'vendors',
-                    filename: constants_2.CommonChunkFilename,
+                    filename: (0, helpers_1.commonChunkFilename)({ dev: true }),
                     test: /[\\/]node_modules[\\/]/,
                     // Don't let webpack eliminate this chunk (prevents this chunk from
                     // becoming a part of the commons chunk)

package/lib/webpack/config/browser.js

@@ -32,7 +32,6 @@ const webpack_1 = __importDefault(require("webpack"));
 const path = __importStar(require("path"));
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const resolve_1 = require("@shuvi/utils/lib/resolve");
-const constants_1 = require("../../constants");
 const base_1 = require("./base");
 const style_1 = require("./parts/style");
 const helpers_1 = require("./parts/helpers");
@@ -105,8 +104,8 @@ function createBrowserWebpackChain(options) {
                 framework: {
                     chunks: 'all',
                     name: 'framework',
-                    filename: constants_1.CommonChunkFilename,
-                    test(module) {
+                    filename: (0, helpers_1.commonChunkFilename)({ dev: false }),
+                    test(module, { moduleGraph }) {
                         const resource = module.nameForCondition();
                         if (!resource) {
                             return false;
@@ -122,9 +121,13 @@ function createBrowserWebpackChain(options) {
                             // bundled with their issuer.
                             // https://github.com/zeit/next.js/pull/9012
                             if (frameworkModule.issuers) {
-                                for (const issuer of frameworkModule.issuers) {
-                                    const issuerResource = module.issuer.nameForCondition();
-                                    if (!issuer.test(issuerResource)) {
+                                for (const issuerTest of frameworkModule.issuers) {
+                                    // fix:  DeprecationWarning: Module.issuer: Use new ModuleGraph API
+                                    const issuer = moduleGraph.getIssuer(module);
+                                    const issuerResource = issuer
+                                        ? issuer.nameForCondition()
+                                        : null;
+                                    if (!issuerResource || !issuerTest.test(issuerResource)) {
                                         return false;
                                     }
                                 }
@@ -156,7 +159,7 @@ function createBrowserWebpackChain(options) {
                         }
                         return hash.digest('hex').substring(0, 8);
                     },
-                    filename: constants_1.CommonChunkFilename,
+                    filename: (0, helpers_1.commonChunkFilename)({ dev: false }),
                     priority: 30,
                     minChunks: 1,
                     reuseExistingChunk: true

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

@@ -2,3 +2,6 @@ import { IWebpackHelpers } from '../../types';
 export declare const webpackHelpers: () => IWebpackHelpers;
 export declare function shouldUseRelativeAssetPaths(publicPath: string): boolean;
 export declare function splitChunksFilter(chunk: any): boolean;
+export declare const commonChunkFilename: ({ dev }: {
+    dev: boolean;
+}) => string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitChunksFilter = exports.shouldUseRelativeAssetPaths = exports.webpackHelpers = void 0;
+exports.commonChunkFilename = exports.splitChunksFilter = exports.shouldUseRelativeAssetPaths = exports.webpackHelpers = void 0;
 const webpackHelpers = () => {
     const externalFns = [];
     const defaultExternalsFn = ({ context, request }, callback) => {
@@ -50,8 +50,12 @@ function shouldUseRelativeAssetPaths(publicPath) {
 exports.shouldUseRelativeAssetPaths = shouldUseRelativeAssetPaths;
 function splitChunksFilter(chunk) {
     const excludes = {
-        'static/polyfill': true
+    // 'static/polyfill': true
     };
     return excludes[chunk.name] !== true;
 }
 exports.splitChunksFilter = splitChunksFilter;
+const commonChunkFilename = ({ dev }) => {
+    return `static/common/${dev ? '[name]' : '[name].[contenthash:8]'}.js`;
+};
+exports.commonChunkFilename = commonChunkFilename;

package/lib/webpack/plugins/build-manifest-plugin.js

@@ -1,11 +1,35 @@
 "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 });
-const webpack_1 = __importDefault(require("webpack"));
+const webpack_1 = __importStar(require("webpack"));
 const Entrypoint_1 = __importDefault(require("webpack/lib/Entrypoint"));
-const { RawSource } = webpack_1.default.sources;
+const constants_1 = require("@shuvi/shared/lib/constants");
+const { RawSource } = webpack_1.sources;
 const defaultOptions = {
     filename: 'build-manifest.json',
     modules: false,
@@ -63,6 +87,16 @@ class BuildManifestPlugin {
             }
             this._collect(chunkGroup, compiler, compilation, chunkRootModulesMap);
         });
+        const compilationAssets = compilation.getAssets();
+        this._manifest.polyfillFiles = compilationAssets
+            .filter(p => {
+            // Ensure only .js files are passed through
+            if (!p.name.endsWith('.js')) {
+                return false;
+            }
+            return p.info && constants_1.BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL in p.info;
+        })
+            .map(v => v.name);
         this._manifest.loadble = Object.keys(this._manifest.loadble)
             .sort()
             // eslint-disable-next-line no-sequences

package/lib/webpack/plugins/copy-file-plugin.d.ts

@@ -0,0 +1,14 @@
+import { Compiler } from 'webpack';
+export declare class CopyFilePlugin {
+    private filePath;
+    private name;
+    private cacheKey;
+    private info?;
+    constructor({ filePath, cacheKey, name, info }: {
+        filePath: string;
+        cacheKey: string;
+        name: string;
+        info?: object;
+    });
+    apply(compiler: Compiler): void;
+}

package/lib/webpack/plugins/copy-file-plugin.js

@@ -0,0 +1,87 @@
+"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 __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.CopyFilePlugin = void 0;
+const fs_1 = require("fs");
+const webpack_1 = require("webpack");
+const loaderUtils = __importStar(require("loader-utils"));
+const PLUGIN_NAME = 'CopyFilePlugin';
+class CopyFilePlugin {
+    constructor({ filePath, cacheKey, name, info }) {
+        this.filePath = filePath;
+        this.cacheKey = cacheKey;
+        this.name = name;
+        this.info = info;
+    }
+    apply(compiler) {
+        // compiler.options.output.filename
+        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+            const cache = compilation.getCache('CopyFilePlugin');
+            const hook = compilation.hooks.processAssets;
+            hook.tapPromise({
+                name: PLUGIN_NAME,
+                stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS
+            }, () => __awaiter(this, void 0, void 0, function* () {
+                if (cache) {
+                    const cachedResult = yield cache.getPromise(this.filePath, this.cacheKey);
+                    if (cachedResult) {
+                        const { file, source } = cachedResult;
+                        compilation.emitAsset(file, source, Object.assign({}, this.info));
+                        return;
+                    }
+                }
+                const content = yield fs_1.promises.readFile(this.filePath, 'utf8');
+                const hash = loaderUtils.interpolateName({
+                    // we only care about hash, so use a fake path is ok
+                    resourcePath: '/fake/path'
+                }, '[hash:8]', {
+                    content
+                });
+                const file = compilation.getAssetPath(compiler.options.output.filename || this.name, {
+                    contentHash: hash,
+                    chunk: { id: this.name, name: this.name }
+                });
+                const source = new webpack_1.sources.RawSource(content);
+                if (cache) {
+                    yield cache.storePromise(this.filePath, this.cacheKey, {
+                        file,
+                        source
+                    });
+                }
+                compilation.emitAsset(file, source, Object.assign({}, this.info));
+            }));
+        });
+    }
+}
+exports.CopyFilePlugin = CopyFilePlugin;

package/lib/webpack/types.d.ts

@@ -18,6 +18,7 @@ export interface IChunk {
     request: string;
 }
 export interface IManifest {
+    polyfillFiles?: string[];
     entries: {
         [s: string]: IAssetMap;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.0-rc.12",
+  "version": "1.0.0-rc.13",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -20,7 +20,7 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/compiler": "1.0.0-rc.12",
+    "@shuvi/compiler": "1.0.0-rc.13",
     "@babel/core": "7.12.10",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
@@ -35,8 +35,8 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/runtime": "7.12.5",
     "@parcel/css": "1.2.0",
-    "@shuvi/shared": "1.0.0-rc.12",
-    "@shuvi/utils": "1.0.0-rc.12",
+    "@shuvi/shared": "1.0.0-rc.13",
+    "@shuvi/utils": "1.0.0-rc.13",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",
@@ -49,7 +49,7 @@
     "css-minimizer-webpack-plugin": "3.4.1",
     "es-module-lexer": "0.10.5",
     "esbuild": "0.14.38",
-    "esbuild-loader": "^2.19.0",
+    "esbuild-loader": "2.19.0",
     "file-loader": "6.2.0",
     "fork-ts-checker-webpack-plugin": "6.0.8",
     "fs-extra": "9.0.1",
@@ -63,7 +63,7 @@
     "postcss-loader": "4.1.0",
     "postcss-preset-env": "6.7.0",
     "process": "0.11.10",
-    "regenerator-runtime": "^0.13.9",
+    "regenerator-runtime": "0.13.9",
     "@swc/helpers": "0.4.3",
     "sass-loader": "10.1.0",
     "stream-browserify": "3.0.0",