@umijs/plugins 4.0.0-rc.3 → 4.0.0-rc.6

package/dist/antd.js

@@ -67,7 +67,7 @@ exports.default = (api) => {
     });
     // antd config provider
     api.onGenerateFiles(() => {
-        if (!api.config.antd.config)
+        if (!api.config.antd.configProvider)
             return;
         api.writeTmpFile({
             path: `runtime.tsx`,
@@ -90,12 +90,12 @@ export function rootContainer(container) {
   return <ConfigProvider {...finalConfig}>{container}</ConfigProvider>;
 }
       `.trim(), {
-                config: JSON.stringify(api.config.antd.config),
+                config: JSON.stringify(api.config.antd.configProvider),
             }),
         });
     });
     api.addRuntimePlugin(() => {
-        return api.config.antd.config
+        return api.config.antd.configProvider
             ? [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })]
             : [];
     });

package/dist/dva.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/layout.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/model.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/moment2dayjs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 /*
    As long as moment2dayjs is registered, moment will be replaced by dayjs.
    The presets that can adapt to antd is registered by default.
@@ -81,11 +81,11 @@ dayjs.extend({{.}});
 
 dayjs.extend(antdPlugin);
     `;
-        const dayjsAntdPluginPath = require.resolve('antd-dayjs-webpack-plugin/src/antd-plugin');
-        const dayjsPath = (0, path_1.dirname)(require.resolve('dayjs/package.json'));
+        const dayjsAntdPluginPath = (0, plugin_utils_1.winPath)(require.resolve('antd-dayjs-webpack-plugin/src/antd-plugin'));
+        const dayjsPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('dayjs/package.json')));
         api.writeTmpFile({
             path: 'runtime.tsx',
-            content: utils_1.Mustache.render(runtimeTpl, {
+            content: plugin_utils_1.Mustache.render(runtimeTpl, {
                 plugins,
                 dayjsPath,
                 dayjsAntdPluginPath,

package/dist/qiankun/master.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMasterEnable = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 const withTmpPath_1 = require("../utils/withTmpPath");
 const constants_1 = require("./constants");
 function isMasterEnable(opts) {
@@ -105,8 +106,8 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
                         .replace('__USE_MODEL__', api.isPluginEnable('model')
                         ? `import { useModel } from '@@/plugin-model'`
                         : `const useModel = null;`)
-                        .replace(/from 'qiankun'/g, `from '${(0, path_1.dirname)(require.resolve('qiankun/package'))}'`)
-                        .replace(/from 'lodash\//g, `from '${(0, path_1.dirname)(require.resolve('lodash/package'))}/`),
+                        .replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`)
+                        .replace(/from 'lodash\//g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('lodash/package')))}/`),
                 });
             }
         });

package/dist/qiankun/slave.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
 const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 const withTmpPath_1 = require("../utils/withTmpPath");
 const constants_1 = require("./constants");
 // BREAK CHANGE: 需要手动配置 slave: {}，不能留空
@@ -133,8 +134,8 @@ if (!window.__POWERED_BY_QIANKUN__) {
                     .replace('__USE_MODEL__', api.isPluginEnable('model')
                     ? `import { useModel } from '@@/plugin/model'`
                     : `const useModel = null;`)
-                    .replace(/from 'qiankun'/g, `from '${(0, path_1.dirname)(require.resolve('qiankun/package'))}'`)
-                    .replace(/from 'lodash\//g, `from '${(0, path_1.dirname)(require.resolve('lodash/package'))}/`),
+                    .replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`)
+                    .replace(/from 'lodash\//g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('lodash/package')))}/`),
             });
         });
     });

package/dist/tailwindcss.js

@@ -1,38 +1,40 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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 plugin_utils_1 = require("umi/plugin-utils");
+const path_1 = require("path");
 exports.default = (api) => {
-    api.describe({ key: 'tailwindcss' });
+    api.describe({
+        key: 'tailwindcss',
+        config: {
+            schema(Joi) {
+                return Joi.object();
+            },
+        },
+        enableBy: api.EnableBy.config,
+    });
+    let tailwind = null;
+    const outputPath = 'plugin-tailwindcss/tailwind.css';
     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');
+        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,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -22,10 +26,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@umijs/utils");
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
+const plugin_utils_1 = require("umi/plugin-utils");
 exports.default = (api) => {
     api.describe({
         key: 'unocss',
@@ -42,7 +46,7 @@ exports.default = (api) => {
         /** 由于 @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')))
-            utils_1.logger.warn('请在项目目录中添加 unocss.config.ts 文件，并配置需要的 unocss presets，否则插件将没有效果！');
+            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');
         const watchDirs = api.config.unocss.watch;

package/dist/utils/astUtils.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/utils/localeUtils.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNeedPolyfill = exports.exactLocalePaths = exports.getLocaleList = exports.getAntdLocale = exports.getMomentLocale = void 0;
-const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 /**
  * 获取 moment 包的 locale 名称
  * @param lang 语言
@@ -58,16 +58,16 @@ const modulesHasLocale = (localePath) => {
 const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
     const { localeFolder, separator = '-', absSrcPath = '', absPagesPath = '', addAntdLocales, resolveKey = 'moment', } = opts;
     const localeFileMath = new RegExp(`^([a-z]{2})${separator}?([A-Z]{2})?\.(js|json|ts)$`);
-    const localeFiles = utils_1.glob
+    const localeFiles = plugin_utils_1.glob
         .sync('*.{ts,js,json}', {
-        cwd: (0, utils_1.winPath)((0, path_1.join)(absSrcPath, localeFolder)),
+        cwd: (0, plugin_utils_1.winPath)((0, path_1.join)(absSrcPath, localeFolder)),
     })
-        .map((name) => (0, utils_1.winPath)((0, path_1.join)(absSrcPath, localeFolder, name)))
-        .concat(utils_1.glob
+        .map((name) => (0, plugin_utils_1.winPath)((0, path_1.join)(absSrcPath, localeFolder, name)))
+        .concat(plugin_utils_1.glob
         .sync(`**/${localeFolder}/*.{ts,js,json}`, {
         cwd: absPagesPath,
     })
-        .map((name) => (0, utils_1.winPath)((0, path_1.join)(absPagesPath, name))))
+        .map((name) => (0, plugin_utils_1.winPath)((0, path_1.join)(absPagesPath, name))))
         .filter((p) => localeFileMath.test((0, path_1.basename)(p)) && (0, fs_1.existsSync)(p))
         .map((fullName) => {
         var _a, _b;
@@ -79,11 +79,11 @@ const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
             path: fullName,
         };
     });
-    const groups = utils_1.lodash.groupBy(localeFiles, 'name');
+    const groups = plugin_utils_1.lodash.groupBy(localeFiles, 'name');
     const promises = Object.keys(groups).map((name) => __awaiter(void 0, void 0, void 0, function* () {
         const [lang, country = ''] = name.split(separator);
         const { momentLocale } = (0, exports.getMomentLocale)(lang, country, resolveKey);
-        const antdLocale = utils_1.lodash
+        const antdLocale = plugin_utils_1.lodash
             .uniq(yield addAntdLocales({ lang, country }))
             .filter((localePath) => modulesHasLocale(localePath));
         return {
@@ -94,7 +94,7 @@ const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
             locale: name.split(separator).join('-'),
             country,
             antdLocale,
-            paths: groups[name].map((item) => (0, utils_1.winPath)(item.path)),
+            paths: groups[name].map((item) => (0, plugin_utils_1.winPath)(item.path)),
             momentLocale,
         };
     }));
@@ -102,7 +102,7 @@ const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.getLocaleList = getLocaleList;
 const exactLocalePaths = (data) => {
-    return utils_1.lodash.flatten(data.map((item) => item.paths));
+    return plugin_utils_1.lodash.flatten(data.map((item) => item.paths));
 };
 exports.exactLocalePaths = exactLocalePaths;
 function isNeedPolyfill(targets = {}) {

package/dist/utils/modelUtils.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -26,9 +30,9 @@ exports.ModelUtils = exports.Model = void 0;
 const parser = __importStar(require("@umijs/bundler-utils/compiled/babel/parser"));
 const traverse_1 = __importDefault(require("@umijs/bundler-utils/compiled/babel/traverse"));
 const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
-const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 const astUtils_1 = require("./astUtils");
 class Model {
     constructor(file, id) {
@@ -76,12 +80,12 @@ class ModelUtils {
         });
     }
     getModels(opts) {
-        return utils_1.glob
+        return plugin_utils_1.glob
             .sync(opts.pattern || '**/*.{ts,js}', {
             cwd: opts.base,
             absolute: true,
         })
-            .map(utils_1.winPath)
+            .map(plugin_utils_1.winPath)
             .filter((file) => {
             if (/\.d.ts$/.test(file))
                 return false;

package/dist/utils/withTmpPath.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withTmpPath = void 0;
-const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 function withTmpPath(opts) {
-    return (0, utils_1.winPath)((0, path_1.join)(opts.api.paths.absTmpPath, opts.api.plugin.key && !opts.noPluginDir
+    return (0, plugin_utils_1.winPath)((0, path_1.join)(opts.api.paths.absTmpPath, opts.api.plugin.key && !opts.noPluginDir
         ? `plugin-${opts.api.plugin.key}`
         : '', opts.path));
 }

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.3",
+  "version": "4.0.0-rc.6",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -23,13 +23,12 @@
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.33.0",
-    "@umijs/bundler-utils": "4.0.0-rc.3",
-    "antd": "^4.18.8",
+    "@ant-design/pro-layout": "^7.0.1-beta.3",
+    "@umijs/bundler-utils": "4.0.0-rc.6",
     "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.26.0",
+    "axios": "^0.26.1",
     "babel-plugin-import": "^1.13.3",
-    "dayjs": "^1.10.7",
+    "dayjs": "^1.10.8",
     "dva-core": "^2.0.4",
     "event-emitter": "~0.3.5",
     "fast-deep-equal": "3.1.3",
@@ -42,7 +41,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.3"
+    "umi": "4.0.0-rc.6"
   },
   "publishConfig": {
     "access": "public"