@umijs/plugins 4.0.0-rc.1 → 4.0.0-rc.2

package/dist/layout.js

@@ -187,7 +187,7 @@ const { formatMessage } = useIntl();
             return memo;
         }, {});
         const icons = Object.keys(iconsMap);
-        const antIconsPath = (0, path_1.dirname)(require.resolve('@ant-design/icons/package'));
+        const antIconsPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('@ant-design/icons/package')));
         api.writeTmpFile({
             path: 'icons.tsx',
             content: `

package/dist/locale.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageNormalize = 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");
 const localeUtils_1 = require("./utils/localeUtils");
 const withTmpPath_1 = require("./utils/withTmpPath");
 const packageNormalize = (packageName) => packageName.replace(/[@\/\-.]/g, '_');
@@ -50,7 +50,7 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    const reactIntlPkgPath = (0, path_1.dirname)(require.resolve('react-intl/package'));
+    const reactIntlPkgPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('react-intl/package')));
     // polyfill
     if ((0, localeUtils_1.isNeedPolyfill)(((_a = api.userConfig) === null || _a === void 0 ? void 0 : _a.targets) || {})) {
         api.addEntryImportsAhead(() => [
@@ -87,8 +87,8 @@ exports.default = (api) => {
         const localeTpl = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../libs/locale/locale.tpl'), 'utf-8');
         // moment2dayjs
         const resolveKey = api.config.moment2dayjs ? 'dayjs' : 'moment';
-        const momentPkgPath = (0, path_1.dirname)(require.resolve(`${resolveKey}/package.json`));
-        const EventEmitterPkg = (0, path_1.dirname)(require.resolve('event-emitter/package'));
+        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 defaultLocale = ((_e = api.config.locale) === null || _e === void 0 ? void 0 : _e.default) || `zh${baseSeparator}CN`;
@@ -114,7 +114,7 @@ exports.default = (api) => {
         // set antd default locale
         if (!antdLocales.length && ((_g = api.config.locale) === null || _g === void 0 ? void 0 : _g.antd)) {
             const [lang, country = ''] = defaultLocale.split(baseSeparator);
-            DefaultAntdLocales = utils_1.lodash.uniq(yield addAntdLocales({
+            DefaultAntdLocales = plugin_utils_1.lodash.uniq(yield addAntdLocales({
                 lang,
                 country,
             }));
@@ -124,7 +124,7 @@ exports.default = (api) => {
             return (0, exports.packageNormalize)(this);
         };
         api.writeTmpFile({
-            content: utils_1.Mustache.render(localeTpl, {
+            content: plugin_utils_1.Mustache.render(localeTpl, {
                 MomentLocales,
                 DefaultMomentLocale,
                 NormalizeAntdLocalesName,
@@ -143,7 +143,7 @@ exports.default = (api) => {
         const localeDirPath = (0, path_1.join)(api.paths.absSrcPath, localeDirName);
         api.writeTmpFile({
             path: 'localeExports.ts',
-            content: utils_1.Mustache.render(localeExportsTpl, {
+            content: plugin_utils_1.Mustache.render(localeExportsTpl, {
                 EventEmitterPkg,
                 BaseSeparator: baseSeparator,
                 BaseNavigator: baseNavigator,
@@ -159,7 +159,7 @@ exports.default = (api) => {
                     })) }))),
                 Antd: !!antd,
                 DefaultLocale: JSON.stringify(defaultLocale),
-                warningPkgPath: require.resolve('warning/package'),
+                warningPkgPath: (0, plugin_utils_1.winPath)(require.resolve('warning/package')),
                 reactIntlPkgPath,
             }),
         });
@@ -167,7 +167,7 @@ exports.default = (api) => {
         const runtimeTpl = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../libs/locale/runtime.tpl'), 'utf-8');
         api.writeTmpFile({
             path: 'runtime.tsx',
-            content: utils_1.Mustache.render(runtimeTpl, {
+            content: plugin_utils_1.Mustache.render(runtimeTpl, {
                 Title: !!title,
             }),
         });
@@ -175,7 +175,7 @@ exports.default = (api) => {
         const selectLang = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../libs/locale/SelectLang.tpl'), 'utf-8');
         api.writeTmpFile({
             path: 'SelectLang.tsx',
-            content: utils_1.Mustache.render(selectLang, {
+            content: plugin_utils_1.Mustache.render(selectLang, {
                 Antd: !!antd,
                 LocaleList: localeList,
                 ShowSelectLang: localeList.length > 1 && !!antd,

package/dist/request.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");
 exports.default = (api) => {
     api.describe({
         key: 'request',
@@ -276,15 +276,15 @@ export type {
 `;
     api.onGenerateFiles(() => {
         var _a;
-        const umiRequestPath = (0, path_1.dirname)(require.resolve('@ahooksjs/use-request/package.json'));
-        const axiosPath = (0, path_1.dirname)(require.resolve('axios/package.json'));
-        const antdPkg = 
+        const umiRequestPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('@ahooksjs/use-request/package.json')));
+        const axiosPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('axios/package.json')));
+        const antdPkg = (0, plugin_utils_1.winPath)(
         // use path from antd plugin first
         ((_a = api.appData.antd) === null || _a === void 0 ? void 0 : _a.pkgPath) ||
-            (0, path_1.dirname)(require.resolve('antd/package.json'));
+            (0, path_1.dirname)(require.resolve('antd/package.json')));
         api.writeTmpFile({
             path: 'request.ts',
-            content: utils_1.Mustache.render(requestTpl, {
+            content: plugin_utils_1.Mustache.render(requestTpl, {
                 umiRequestPath,
                 axiosPath,
                 antdPkg,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.2",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -23,11 +23,11 @@
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.31.7",
-    "@umijs/bundler-utils": "4.0.0-rc.1",
-    "antd": "^4.17.3",
+    "@ant-design/pro-layout": "^6.32.14",
+    "@umijs/bundler-utils": "4.0.0-rc.2",
+    "antd": "^4.18.7",
     "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.24.0",
+    "axios": "^0.26.0",
     "babel-plugin-import": "^1.13.3",
     "dayjs": "^1.10.7",
     "dva-core": "^2.0.4",
@@ -42,7 +42,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.1"
+    "umi": "4.0.0-rc.2"
   },
   "publishConfig": {
     "access": "public"