@umijs/preset-umi 4.0.5 → 4.0.6

package/dist/commands/dev/dev.js

@@ -235,12 +235,16 @@ PORT=8888 umi dev
                 extraBabelPresets,
                 beforeMiddlewares: [].concat([
                     ...beforeMiddlewares,
-                    faviconMiddleware_1.faviconMiddleware,
                 ]),
                 // vite 模式使用 ./plugins/ViteHtmlPlugin.ts 处理
                 afterMiddlewares: enableVite
                     ? []
-                    : middlewares.concat((0, createRouteMiddleware_1.createRouteMiddleware)({ api })),
+                    : middlewares.concat([
+                        (0, createRouteMiddleware_1.createRouteMiddleware)({ api }),
+                        // 放置 favicon 在 webpack middleware 之后，兼容 public 目录下有 favicon.ico 的场景
+                        // ref: https://github.com/umijs/umi/issues/8024
+                        faviconMiddleware_1.faviconMiddleware,
+                    ]),
                 onDevCompileDone(opts) {
                     debouncedPrintMemoryUsage;
                     // debouncedPrintMemoryUsage();

package/dist/commands/lint.js

@@ -17,11 +17,14 @@ umi lint --stylelint-only
 
 # automatically fix, where possible
 umi lint --fix
+
+# disable reporting on warnings
+umi lint --quiet
 `,
         fn: async function () {
             // re-parse cli args to process boolean flags, for get the lint-staged args
             const args = (0, utils_1.yParser)(process.argv.slice(3), {
-                boolean: ['fix', 'eslint-only', 'stylelint-only'],
+                boolean: ['quiet', 'fix', 'eslint-only', 'stylelint-only'],
             });
             try {
                 require.resolve('@umijs/lint/package.json');

package/dist/commands/preview.js

@@ -92,7 +92,7 @@ umi preview --port [port]
             server.listen(port, () => {
                 const host = api.args.host && api.args.host !== '0.0.0.0'
                     ? api.args.host
-                    : '127.0.0.1';
+                    : 'localhost';
                 utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`${protocol}//${host}:${port}`)}`);
             });
         },

package/dist/features/apiRoute/apiRoute.js

@@ -48,7 +48,6 @@ exports.default = (api) => {
                 return false;
             const config = api.userConfig.apiRoute;
             if (!config) {
-                utils_1.logger.warn('Directory ./src/api exists, but config.apiRoute is not set. API route feature will not be enabled!');
                 return false;
             }
             if (!config.platform) {

package/dist/features/clickToComponent/clickToComponent.d.ts

@@ -0,0 +1,3 @@
+import { IApi } from '../../types';
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/features/clickToComponent/clickToComponent.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@umijs/utils");
+const path_1 = require("path");
+exports.default = (api) => {
+    api.describe({
+        key: 'clickToComponent',
+        config: {
+            schema(joi) {
+                return joi.object({
+                    editor: joi.string(),
+                });
+            },
+        },
+        enableBy: api.EnableBy.config,
+    });
+    const pkgPath = (0, path_1.dirname)(require.resolve('click-to-react-component'));
+    api.modifyConfig((memo) => {
+        memo.alias['click-to-react-component'] = pkgPath;
+        return memo;
+    });
+    api.modifyAppData((memo) => {
+        memo.clickToComponent = {
+            pkgPath,
+            version: '1.0.8',
+        };
+        return memo;
+    });
+    api.onGenerateFiles({
+        name: 'clickToComponent',
+        fn: () => {
+            api.writeTmpFile({
+                path: 'runtime.tsx',
+                content: `
+import { ClickToComponent } from 'click-to-react-component';
+import React from 'react';
+export function rootContainer(container, opts) {
+return React.createElement(
+  (props) => {
+    return (
+      <>
+        <ClickToComponent editor="${api.config.clickToComponent.editor || 'vscode'}"/>
+        {props.children}
+      </>
+    );
+  },
+  opts,
+  container,
+);
+}
+    `,
+            });
+        },
+    });
+    api.addRuntimePlugin(() => [
+        (0, utils_1.winPath)((0, path_1.join)(api.paths.absTmpPath, 'plugin-clickToComponent/runtime.tsx')),
+    ]);
+};

package/dist/features/ssr/builder/css-loader.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cssLoader = exports.getClassNames = exports.hashString = exports.ensureLastSlash = void 0;
-const bundler_webpack_1 = require("@umijs/bundler-webpack");
+const parcelCSS_1 = require("@umijs/bundler-webpack/dist/parcelCSS");
 const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -18,7 +18,7 @@ exports.hashString = hashString;
 function getClassNames(code, filename) {
     // why use Parcel CSS?
     // ref: https://github.com/indooorsman/esbuild-css-modules-plugin
-    const { exports } = bundler_webpack_1.parcelCSS.transform({
+    const { exports } = parcelCSS_1.parcelCSS.transform({
         filename,
         code,
         minify: false,

package/dist/features/tmpFiles/routes.d.ts

@@ -10,3 +10,12 @@ export declare function getRouteComponents(opts: {
     prefix: string;
     api: IApi;
 }): Promise<string>;
+/**
+ *
+ * transform component into webpack chunkName
+ * @export
+ * @param {string} component component path
+ * @param {string} [cwd] current root path
+ * @return {*}  {string}
+ */
+export declare function componentToChunkName(component: string, cwd?: string): string;

package/dist/features/tmpFiles/routes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRouteComponents = exports.getRoutes = exports.getApiRoutes = void 0;
+exports.componentToChunkName = exports.getRouteComponents = exports.getRoutes = exports.getApiRoutes = void 0;
 const core_1 = require("@umijs/core");
 const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
@@ -190,11 +190,43 @@ async function getRouteComponents(opts) {
         const path = (0, path_1.isAbsolute)(route.file) || route.file.startsWith('@/')
             ? route.file
             : `${opts.prefix}${route.file}`;
+        const webpackChunkName = componentToChunkName(path, opts.api.cwd);
         return useSuspense
-            ? `'${key}': React.lazy(() => import(/* webpackChunkName: "${key.replace(/[\/-]/g, '_')}" */'${(0, utils_1.winPath)(path)}')),`
-            : `'${key}': () => import(/* webpackChunkName: "${key.replace(/[\/-]/g, '_')}" */'${(0, utils_1.winPath)(path)}'),`;
+            ? `'${key}': React.lazy(() => import(/* webpackChunkName: "${webpackChunkName}" */'${(0, utils_1.winPath)(path)}')),`
+            : `'${key}': () => import(/* webpackChunkName: "${webpackChunkName}" */'${(0, utils_1.winPath)(path)}'),`;
     })
         .join('\n');
     return `{\n${imports}\n}`;
 }
 exports.getRouteComponents = getRouteComponents;
+function lastSlash(str) {
+    return str[str.length - 1] === '/' ? str : `${str}/`;
+}
+/**
+ *
+ * transform component into webpack chunkName
+ * @export
+ * @param {string} component component path
+ * @param {string} [cwd] current root path
+ * @return {*}  {string}
+ */
+function componentToChunkName(component, cwd) {
+    return typeof component === 'string'
+        ? component
+            .replace(new RegExp(`^${utils_1.lodash.escapeRegExp(lastSlash((0, utils_1.winPath)(cwd || '/')))}`), '')
+            .replace(/^.(\/|\\)/, '')
+            .replace(/(\/|\\)/g, '__')
+            .replace(/\.jsx?$/, '')
+            .replace(/\.tsx?$/, '')
+            .replace(/\.vue?$/, '')
+            .replace(/^src__/, '')
+            .replace(/\.\.__/g, '')
+            // 约定式路由的 [ 会导致 webpack 的 code splitting 失败
+            // ref: https://github.com/umijs/umi/issues/4155
+            .replace(/[\[\]]/g, '')
+            // 插件层的文件也可能是路由组件，比如 plugin-layout 插件
+            .replace(/^.umi-production__/, 't__')
+            .replace(/^pages__/, 'p__')
+        : '';
+}
+exports.componentToChunkName = componentToChunkName;

package/dist/index.js

@@ -28,6 +28,7 @@ exports.default = () => {
             require.resolve('./features/vite/vite'),
             require.resolve('./features/apiRoute/apiRoute'),
             require.resolve('./features/monorepo/redirect'),
+            require.resolve('./features/clickToComponent/clickToComponent'),
             // commands
             require.resolve('./commands/build'),
             require.resolve('./commands/config/config'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -26,15 +26,16 @@
   },
   "dependencies": {
     "@types/multer": "1.4.7",
-    "@umijs/ast": "4.0.5",
-    "@umijs/babel-preset-umi": "4.0.5",
-    "@umijs/bundler-utils": "4.0.5",
-    "@umijs/bundler-vite": "4.0.5",
-    "@umijs/bundler-webpack": "4.0.5",
-    "@umijs/core": "4.0.5",
-    "@umijs/renderer-react": "4.0.5",
-    "@umijs/server": "4.0.5",
-    "@umijs/utils": "4.0.5",
+    "@umijs/ast": "4.0.6",
+    "@umijs/babel-preset-umi": "4.0.6",
+    "@umijs/bundler-utils": "4.0.6",
+    "@umijs/bundler-vite": "4.0.6",
+    "@umijs/bundler-webpack": "4.0.6",
+    "@umijs/core": "4.0.6",
+    "@umijs/renderer-react": "4.0.6",
+    "@umijs/server": "4.0.6",
+    "@umijs/utils": "4.0.6",
+    "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",
     "current-script-polyfill": "1.0.0",
     "enhanced-resolve": "5.9.3",