@umijs/plugins 4.0.0-beta.16 → 4.0.0-beta.17

package/dist/antd.js

@@ -52,7 +52,7 @@ exports.default = (api) => {
     // babel-plugin-import
     api.addExtraBabelPlugins(() => {
         const style = api.config.antd.style || 'less';
-        return api.config.antd.import
+        return api.config.antd.import && !api.appData.vite
             ? [
                 [
                     require.resolve('babel-plugin-import'),
@@ -102,7 +102,7 @@ export function rootContainer(container) {
     // import antd style if antd.import is not configured
     api.addEntryImportsAhead(() => {
         const style = api.config.antd.style || 'less';
-        return api.config.antd.import
+        return api.config.antd.import && !api.appData.vite
             ? []
             : [
                 {

package/dist/dva.js

@@ -67,16 +67,15 @@ exports.default = (api) => {
 // aliased to @umijs/plugins/templates/dva
 import { create, Provider } from 'dva';
 import React, { useRef } from 'react';
-import { useAppData } from 'umi';
+import { history } from 'umi';
 import { models } from './models';
 
 export function RootContainer(props: any) {
-  const { navigator } = useAppData();
   const app = useRef<any>();
   if (!app.current) {
     app.current = create(
       {
-        history: navigator,
+        history,
       },
       {
         initialReducer: {},
@@ -84,7 +83,7 @@ export function RootContainer(props: any) {
           return [...middlewares];
         },
         setupApp(app: IDvaApp) {
-          app._history = navigator;
+          app._history = history;
         },
       },
     );

package/dist/layout.js

@@ -111,7 +111,7 @@ const { formatMessage } = useIntl();
     <ProLayout
       route={route}
       location={location}
-      title={userConfig.name || 'plugin-layout'}
+      title={userConfig.title || 'plugin-layout'}
       navTheme="dark"
       siderWidth={256}
       onMenuHeaderClick={(e) => {

package/dist/tailwindcss.d.ts

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

package/dist/tailwindcss.js

@@ -0,0 +1,38 @@
+"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"));
+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');
+        /** 透过子进程建立 tailwindcss 服务，将生成的 css 写入 generatedPath */
+        const tailwind = (0, child_process_1.exec)(`${binPath} -i ${inputPath} -o ${generatedPath} --watch`, { cwd: api.cwd });
+        tailwind.on('error', (m) => {
+            api.logger.error('tailwindcss service encounter an error: ' + m);
+        });
+        /** 将生成的 css 文件加入到 import 中 */
+        api.addEntryImports(() => [{ source: generatedPath }]);
+    });
+};

package/dist/unocss.d.ts

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

package/dist/unocss.js

@@ -0,0 +1,57 @@
+"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;
+};
+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"));
+exports.default = (api) => {
+    api.describe({
+        key: 'unocss',
+        config: {
+            schema(Joi) {
+                return Joi.object({
+                    watch: Joi.array(),
+                });
+            },
+        },
+        enableBy: api.EnableBy.config,
+    });
+    api.onStart(() => {
+        /** 由于 @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，否则插件将没有效果！');
+        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;
+        /** 透过子进程建立 unocss 服务，将生成的 css 写入 generatedPath */
+        const unocss = (0, child_process_1.exec)(`${binPath} ${watchDirs.join(' ')} --out-file ${generatedPath} --watch`, { cwd: api.cwd });
+        unocss.on('error', (m) => {
+            api.logger.error('unocss service encounter an error: ' + m);
+        });
+        /** 将生成的 css 文件加入到 import 中 */
+        api.addEntryImports(() => [{ source: generatedPath }]);
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-beta.16",
+  "version": "4.0.0-beta.17",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -24,7 +24,7 @@
     "@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-beta.16",
+    "@umijs/bundler-utils": "4.0.0-beta.17",
     "antd": "^4.17.3",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.24.0",
@@ -42,7 +42,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-beta.16"
+    "umi": "4.0.0-beta.17"
   },
   "publishConfig": {
     "access": "public"