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

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 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/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.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,11 +23,10 @@
   "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.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.8",
     "dva-core": "^2.0.4",
@@ -42,7 +41,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.5"
+    "umi": "4.0.0-rc.6"
   },
   "publishConfig": {
     "access": "public"