@shuvi/toolpack 0.0.1-rc.34 → 0.0.1-rc.37

package/lib/utils/errorOverlayMiddleware.d.ts

@@ -0,0 +1,2 @@
+import { Runtime } from '@shuvi/types';
+export declare function createLaunchEditorMiddleware(launchEditorEndpoint: string): Runtime.IServerMiddlewareHandler;

package/lib/utils/errorOverlayMiddleware.js

@@ -0,0 +1,50 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const launch_editor_1 = __importDefault(require("launch-editor"));
+function getSourcePath(source) {
+    // Webpack prefixes certain source paths with this path
+    if (source.startsWith('webpack:///')) {
+        return source.substring(11);
+    }
+    // Make sure library name is filtered out as well
+    if (source.startsWith('webpack://_N_E/')) {
+        return source.substring(15);
+    }
+    if (source.startsWith('webpack://')) {
+        return source.substring(10);
+    }
+    if (source.startsWith('/')) {
+        return source.substring(1);
+    }
+    return source;
+}
+function createLaunchEditorMiddleware(launchEditorEndpoint) {
+    return function launchEditorMiddleware(ctx, next) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (ctx.request.url.startsWith(launchEditorEndpoint)) {
+                const { query } = ctx.req.parsedUrl;
+                const lineNumber = parseInt(query.lineNumber, 10) || 1;
+                const colNumber = parseInt(query.colNumber, 10) || 1;
+                launch_editor_1.default(getSourcePath(`${query.fileName}:${lineNumber}:${colNumber}`));
+                ctx.body = '';
+                return;
+            }
+            else {
+                yield next();
+            }
+        });
+    };
+}
+exports.createLaunchEditorMiddleware = createLaunchEditorMiddleware;

package/lib/webpack/config/base.js

@@ -187,7 +187,8 @@ function baseWebpackChain({ dev, projectRoot, srcDirs, mediaFilename, name, buil
         const stringifiedEnvs = Object.entries(Object.assign(Object.assign({}, shuviConfigEnv), shuviPublicEnv)).reduce((prev, [key, value]) => {
             return `${prev}|${key}=${value}`;
         }, '');
-        const SHUVI_VERSION = require('shuvi/package.json').version;
+        const PACKAGE_JSON = path_1.default.resolve(__dirname, '../../../package.json');
+        const SHUVI_VERSION = require(PACKAGE_JSON).version;
         return {
             cacheDirectory: path_1.default.resolve(`node_modules/.cache/webpack/${projectHash}`),
             type: 'filesystem',
@@ -195,9 +196,7 @@ function baseWebpackChain({ dev, projectRoot, srcDirs, mediaFilename, name, buil
             version: `${SHUVI_VERSION}|${stringifiedEnvs}`
         };
     };
-    config.cache(typeof process.env.SHUVI_DEV_DISABLE_CACHE !== 'undefined'
-        ? false
-        : getCacheConfig());
+    config.cache(getCacheConfig());
     if (dev) {
         // For webpack-dev-middleware usage
         config.watchOptions({

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

@@ -1,6 +1,6 @@
 import WebpackChain from 'webpack-chain';
 import { BaseOptions } from './base';
-import { IWebpackHelpers } from '../types';
+import { IWebpackHelpers } from '@shuvi/types/src/bundler';
 export interface BrowserOptions extends BaseOptions {
     webpackHelpers: IWebpackHelpers;
     analyze?: boolean;

package/lib/webpack/config/browser.js

@@ -18,7 +18,7 @@ const crypto_1 = __importDefault(require("crypto"));
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const detectTypescript_1 = require("@shuvi/utils/lib/detectTypescript");
-// import PreferResolverPlugin from '../plugins/prefer-resolver-plugin';
+const prefer_resolver_plugin_1 = __importDefault(require("../plugins/prefer-resolver-plugin"));
 const base_1 = require("./base");
 const style_1 = require("./parts/style");
 const BIG_LIBRARY_THRESHOLD = 160000; // byte
@@ -37,11 +37,11 @@ function createBrowserWebpackChain(_a) {
         '.json',
         '.wasm'
     ]);
-    // if (baseOptions.target) {
-    //   chain.resolve
-    //     .plugin('private/prefer-resolver-plugin')
-    //     .use(PreferResolverPlugin, [{ suffix: baseOptions.target }]);
-    // }
+    if (baseOptions.target) {
+        chain.resolve
+            .plugin('private/prefer-resolver-plugin')
+            .use(prefer_resolver_plugin_1.default, [{ suffix: baseOptions.target }]);
+    }
     if (dev) {
         chain.plugin('private/hmr-plugin').use(webpack_1.default.HotModuleReplacementPlugin);
     }

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

@@ -1,6 +1,6 @@
 import WebpackChain from 'webpack-chain';
 import { BaseOptions } from './base';
-import { IWebpackHelpers } from '../types';
+import { IWebpackHelpers } from '@shuvi/types/src/bundler';
 export interface NodeOptions extends BaseOptions {
     webpackHelpers: IWebpackHelpers;
 }

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

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

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

@@ -30,9 +30,7 @@ function nodeExternals({ projectRoot }) {
             return next(null, `commonjs ${request}`);
         }
         const notExternalModules = [];
-        const externalModules = [
-            /@shuvi[/\\]service[/\\]lib[/\\]lib[/\\]runtimeConfig/
-        ];
+        const externalModules = [/shuvi[/\\]lib[/\\]lib[/\\]runtimeConfig/];
         // make sure we don't externalize anything that is
         // supposed to be transpiled
         if (match(request, constants_1.AppSourceRegexs)) {

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

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

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

@@ -42,7 +42,3 @@ exports.webpackHelpers = () => {
         }
     };
 };
-function shouldUseRelativeAssetPaths(publicPath) {
-    return publicPath === './';
-}
-exports.shouldUseRelativeAssetPaths = shouldUseRelativeAssetPaths;

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

@@ -8,7 +8,9 @@ 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"));
-const helpers_1 = require("./helpers");
+function shouldUseRelativeAssetPaths(publicPath) {
+    return publicPath === './';
+}
 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)$/)
@@ -67,7 +69,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 && helpers_1.shouldUseRelativeAssetPaths(publicPath)
+            .options(Object.assign({}, (publicPath && shouldUseRelativeAssetPaths(publicPath)
             ? {
                 // path relative to outdir from the generated css file
                 publicPath: '../../'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "0.0.1-rc.34",
+  "version": "0.0.1-rc.37",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -11,11 +11,6 @@
   "files": [
     "lib"
   ],
-  "scripts": {
-    "dev": "tsc -p tsconfig.build.json -w",
-    "prebuild": "rimraf lib",
-    "build": "tsc -p tsconfig.build.json"
-  },
   "engines": {
     "node": ">= 12.0.0"
   },
@@ -33,8 +28,9 @@
     "@babel/preset-react": "7.10.1",
     "@babel/preset-typescript": "7.12.7",
     "@babel/runtime": "7.12.5",
-    "@shuvi/shared": "0.0.1-rc.34",
-    "@shuvi/utils": "0.0.1-rc.34",
+    "@shuvi/shared": "0.0.1-rc.36",
+    "@shuvi/types": "0.0.1-rc.37",
+    "@shuvi/utils": "0.0.1-rc.36",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",
@@ -45,6 +41,7 @@
     "file-loader": "6.2.0",
     "fork-ts-checker-webpack-plugin": "6.0.8",
     "ignore-loader": "0.1.2",
+    "launch-editor": "2.2.1",
     "loader-utils": "2.0.0",
     "mini-css-extract-plugin": "1.3.9",
     "path-browserify": "1.0.1",
@@ -69,6 +66,7 @@
     "@types/loader-utils": "2.0.1",
     "@types/mini-css-extract-plugin": "^1.2.2",
     "@types/terser-webpack-plugin": "5.0.2",
+    "@types/webpack": "4.41.0",
     "@types/webpack-bundle-analyzer": "^3.8.0",
     "memfs": "^3.1.2",
     "webpack": "5.36.0"
@@ -76,5 +74,9 @@
   "peerDependencies": {
     "webpack": "5.36.0"
   },
-  "gitHead": "10ebaa2a20fd06bc7f34be0feeddef9a26f9dddd"
-}
+  "scripts": {
+    "dev": "tsc -p tsconfig.build.json -w",
+    "prebuild": "rimraf lib",
+    "build": "tsc -p tsconfig.build.json"
+  }
+}

package/lib/webpack/types.d.ts

@@ -1,40 +0,0 @@
-import WebpackChain from 'webpack-chain';
-export interface IModuleItem {
-    id: string;
-    name: string;
-}
-export interface IModule {
-    files: string[];
-    children: IModuleItem[];
-}
-export declare type IAssetMap = {
-    js: string[];
-    css?: string[];
-} & {
-    [ext: string]: string[];
-};
-export interface IChunk {
-    file: string;
-    request: string;
-}
-export interface IManifest {
-    entries: {
-        [s: string]: IAssetMap;
-    };
-    bundles: {
-        [name: string]: string;
-    };
-    chunkRequest: {
-        [file: string]: string;
-    };
-    loadble: {
-        [s: string]: IModule;
-    };
-}
-export declare type ExternalsFunction = (data: {
-    context: string;
-    request: string;
-}, callback: (err: Error | null, result: string | undefined) => void) => void;
-export interface IWebpackHelpers {
-    addExternals: (chain: WebpackChain, externalsFn: ExternalsFunction) => void;
-}

package/lib/webpack/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });