Merge pull request #129 from DTStack/feat_6.5.2

LuckyFBB · web-flow · commit 86679e8816ba · 2023-04-21T15:25:12.000+08:00
Feat 6.5.2
diff --git a/.changeset/giant-moons-beam.md b/.changeset/giant-moons-beam.md
@@ -0,0 +1,5 @@
+---
+'ko': patch
+---
+
+optimize devServer complation log and add dev log config
diff --git a/.changeset/long-jobs-grow.md b/.changeset/long-jobs-grow.md
@@ -0,0 +1,5 @@
+---
+'ko': patch
+---
+
+add port select when port used
diff --git a/.changeset/moody-dolphins-search.md b/.changeset/moody-dolphins-search.md
@@ -0,0 +1,5 @@
+---
+'ko': patch
+---
+
+add --max_old_space_size
diff --git a/.changeset/witty-items-relate.md b/.changeset/witty-items-relate.md
@@ -0,0 +1,5 @@
+---
+'ko': patch
+---
+
+remove antd4Options when antd upgrade to 4+
diff --git a/package.json b/package.json
@@ -24,15 +24,15 @@
     }
   },
   "devDependencies": {
-    "@changesets/cli": "^2.22.0",
-    "@commitlint/cli": "^17.0.0",
-    "@commitlint/config-conventional": "^17.0.0",
+    "@changesets/cli": "^2.26.0",
+    "@commitlint/cli": "^17.4.4",
+    "@commitlint/config-conventional": "^17.4.4",
     "@tsconfig/node14": "^1.0.3",
-    "@types/node": "^17.0.35",
-    "commitizen": "^4.2.4",
+    "@types/node": "^17.0.45",
+    "commitizen": "^4.3.0",
     "cz-conventional-changelog": "^3.3.0",
-    "husky": "^8.0.1",
-    "prettier": "^2.6.2"
+    "husky": "^8.0.3",
+    "prettier": "^2.8.4"
   },
   "packageManager": "pnpm@6.32.12"
 }
diff --git a/packages/ko/index.d.ts b/packages/ko/index.d.ts
@@ -0,0 +1 @@
+declare module '@nuxt/friendly-errors-webpack-plugin';
diff --git a/packages/ko/package.json b/packages/ko/package.json
@@ -20,6 +20,7 @@
   "bugs": {
     "url": "https://github.com/DTStack/ko/issues"
   },
+  "typings": "index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/DTStack/ko",
@@ -41,6 +42,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.18.0",
+    "@nuxt/friendly-errors-webpack-plugin": "^2.5.2",
     "@parcel/css": "^1.12.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "auto-polyfills-webpack-plugin": "workspace:^1.1.0",
@@ -57,9 +59,11 @@
     "crypto-browserify": "^3.12.0",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.0.0",
+    "detect-port": "^1.3.0",
     "dynamic-resolve-webpack-plugin": "workspace:^2.0.0",
     "esbuild-loader": "^2.19.0",
     "html-webpack-plugin": "^5.5.0",
+    "inquirer": "^8.2.2",
     "ko-lints": "workspace:^4.0.0",
     "less": "^3.13.1",
     "less-loader": "^9.1.0",
@@ -86,6 +90,8 @@
   },
   "devDependencies": {
     "@types/case-sensitive-paths-webpack-plugin": "^2.1.6",
+    "@types/detect-port": "^1.3.2",
+    "@types/inquirer": "^8.2.2",
     "@types/jest": "^27.5.1",
     "@types/lodash": "^4.14.182",
     "@types/webpack-bundle-analyzer": "^4.4.1",
diff --git a/packages/ko/src/actions/dev.ts b/packages/ko/src/actions/dev.ts
@@ -6,6 +6,8 @@ import Service from '../core/service';
 import WebpackConfig from '../webpack';
 import ActionFactory from './factory';
 import { ICliOptions } from '../types';
+import detect from 'detect-port';
+import inquirer from 'inquirer';
 
 class Dev extends ActionFactory {
   private webpackConfig: WebpackConfig;
@@ -92,13 +94,44 @@ class Dev extends ActionFactory {
     this.service.commander.bindAction(cmdName, this.action.bind(this));
   }
 
+  private async changePort(newPort: number, port: number) {
+    const question = {
+      type: 'confirm',
+      name: 'changePort',
+      message: `port: ${port} has been used，use new port ${newPort} instead?`,
+      default: true,
+    };
+    const answer = await inquirer.prompt([question]);
+    if (answer.changePort) {
+      return newPort;
+    }
+    this.errorStdout(`so sorry, ${port} already in use！！`);
+    process.exit(0);
+  }
+
+  private async checkPort(port: number) {
+    const newPort = await detect(port);
+    if (newPort === port) {
+      return newPort;
+    }
+    const isInteractive = process.stdout.isTTY;
+    if (isInteractive) {
+      return this.changePort(newPort, port);
+    }
+  }
+
   protected async action(cliOpts: ICliOptions) {
     process.title = 'ko-dev';
     process.env.NODE_ENV = 'development';
     this.service.freezeCliOptsWith(cliOpts);
     const config = await this.generateConfig();
+    const port = config.devServer?.port as number;
+    const newPort = (await this.checkPort(port)) as number;
     const compiler = Webpack(config);
-    const devServer = new WebpackDevServer(config.devServer, compiler);
+    const devServer = new WebpackDevServer(
+      { ...config.devServer, port: newPort },
+      compiler
+    );
     await devServer.start();
     const exitProcess = (callback?: () => void) => () => {
       callback && callback();
diff --git a/packages/ko/src/cli.ts b/packages/ko/src/cli.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --max_old_space_size=4096
 'use strict';
 import Service from './core/service';
 import Dev from './actions/dev';
diff --git a/packages/ko/src/types.ts b/packages/ko/src/types.ts
@@ -19,7 +19,6 @@ export type IOptions = {
   analyzer?: boolean;
   extraPostCSSPlugins?: Plugin[];
   lessOptions?: any;
-  antdV4LessOptions?: any;
   // integrated plugins options
   dynamicResolve?: <T extends any>(request: T) => T;
   autoPolyfills: boolean | AutoPolyfillsWebpackPluginOptions;
@@ -30,6 +29,7 @@ export type IOptions = {
     port: number;
     staticPath?: string;
     historyApiFallback?: any;
+    compilationSuccessInfo?: { messages: string[]; notes?: string[] };
   };
   // experimental features
   experiment?: {
diff --git a/packages/ko/src/webpack/loaders/style.ts b/packages/ko/src/webpack/loaders/style.ts
@@ -44,24 +44,13 @@ class Style {
       enableCssModule && this.sassCssModuleConfig,
       {
         test: /\.less$/,
-        exclude: [this.realAntdV4Path],
         use: [
           this.styleLoader,
           this.cssLoader,
           this.postCSSLoader,
           this.lessLoader,
         ],
       },
-      {
-        test: /\.less$/,
-        include: [this.realAntdV4Path],
-        use: [
-          this.styleLoader,
-          this.cssLoader,
-          this.postCSSLoader,
-          this.antdV4LessLoader,
-        ],
-      },
     ];
   }
 
@@ -88,13 +77,6 @@ class Style {
     };
   }
 
-  //TODO: remove when upgrade to antd v4
-  get realAntdV4Path() {
-    const antdV4Path = join(this.opts.cwd, 'node_modules/antd-v4');
-    const ret = existsSync(antdV4Path) ? realpathSync(antdV4Path) : antdV4Path;
-    return ret;
-  }
-
   get styleLoader() {
     return {
       loader: this.opts.isProd ? MiniCssExtractPluginLoader : this.STYLE_LOADER,
@@ -130,17 +112,6 @@ class Style {
     };
   }
 
-  get antdV4LessLoader() {
-    const { antdV4LessOptions = {} } = this.opts;
-    return {
-      loader: this.LESS_LOADER,
-      options: {
-        sourceMap: true,
-        lessOptions: antdV4LessOptions,
-      },
-    };
-  }
-
   get postCSSLoader() {
     return {
       loader: this.POSTCSS_LOADER,
diff --git a/packages/ko/src/webpack/plugins.ts b/packages/ko/src/webpack/plugins.ts
@@ -8,10 +8,18 @@ import CopyWebpackPlugin from 'copy-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import AutoPolyfillsWebpackPlugin from 'auto-polyfills-webpack-plugin';
+import FriendlyErrorsWebpackPlugin from '@nuxt/friendly-errors-webpack-plugin';
 import { IWebpackOptions } from '../types';
 
 function getPlugins(opts: IWebpackOptions) {
-  const { isProd, htmlTemplate, copy, analyzer, autoPolyfills } = opts;
+  const {
+    isProd,
+    htmlTemplate,
+    copy,
+    analyzer,
+    autoPolyfills,
+    serve: { host, port, compilationSuccessInfo },
+  } = opts;
   return [
     new IgnorePlugin({
       resourceRegExp: /^\.\/locale$/,
@@ -78,6 +86,13 @@ function getPlugins(opts: IWebpackOptions) {
       overlay: false,
     }),
     analyzer && new BundleAnalyzerPlugin(),
+    !isProd &&
+      new FriendlyErrorsWebpackPlugin({
+        compilationSuccessInfo: compilationSuccessInfo ?? {
+          messages: [`Your application is running at http://${host}:${port}`],
+          notes: [],
+        },
+      }),
     isProd &&
       autoPolyfills &&
       (typeof autoPolyfills === 'boolean'
diff --git a/packages/ko/tsconfig.json b/packages/ko/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "@tsconfig/node14/tsconfig.json",
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "index.d.ts"],
   "exclude": ["src/**/*.test.ts"],
   "compilerOptions": {
     "allowJs": true,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/website/docs/configuration.md b/website/docs/configuration.md

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'ko': patch
 +---
++
 +optimize devServer complation log and add dev log config
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+declare module '@nuxt/friendly-errors-webpack-plugin';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env node`
	`1`	`+#!/usr/bin/env node --max_old_space_size=4096`
`2`	`2`	`'use strict';`
`3`	`3`	`import Service from './core/service';`
`4`	`4`	`import Dev from './actions/dev';`