feat(okam): node 16 is needed when mako is enabled (#11643)

* feat(okam): node 16 is needed when mako is enabled * chore: update * ci: fix tsc
umijs · Sep 14, 2023 · 9110659 · 9110659
1 parent da47f19
commit 9110659
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 16 deletions.
diff --git a/packages/preset-umi/src/features/okam/okam.ts b/packages/preset-umi/src/features/okam/okam.ts
@@ -0,0 +1,12 @@
+import { checkVersion } from '@umijs/utils';
+import { IApi } from '../../types';
+
+export default (api: IApi) => {
+  api.onCheck(() => {
+    // mako 仅支持 node 16+
+    // ref: https://github.com/umijs/mako/issues/300
+    if (api.userConfig.mako) {
+      checkVersion(16, `Node 16 is required when using mako.`);
+    }
+  });
+};
diff --git a/packages/preset-umi/src/index.ts b/packages/preset-umi/src/index.ts
@@ -27,6 +27,7 @@ export default () => {
       require.resolve('./features/icons/icons'),
       require.resolve('./features/mock/mock'),
       require.resolve('./features/mpa/mpa'),
+      require.resolve('./features/okam/okam'),
       require.resolve('./features/overrides/overrides'),
       require.resolve('./features/phantomDependency/phantomDependency'),
       require.resolve('./features/polyfill/polyfill'),

diff --git a/packages/umi/src/cli/cli.ts b/packages/umi/src/cli/cli.ts
@@ -1,13 +1,16 @@
-import { logger, printHelp, setNoDeprecation, yParser } from '@umijs/utils';
-import { DEV_COMMAND, FRAMEWORK_NAME } from '../constants';
-import { Service } from '../service/service';
-import { dev } from './dev';
 import {
   catchUnhandledRejection,
   checkLocal,
   checkVersion as checkNodeVersion,
+  logger,
+  printHelp,
+  setNoDeprecation,
   setNodeTitle,
-} from './node';
+  yParser,
+} from '@umijs/utils';
+import { DEV_COMMAND, FRAMEWORK_NAME, MIN_NODE_VERSION } from '../constants';
+import { Service } from '../service/service';
+import { dev } from './dev';
 
 interface IOpts {
   presets?: string[];
@@ -16,9 +19,9 @@ interface IOpts {
 catchUnhandledRejection();
 
 export async function run(opts?: IOpts) {
-  checkNodeVersion();
+  checkNodeVersion(MIN_NODE_VERSION);
   checkLocal();
-  setNodeTitle();
+  setNodeTitle(FRAMEWORK_NAME);
   setNoDeprecation();
 
   const args = yParser(process.argv.slice(2), {

diff --git a/packages/umi/src/cli/forkedDev.ts b/packages/umi/src/cli/forkedDev.ts
@@ -1,7 +1,12 @@
-import { logger, printHelp, yParser, setNoDeprecation } from '@umijs/utils';
+import {
+  logger,
+  printHelp,
+  setNoDeprecation,
+  setNodeTitle,
+  yParser,
+} from '@umijs/utils';
 import { DEV_COMMAND, FRAMEWORK_NAME } from '../constants';
 import { Service } from '../service/service';
-import { setNodeTitle } from './node';
 setNodeTitle(`${FRAMEWORK_NAME}-dev`);
 setNoDeprecation();
 

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -45,6 +45,7 @@ export * from './isJavaScriptFile';
 export * from './isLocalDev';
 export * from './isMonorepo';
 export * from './isStyleFile';
+export * from './node';
 export * from './npmClient';
 export * from './randomColor/randomColor';
 export * from './readDirFiles';

diff --git a/packages/umi/src/cli/node.ts → packages/utils/src/node.ts b/packages/umi/src/cli/node.ts → packages/utils/src/node.ts
@@ -1,12 +1,12 @@
-import { isLocalDev, logger } from '@umijs/utils';
-import { FRAMEWORK_NAME, MIN_NODE_VERSION } from '../constants';
+import { isLocalDev, logger } from './';
 
 const ver = parseInt(process.version.slice(1));
 
-export function checkVersion() {
-  if (ver < MIN_NODE_VERSION || ver === 15 || ver === 17) {
+export function checkVersion(minVersion: number, message?: string) {
+  if (ver < minVersion || ver === 15 || ver === 17 || ver === 19) {
     logger.error(
-      `Your node version ${ver} is not supported, please upgrade to ${MIN_NODE_VERSION} or above except 15 or 17.`,
+      message ||
+        `Your node version ${ver} is not supported, please upgrade to ${minVersion} or above except 15 or 17.`,
     );
     process.exit(1);
   }
@@ -18,9 +18,9 @@ export function checkLocal() {
   }
 }
 
-export function setNodeTitle(name?: string) {
+export function setNodeTitle(name: string) {
   if (process.title === 'node') {
-    process.title = name || FRAMEWORK_NAME;
+    process.title = name;
   }
 }