@shuvi/toolpack 1.0.0-rc.5 → 1.0.0-rc.8

package/lib/webpack/config/base.js

@@ -225,7 +225,7 @@ function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, p
     if (dev) {
         // For webpack-dev-middleware usage
         config.watchOptions({
-            aggregateTimeout: 50,
+            aggregateTimeout: 5,
             ignored: ['**/.git/**']
         });
         config.set('infrastructureLogging', {

package/lib/webpack/config/node.js

@@ -5,11 +5,11 @@ const base_1 = require("./base");
 const external_1 = require("./parts/external");
 const style_1 = require("./parts/style");
 function createNodeWebpackChain(options) {
-    const { webpackHelpers, typescript } = 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);
+    chain.devtool(dev ? 'cheap-module-source-map' : false);
     chain.resolve.extensions.merge([
         ...(useTypeScript ? ['.ts', '.tsx'] : []),
         '.js',

package/lib/webpack/plugins/module-replace-plugin/plugin.js

@@ -75,7 +75,6 @@ class ModuleReplacePlugin {
         moduleInfos.forEach(moduleInfo => {
             moduleInfo.action = ModuleAction.RESTORE;
             handler.pending.set(moduleInfo.compiler, false);
-            moduleInfo.compiler.hooks.invalid.call('noop', new Date().getTime());
         });
         return new Promise(resolve => {
             handler.resolve = resolve;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.0-rc.5",
+  "version": "1.0.0-rc.8",
   "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.5",
+    "@shuvi/compiler": "1.0.0-rc.8",
     "@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.5",
-    "@shuvi/utils": "1.0.0-rc.5",
+    "@shuvi/shared": "1.0.0-rc.8",
+    "@shuvi/utils": "1.0.0-rc.8",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",

package/lib/utils/build-loaders.d.ts

@@ -1,2 +0,0 @@
-export declare function build(dir: string, mode: string): Promise<void>;
-export declare function buildToString(entry: string): Promise<string>;

package/lib/utils/build-loaders.js

@@ -1,131 +0,0 @@
-"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.buildToString = exports.build = void 0;
-const file_1 = require("@shuvi/utils/lib/file");
-const esbuild = __importStar(require("esbuild"));
-const path = __importStar(require("path"));
-const loader = {
-    '.js': 'jsx',
-    '.jsx': 'jsx',
-    '.json': 'json',
-    '.ts': 'ts',
-    '.tsx': 'tsx'
-};
-function build(dir, mode) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield esbuild.build({
-            entryPoints: [path.join(dir, 'loaders.js')],
-            format: 'esm',
-            platform: 'browser',
-            target: 'esnext',
-            loader,
-            watch: mode === 'development',
-            bundle: true,
-            logLevel: 'error',
-            external: ['react', '@shuvi/*'],
-            pure: ['loader'],
-            treeShaking: true,
-            outfile: path.join(dir, 'page-loaders.js'),
-            plugins: [
-                {
-                    name: 'imports',
-                    setup(build) {
-                        let entry;
-                        build.onResolve({ filter: /.*/ }, args => {
-                            if (args.kind === 'entry-point')
-                                entry = args.path;
-                            if (args.kind === 'entry-point' || args.importer === entry) {
-                                const resolved = (0, file_1.resolveFile)(path.resolve(args.resolveDir, args.path));
-                                return { path: resolved };
-                            }
-                            return {
-                                path: !args.path.startsWith('.') && !args.path.startsWith('/')
-                                    ? args.path
-                                    : path.resolve(args.resolveDir, args.path),
-                                external: true,
-                                sideEffects: false
-                            };
-                        });
-                    }
-                }
-            ]
-        });
-    });
-}
-exports.build = build;
-function buildToString(entry) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const result = yield esbuild.build({
-            entryPoints: [entry],
-            format: 'esm',
-            platform: 'browser',
-            target: 'esnext',
-            loader,
-            bundle: true,
-            logLevel: 'error',
-            external: ['react', '@shuvi/*'],
-            pure: ['loader'],
-            treeShaking: true,
-            outdir: 'out',
-            write: false,
-            plugins: [
-                {
-                    name: 'imports',
-                    setup(build) {
-                        let entry;
-                        build.onResolve({ filter: /.*/ }, args => {
-                            if (args.kind === 'entry-point')
-                                entry = args.path;
-                            if (args.kind === 'entry-point' || args.importer === entry) {
-                                const resolved = (0, file_1.resolveFile)(path.resolve(args.resolveDir, args.path));
-                                return { path: resolved };
-                            }
-                            return {
-                                path: !args.path.startsWith('.') && !args.path.startsWith('/')
-                                    ? args.path
-                                    : path.resolve(args.resolveDir, args.path),
-                                external: true,
-                                sideEffects: false
-                            };
-                        });
-                    }
-                }
-            ]
-        });
-        return (_a = result.outputFiles[0]) === null || _a === void 0 ? void 0 : _a.text;
-    });
-}
-exports.buildToString = buildToString;