@umijs/preset-umi 4.0.71 → 4.0.73

package/dist/commands/dev/createRouteMiddleware.js

@@ -29,11 +29,17 @@ function createRouteMiddleware(opts) {
   return ({ compiler }) => {
     let webpackStats = null;
     let onStats = null;
-    compiler.hooks.done.tap("umiRouteMiddleware", (stats) => {
+    compiler == null ? void 0 : compiler.hooks.done.tap("umiRouteMiddleware", (stats) => {
       webpackStats = stats;
       onStats == null ? void 0 : onStats(stats);
     });
     async function getStats() {
+      if (!compiler && process.env.OKAM) {
+        return {
+          compilation: { assets: { "umi.js": "umi.js" } },
+          hasErrors: () => false
+        };
+      }
       if (webpackStats)
         return Promise.resolve(webpackStats);
       return new Promise((resolve) => {

package/dist/commands/dev/dev.js

@@ -379,6 +379,9 @@ PORT=8888 umi dev
       });
       if (enableVite) {
         await bundlerVite.dev(opts);
+      } else if (process.env.OKAM) {
+        const { dev } = require(process.env.OKAM);
+        await dev(opts);
       } else {
         await bundlerWebpack.dev(opts);
       }

package/dist/features/check/babel722.d.ts

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

package/dist/features/check/babel722.js

@@ -0,0 +1,85 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/features/check/babel722.ts
+var babel722_exports = {};
+__export(babel722_exports, {
+  default: () => babel722_default
+});
+module.exports = __toCommonJS(babel722_exports);
+var import_utils = require("@umijs/utils");
+var DEPRECATED_DEPS = [
+  "unicode-sets-regex",
+  "class-static-block",
+  "private-property-in-object",
+  "class-properties",
+  "private-methods",
+  "numeric-separator",
+  "logical-assignment-operators",
+  "nullish-coalescing-operator",
+  "optional-chaining",
+  "export-namespace-from",
+  "json-strings",
+  "optional-catch-binding",
+  "async-generator-functions",
+  "object-rest-spread",
+  "unicode-property-regex"
+];
+var BABEL_PROPOSAL_PREFIX = "@babel/plugin-proposal-";
+var BABEL_TRANSFORM_PREFIX = "@babel/plugin-transform-";
+var babel722_default = (api) => {
+  api.onCheck(() => {
+    const pkg = api.pkg;
+    const breakingDeps = DEPRECATED_DEPS.map(
+      (i) => `${BABEL_PROPOSAL_PREFIX}${i}`
+    );
+    const deps = Object.keys({
+      ...(pkg == null ? void 0 : pkg.dependencies) || {},
+      ...(pkg == null ? void 0 : pkg.devDependencies) || {}
+    });
+    const willBreakingDeps = deps.filter((i) => breakingDeps.includes(i));
+    if (willBreakingDeps.length) {
+      const tips = [
+        ...willBreakingDeps.map((dep) => {
+          const oldName = import_utils.chalk.yellow(dep);
+          const newName = import_utils.chalk.green(
+            `${BABEL_TRANSFORM_PREFIX}${dep.replace(
+              BABEL_PROPOSAL_PREFIX,
+              ""
+            )}`
+          );
+          return ` - ${oldName} -> ${newName}`;
+        })
+      ];
+      console.log(`
+  ${import_utils.chalk.bold.yellow("Babel Deprecation Warning")}
+
+  Babel >= 7.22.0 will remove the following plugins:
+  ${tips.join("\n")}
+  Please use the ${import_utils.chalk.bold.green(
+        BABEL_TRANSFORM_PREFIX
+      )} prefix instead of ${import_utils.chalk.bold.yellow(
+        BABEL_PROPOSAL_PREFIX
+      )} prefix and ${import_utils.chalk.blue("update your dependencies and config file")}.
+  Refer: https://babeljs.io/blog/2023/05/26/7.22.0#renamed-packages
+`);
+    }
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/devTool/devTool.js

@@ -28,6 +28,8 @@ var import_path = require("path");
 var devToolAppDist = (0, import_path.join)(__dirname, "../../../devToolAppDist");
 var assetsDir = (0, import_path.join)(__dirname, "../../../assets");
 var devTool_default = (api) => {
+  if (process.env.OKAM)
+    return;
   api.addBeforeMiddlewares(async () => {
     const $ = await api.applyPlugins({
       key: "modifyDevToolLoadingHTML",

package/dist/features/ssr/ssr.js

@@ -87,6 +87,29 @@ var ssr_default = (api) => {
       content: `
       import * as React from 'react';
 export { React };
+`
+    });
+    api.writeTmpFile({
+      noPluginDir: true,
+      path: "core/serverInsertedHTMLContext.ts",
+      content: `
+// Use React.createContext to avoid errors from the RSC checks because
+// it can't be imported directly in Server Components:
+import React from 'react'
+
+export type ServerInsertedHTMLHook = (callbacks: () => React.ReactNode) => void;
+// More info: https://github.com/vercel/next.js/pull/40686
+export const ServerInsertedHTMLContext =
+  React.createContext<ServerInsertedHTMLHook | null>(null as any);
+
+// copy form https://github.com/vercel/next.js/blob/fa076a3a69c9ccf63c9d1e53e7b681aa6dc23db7/packages/next/src/shared/lib/server-inserted-html.tsx#L13
+export function useServerInsertedHTML(callback: () => React.ReactNode): void {
+  const addInsertedServerHTMLCallback = React.useContext(ServerInsertedHTMLContext);
+  // Should have no effects on client where there's no flush effects provider
+  if (addInsertedServerHTMLCallback) {
+    addInsertedServerHTMLCallback(callback);
+  }
+}
 `
     });
   });

package/dist/features/tmpFiles/tmpFiles.js

@@ -564,6 +564,17 @@ if (process.env.NODE_ENV === 'development') {
           exports.push(`export { TestBrowser } from './testBrowser';`);
         }
       }
+      if (api.appData.framework === "react") {
+        if (api.config.ssr) {
+          exports.push(
+            `export { useServerInsertedHTML } from './core/serverInsertedHTMLContext';`
+          );
+        } else {
+          exports.push(
+            `export const useServerInsertedHTML: Function = () => {};`
+          );
+        }
+      }
       exports.push("// plugins");
       const allPlugins = (0, import_fs.readdirSync)(api.paths.absTmpPath).filter(
         (file) => file.startsWith("plugin-")

package/dist/index.js

@@ -43,6 +43,7 @@ var src_default = () => {
       require.resolve("./features/appData/appData"),
       require.resolve("./features/appData/umiInfo"),
       require.resolve("./features/check/check"),
+      require.resolve("./features/check/babel722"),
       require.resolve("./features/codeSplitting/codeSplitting"),
       require.resolve("./features/configPlugins/configPlugins"),
       require.resolve("./features/crossorigin/crossorigin"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.71",
+  "version": "4.0.73",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -37,21 +37,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/bundler-esbuild": "4.0.71",
-    "@umijs/bundler-utils": "4.0.71",
-    "@umijs/ast": "4.0.71",
-    "@umijs/bundler-vite": "4.0.71",
-    "@umijs/babel-preset-umi": "4.0.71",
-    "@umijs/bundler-webpack": "4.0.71",
-    "@umijs/core": "4.0.71",
+    "@umijs/ast": "4.0.73",
+    "@umijs/babel-preset-umi": "4.0.73",
+    "@umijs/bundler-esbuild": "4.0.73",
+    "@umijs/bundler-vite": "4.0.73",
+    "@umijs/bundler-utils": "4.0.73",
+    "@umijs/bundler-webpack": "4.0.73",
+    "@umijs/core": "4.0.73",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/mfsu": "4.0.71",
-    "@umijs/plugin-run": "4.0.71",
-    "@umijs/renderer-react": "4.0.71",
-    "@umijs/server": "4.0.71",
-    "@umijs/utils": "4.0.71",
-    "@umijs/zod2ts": "4.0.71",
-    "@umijs/ui": "3.0.1"
+    "@umijs/mfsu": "4.0.73",
+    "@umijs/plugin-run": "4.0.73",
+    "@umijs/server": "4.0.73",
+    "@umijs/renderer-react": "4.0.73",
+    "@umijs/ui": "3.0.1",
+    "@umijs/utils": "4.0.73",
+    "@umijs/zod2ts": "4.0.73"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",

package/templates/server.tpl

@@ -2,6 +2,7 @@ import { getClientRootComponent } from '{{{ serverRendererPath }}}';
 import { getRoutes } from './core/route';
 import { createHistory as createClientHistory } from './core/history';
 import { getPlugins as getClientPlugins } from './core/plugin';
+import { ServerInsertedHTMLContext } from './core/serverInsertedHTMLContext';
 import { PluginManager } from '{{{ umiPluginPath }}}';
 import createRequestHandler, { createMarkupGenerator } from '{{{ umiServerPath }}}';
 
@@ -50,6 +51,7 @@ const createOpts = {
   getClientRootComponent,
   helmetContext,
   createHistory,
+  ServerInsertedHTMLContext,
 };
 const requestHandler = createRequestHandler(createOpts);