ko 6.5.0 → 6.5.2

package/lib/actions/dev.js

@@ -7,13 +7,15 @@ const webpack_1 = __importDefault(require("webpack"));
 const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 const webpack_2 = __importDefault(require("../webpack"));
 const factory_1 = __importDefault(require("./factory"));
+const detect_port_1 = __importDefault(require("detect-port"));
+const inquirer_1 = __importDefault(require("inquirer"));
 class Dev extends factory_1.default {
     constructor(service) {
         super(service);
     }
     get devServerConfig() {
         const { serve, publicPath, logLevel } = this.service.config;
-        const { host, port, proxy, staticPath } = serve;
+        const { host, port, proxy, staticPath, historyApiFallback = false } = serve;
         return {
             port,
             host,
@@ -30,6 +32,7 @@ class Dev extends factory_1.default {
                 overlay: false,
                 logging: logLevel,
             },
+            historyApiFallback,
         };
     }
     async generateConfig() {
@@ -84,13 +87,39 @@ class Dev extends factory_1.default {
         });
         this.service.commander.bindAction(cmdName, this.action.bind(this));
     }
+    async changePort(newPort, port) {
+        const question = {
+            type: 'confirm',
+            name: 'changePort',
+            message: `port: ${port} has been used，use new port ${newPort} instead?`,
+            default: true,
+        };
+        const answer = await inquirer_1.default.prompt([question]);
+        if (answer.changePort) {
+            return newPort;
+        }
+        this.errorStdout(`so sorry, ${port} already in use！！`);
+        process.exit(0);
+    }
+    async checkPort(port) {
+        const newPort = await (0, detect_port_1.default)(port);
+        if (newPort === port) {
+            return newPort;
+        }
+        const isInteractive = process.stdout.isTTY;
+        if (isInteractive) {
+            return this.changePort(newPort, port);
+        }
+    }
     async action(cliOpts) {
         process.title = 'ko-dev';
         process.env.NODE_ENV = 'development';
         this.service.freezeCliOptsWith(cliOpts);
         const config = await this.generateConfig();
+        const port = config.devServer?.port;
+        const newPort = (await this.checkPort(port));
         const compiler = (0, webpack_1.default)(config);
-        const devServer = new webpack_dev_server_1.default(config.devServer, compiler);
+        const devServer = new webpack_dev_server_1.default({ ...config.devServer, port: newPort }, compiler);
         await devServer.start();
         const exitProcess = (callback) => () => {
             callback && callback();

package/lib/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --max_old_space_size=4096
 'use strict';
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };

package/lib/webpack/loaders/style.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
-const fs_1 = require("fs");
 const mini_css_extract_plugin_1 = require("mini-css-extract-plugin");
 const autoprefixer_1 = __importDefault(require("autoprefixer"));
 const postCssUrl = require('postcss-url');
@@ -46,7 +45,6 @@ class Style {
             enableCssModule && this.sassCssModuleConfig,
             {
                 test: /\.less$/,
-                exclude: [this.realAntdV4Path],
                 use: [
                     this.styleLoader,
                     this.cssLoader,
@@ -54,16 +52,6 @@ class Style {
                     this.lessLoader,
                 ],
             },
-            {
-                test: /\.less$/,
-                include: [this.realAntdV4Path],
-                use: [
-                    this.styleLoader,
-                    this.cssLoader,
-                    this.postCSSLoader,
-                    this.antdV4LessLoader,
-                ],
-            },
         ];
     }
     get sassCssModuleConfig() {
@@ -88,12 +76,6 @@ class Style {
             ],
         };
     }
-    //TODO: remove when upgrade to antd v4
-    get realAntdV4Path() {
-        const antdV4Path = (0, path_1.join)(this.opts.cwd, 'node_modules/antd-v4');
-        const ret = (0, fs_1.existsSync)(antdV4Path) ? (0, fs_1.realpathSync)(antdV4Path) : antdV4Path;
-        return ret;
-    }
     get styleLoader() {
         return {
             loader: this.opts.isProd ? mini_css_extract_plugin_1.loader : this.STYLE_LOADER,
@@ -125,16 +107,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,

package/lib/webpack/plugins.js

@@ -13,8 +13,9 @@ const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 const html_webpack_plugin_1 = __importDefault(require("html-webpack-plugin"));
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const auto_polyfills_webpack_plugin_1 = __importDefault(require("auto-polyfills-webpack-plugin"));
+const friendly_errors_webpack_plugin_1 = __importDefault(require("@nuxt/friendly-errors-webpack-plugin"));
 function getPlugins(opts) {
-    const { isProd, htmlTemplate, copy, analyzer, autoPolyfills } = opts;
+    const { isProd, htmlTemplate, copy, analyzer, autoPolyfills, serve: { host, port, compilationSuccessInfo }, } = opts;
     return [
         new webpack_1.IgnorePlugin({
             resourceRegExp: /^\.\/locale$/,
@@ -79,6 +80,13 @@ function getPlugins(opts) {
             overlay: false,
         }),
         analyzer && new webpack_bundle_analyzer_1.BundleAnalyzerPlugin(),
+        !isProd &&
+            new friendly_errors_webpack_plugin_1.default({
+                compilationSuccessInfo: compilationSuccessInfo ?? {
+                    messages: [`Your application is running at http://${host}:${port}`],
+                    notes: [],
+                },
+            }),
         isProd &&
             autoPolyfills &&
             (typeof autoPolyfills === 'boolean'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ko",
-  "version": "6.5.0",
+  "version": "6.5.2",
   "description": "build & lint library",
   "keywords": [
     "ko",
@@ -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",
@@ -35,6 +36,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": "^1.1.0",
@@ -51,9 +53,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": "^2.0.0",
     "esbuild-loader": "^2.19.0",
     "html-webpack-plugin": "^5.5.0",
+    "inquirer": "^8.2.2",
     "ko-lints": "^4.0.0",
     "less": "^3.13.1",
     "less-loader": "^9.1.0",
@@ -80,6 +84,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",