umi 4.0.0-canary.20220325.1 → 4.0.0-rc.11

package/client/client/plugin.js

@@ -52,6 +52,9 @@ export class PluginManager {
         if (args) {
             assert(typeof args === 'object', `applyPlugins failed, args must be plain object.`);
         }
+        if (async) {
+            assert(type === ApplyPluginsType.modify || type === ApplyPluginsType.event, `async only works with modify and event type.`);
+        }
         switch (type) {
             case ApplyPluginsType.modify:
                 if (async) {
@@ -94,10 +97,15 @@ export class PluginManager {
                     }, initialValue);
                 }
             case ApplyPluginsType.event:
-                return hooks.forEach((hook) => {
-                    assert(typeof hook === 'function', `applyPlugins failed, all hooks for key ${key} must be function.`);
-                    hook(args);
-                });
+                return (() => __awaiter(this, void 0, void 0, function* () {
+                    for (const hook of hooks) {
+                        assert(typeof hook === 'function', `applyPlugins failed, all hooks for key ${key} must be function.`);
+                        const ret = hook(args);
+                        if (async && isPromiseLike(ret)) {
+                            yield ret;
+                        }
+                    }
+                }))();
             case ApplyPluginsType.compose:
                 return () => {
                     return compose({

package/eslint.js

@@ -0,0 +1,7 @@
+try {
+  require.resolve('@umijs/lint/package.json');
+} catch (err) {
+  throw new Error('@umijs/lint is not built-in, please install it manually before run umi lint.');
+}
+
+module.exports = process.env.LEGACY_ESLINT ? require('@umijs/lint/dist/config/eslint/legacy') : require('@umijs/lint/dist/config/eslint');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umi",
-  "version": "4.0.0-canary.20220325.1",
+  "version": "4.0.0-rc.11",
   "description": "umi",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/umi#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -23,8 +23,11 @@
     "plugin.js",
     "plugin-utils.d.ts",
     "plugin-utils.js",
+    "prettier.js",
     "test.d.ts",
-    "test.js"
+    "test.js",
+    "eslint.js",
+    "stylelint.js"
   ],
   "scripts": {
     "build": "pnpm tsc",
@@ -34,11 +37,14 @@
     "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@umijs/core": "4.0.0-canary.20220325.1",
-    "@umijs/preset-umi": "4.0.0-canary.20220325.1",
-    "@umijs/renderer-react": "4.0.0-canary.20220325.1",
-    "@umijs/test": "4.0.0-canary.20220325.1",
-    "@umijs/utils": "4.0.0-canary.20220325.1"
+    "@umijs/core": "4.0.0-rc.11",
+    "@umijs/lint": "4.0.0-rc.11",
+    "@umijs/preset-umi": "4.0.0-rc.11",
+    "@umijs/renderer-react": "4.0.0-rc.11",
+    "@umijs/test": "4.0.0-rc.11",
+    "@umijs/utils": "4.0.0-rc.11",
+    "prettier-plugin-organize-imports": "^2.3.4",
+    "prettier-plugin-packagejson": "^2.2.16"
   },
   "engines": {
     "node": ">=14"

package/prettier.js

@@ -0,0 +1,12 @@
+module.exports = {
+  printWidth: 80,
+  singleQuote: true,
+  trailingComma: 'all',
+  proseWrap: 'never',
+  endOfLine: 'lf',
+  overrides: [{ files: '.prettierrc', options: { parser: 'json' } }],
+  plugins: [
+    require.resolve('prettier-plugin-packagejson'),
+    require.resolve('prettier-plugin-organize-imports'),
+  ],
+};

package/stylelint.js

@@ -0,0 +1,7 @@
+try {
+  require.resolve('@umijs/lint/package.json');
+} catch (err) {
+  throw new Error('@umijs/lint is not built-in, please install it manually before run umi lint.');
+}
+
+module.exports = require('@umijs/lint/dist/config/stylelint');