@umijs/plugins 4.0.0-rc.5 → 4.0.0-rc.8

package/dist/antd.js

@@ -5,11 +5,16 @@ const plugin_utils_1 = require("umi/plugin-utils");
 const resolveProjectDep_1 = require("./utils/resolveProjectDep");
 const withTmpPath_1 = require("./utils/withTmpPath");
 exports.default = (api) => {
-    const pkgPath = (0, resolveProjectDep_1.resolveProjectDep)({
-        pkg: api.pkg,
-        cwd: api.cwd,
-        dep: 'antd',
-    }) || (0, path_1.dirname)(require.resolve('antd/package.json'));
+    let pkgPath;
+    try {
+        pkgPath =
+            (0, resolveProjectDep_1.resolveProjectDep)({
+                pkg: api.pkg,
+                cwd: api.cwd,
+                dep: 'antd',
+            }) || (0, path_1.dirname)(require.resolve('antd/package.json'));
+    }
+    catch (e) { }
     api.describe({
         config: {
             schema(Joi) {
@@ -27,7 +32,13 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
+    function checkPkgPath() {
+        if (!pkgPath) {
+            throw new Error(`Can't find antd package. Please install antd first.`);
+        }
+    }
     api.modifyAppData((memo) => {
+        checkPkgPath();
         const version = require(`${pkgPath}/package.json`).version;
         memo.antd = {
             pkgPath,
@@ -36,6 +47,7 @@ exports.default = (api) => {
         return memo;
     });
     api.modifyConfig((memo) => {
+        checkPkgPath();
         // antd import
         memo.alias.antd = pkgPath;
         // moment > dayjs

package/dist/dva.js

@@ -29,6 +29,7 @@ const path_1 = require("path");
 const plugin_utils_1 = require("umi/plugin-utils");
 const modelUtils_1 = require("./utils/modelUtils");
 const withTmpPath_1 = require("./utils/withTmpPath");
+const utils_1 = require("@umijs/utils");
 exports.default = (api) => {
     const pkgPath = (0, path_1.join)(__dirname, '../libs/dva.ts');
     api.describe({
@@ -36,6 +37,7 @@ exports.default = (api) => {
             schema(Joi) {
                 return Joi.object({
                     extraModels: Joi.array().items(Joi.string()),
+                    immer: Joi.object(),
                 });
             },
         },
@@ -55,6 +57,7 @@ exports.default = (api) => {
         return memo;
     });
     api.onGenerateFiles((args) => {
+        var _a, _b, _c, _d, _e, _f;
         const models = args.isFirstTime
             ? api.appData.pluginDva.models
             : getAllModels(api);
@@ -70,6 +73,12 @@ exports.default = (api) => {
 // It's faked dva
 // aliased to @umijs/plugins/templates/dva
 import { create, Provider } from 'dva';
+import createLoading from '${(0, utils_1.winPath)(require.resolve('dva-loading'))}';
+${((_a = api.config.dva) === null || _a === void 0 ? void 0 : _a.immer)
+                ? `
+import dvaImmer, { enableES5, enableAllPlugins } from '${(0, utils_1.winPath)(require.resolve('dva-immer'))}';
+`
+                : ''}
 import React, { useRef } from 'react';
 import { history } from 'umi';
 import { models } from './models';
@@ -91,6 +100,10 @@ export function RootContainer(props: any) {
         },
       },
     );
+    app.current.use(createLoading());
+    ${((_b = api.config.dva) === null || _b === void 0 ? void 0 : _b.immer) ? `app.current.use(dvaImmer());` : ''}
+    ${((_d = (_c = api.config.dva) === null || _c === void 0 ? void 0 : _c.immer) === null || _d === void 0 ? void 0 : _d.enableES5) ? `enableES5();` : ''}
+    ${((_f = (_e = api.config.dva) === null || _e === void 0 ? void 0 : _e.immer) === null || _f === void 0 ? void 0 : _f.enableAllPlugins) ? `enableAllPlugins();` : ''}
     for (const id of Object.keys(models)) {
       app.current.model(models[id].model);
     }

package/dist/locale.js

@@ -28,15 +28,15 @@ exports.default = (api) => {
     catch (e) {
         api.logger.warn('antd is not installed. <SelecLang /> unavailable');
     }
+    const defaultConfig = {
+        baseNavigator: true,
+        useLocalStorage: true,
+        baseSeparator: '-',
+        antd: hasAntd,
+    };
     api.describe({
         key: 'locale',
         config: {
-            default: {
-                baseNavigator: true,
-                useLocalStorage: true,
-                baseSeparator: '-',
-                antd: hasAntd,
-            },
             schema(joi) {
                 return joi.object({
                     default: joi.string(),
@@ -89,8 +89,7 @@ exports.default = (api) => {
         const resolveKey = api.config.moment2dayjs ? 'dayjs' : 'moment';
         const momentPkgPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve(`${resolveKey}/package.json`)));
         const EventEmitterPkg = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('event-emitter/package')));
-        const { baseSeparator, baseNavigator, antd, title, useLocalStorage } = api
-            .config.locale;
+        const { baseSeparator, baseNavigator, antd, title, useLocalStorage } = Object.assign(Object.assign({}, defaultConfig), api.config.locale);
         const defaultLocale = ((_e = api.config.locale) === null || _e === void 0 ? void 0 : _e.default) || `zh${baseSeparator}CN`;
         const localeList = yield getList(resolveKey);
         const momentLocales = localeList

package/dist/tailwindcss.js

@@ -1,42 +1,40 @@
 "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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const path = __importStar(require("path"));
+const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 exports.default = (api) => {
-    api.describe({ key: 'tailwindcss' });
-    api.onStart(() => {
-        const inputPath = path.resolve(api.cwd, 'tailwind.css');
-        const generatedPath = path.resolve(api.paths.absTmpPath, 'tailwind.css');
-        const binPath = path.resolve(api.cwd, 'node_modules/.bin/tailwind');
+    api.describe({
+        key: 'tailwindcss',
+        config: {
+            schema(Joi) {
+                return Joi.object();
+            },
+        },
+        enableBy: api.EnableBy.config,
+    });
+    let tailwind = null;
+    const outputPath = 'plugin-tailwindcss/tailwind.css';
+    api.onBeforeCompiler(() => {
+        const inputPath = (0, path_1.join)(api.cwd, 'tailwind.css');
+        const generatedPath = (0, path_1.join)(api.paths.absTmpPath, outputPath);
+        const binPath = (0, path_1.join)(api.cwd, 'node_modules/.bin/tailwind');
         /** 透过子进程建立 tailwindcss 服务，将生成的 css 写入 generatedPath */
-        const tailwind = (0, child_process_1.exec)(`${binPath} -i ${inputPath} -o ${generatedPath} --watch`, { cwd: api.cwd });
+        tailwind = (0, plugin_utils_1.crossSpawn)(`${binPath}`, [
+            '-i',
+            inputPath,
+            '-o',
+            generatedPath,
+            api.env === 'development' ? '--watch' : '',
+        ], {
+            stdio: 'inherit',
+        });
         tailwind.on('error', (m) => {
             api.logger.error('tailwindcss service encounter an error: ' + m);
         });
-        /** 将生成的 css 文件加入到 import 中 */
-        api.addEntryImports(() => [{ source: generatedPath }]);
+    });
+    /** 将生成的 css 文件加入到 import 中 */
+    api.addEntryImports(() => {
+        const generatedPath = (0, plugin_utils_1.winPath)((0, path_1.join)(api.paths.absTmpPath, outputPath));
+        return [{ source: generatedPath }];
     });
 };

package/dist/unocss.js

@@ -1,34 +1,8 @@
 "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 child_process_1 = require("child_process");
-const fs = __importStar(require("fs"));
-const path_1 = __importDefault(require("path"));
+const fs_1 = require("fs");
+const path_1 = require("path");
 const plugin_utils_1 = require("umi/plugin-utils");
 exports.default = (api) => {
     api.describe({
@@ -42,20 +16,24 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    api.onStart(() => {
+    const outputPath = 'uno.css';
+    api.onBeforeCompiler(() => {
         /** 由于 @unocss/cli 对设置文件进行了检查，因此加入需要 unocss.config.ts 设置的提示
          * https://github.com/antfu/unocss/blob/main/packages/cli/src/index.ts#L93 */
-        if (!fs.existsSync(path_1.default.resolve(api.paths.cwd, 'unocss.config.ts')))
-            plugin_utils_1.logger.warn('请在项目目录中添加 unocss.config.ts 文件，并配置需要的 unocss presets，否则插件将没有效果！');
-        const generatedPath = path_1.default.resolve(api.paths.absTmpPath, 'uno.css');
-        const binPath = path_1.default.resolve(api.cwd, 'node_modules/.bin/unocss');
+        if (!(0, fs_1.existsSync)((0, path_1.join)(api.paths.cwd, 'unocss.config.ts')))
+            api.logger.warn('请在项目目录中添加 unocss.config.ts 文件，并配置需要的 unocss presets，否则插件将没有效果！');
+        const generatedPath = (0, path_1.join)(api.paths.absTmpPath, outputPath);
+        const binPath = (0, path_1.join)(api.cwd, 'node_modules/.bin/unocss');
         const watchDirs = api.config.unocss.watch;
         /** 透过子进程建立 unocss 服务，将生成的 css 写入 generatedPath */
-        const unocss = (0, child_process_1.exec)(`${binPath} ${watchDirs.join(' ')} --out-file ${generatedPath} --watch`, { cwd: api.cwd });
+        const unocss = (0, child_process_1.exec)(`${binPath} ${watchDirs.join(' ')} --out-file ${generatedPath} ${api.env === 'development' ? '--watch' : ''}`, { cwd: api.cwd });
         unocss.on('error', (m) => {
             api.logger.error('unocss service encounter an error: ' + m);
         });
-        /** 将生成的 css 文件加入到 import 中 */
-        api.addEntryImports(() => [{ source: generatedPath }]);
+    });
+    /** 将生成的 css 文件加入到 import 中 */
+    api.addEntryImports(() => {
+        const generatedPath = (0, plugin_utils_1.winPath)((0, path_1.join)(api.paths.absTmpPath, outputPath));
+        return [{ source: generatedPath }];
     });
 };

package/libs/locale/localeExports.tpl

@@ -163,9 +163,9 @@ export const getLocale = () => {
   // please clear localStorage if you change the baseSeparator config
   // because changing will break the app
   const lang =
-    typeof localStorage !== 'undefined' && useLocalStorage
-      ? window.localStorage.getItem('umi_locale')
-      : '';
+      navigator.cookieEnabled && typeof localStorage !== 'undefined' && useLocalStorage
+        ? window.localStorage.getItem('umi_locale')
+        : '';
   // support baseNavigator, default true
   let browserLang;
   {{#BaseNavigator}}
@@ -207,9 +207,9 @@ export const setLocale = (lang: string, realReload: boolean = true) => {
 
   const updater = () => {
     if (getLocale() !== lang) {
-      if (typeof window.localStorage !== 'undefined' && useLocalStorage) {
-        window.localStorage.setItem('umi_locale', lang || '');
-      }
+       if (navigator.cookieEnabled && typeof window.localStorage !== 'undefined' && useLocalStorage) {
+          window.localStorage.setItem('umi_locale', lang || '');
+       }
       setIntl(lang);
       if (realReload) {
         window.location.reload();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-rc.5",
+  "version": "4.0.0-rc.8",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -18,19 +18,21 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch"
+    "dev": "pnpm build -- --watch",
+    "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^7.0.1-beta.2",
-    "@umijs/bundler-utils": "4.0.0-rc.5",
-    "antd": "^4.18.9",
+    "@ant-design/pro-layout": "^7.0.1-beta.3",
+    "@umijs/bundler-utils": "4.0.0-rc.8",
     "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.26.0",
+    "axios": "^0.26.1",
     "babel-plugin-import": "^1.13.3",
-    "dayjs": "^1.10.8",
+    "dayjs": "^1.11.0",
     "dva-core": "^2.0.4",
+    "dva-immer": "^1.0.0",
+    "dva-loading": "^3.0.22",
     "event-emitter": "~0.3.5",
     "fast-deep-equal": "3.1.3",
     "lodash": "^4.17.21",
@@ -42,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.5"
+    "umi": "4.0.0-rc.8"
   },
   "publishConfig": {
     "access": "public"