ko 5.2.2 → 5.3.2

package/lib/actions/build.js

@@ -17,11 +17,12 @@ class Build extends creator_1.WebpackCreator {
             optimization: {
                 minimizer: [
                     !esbuild && new CssMinimizerPlugin(),
-                    esbuild && new esbuild_loader_1.ESBuildMinifyPlugin({
-                        target: 'es2015',
-                        css: true
-                    })
-                ].filter(Boolean)
+                    esbuild &&
+                        new esbuild_loader_1.ESBuildMinifyPlugin({
+                            target: 'es2015',
+                            css: true,
+                        }),
+                ].filter(Boolean),
             },
             plugins: [
                 new webpack_1.default.optimize.SplitChunksPlugin({
@@ -50,8 +51,8 @@ class Build extends creator_1.WebpackCreator {
                             reuseExistingChunk: true,
                         },
                     },
-                })
-            ]
+                }),
+            ],
         };
         return this.mergeConfig([this.baseConfig, conf]);
     }
@@ -61,7 +62,7 @@ class Build extends creator_1.WebpackCreator {
             if (stats && stats.hasErrors()) {
                 throw stats.toString({
                     logging: 'warn',
-                    colors: true
+                    colors: true,
                 });
             }
             if (error) {

package/lib/actions/dev.js

@@ -20,29 +20,25 @@ class Dev extends creator_1.WebpackCreator {
         const defaultDevServerConfig = {
             port,
             host,
-            contentBase: config_1.default.defaultPaths.dist,
             historyApiFallback: true,
-            disableHostCheck: true,
-            compress: true,
-            clientLogLevel: 'none',
+            allowedHosts: 'all',
             hot: true,
-            inline: true,
-            publicPath: '/',
-            watchOptions: {
-                ignored: /node_modules/,
-                aggregateTimeout: 600,
+            static: {
+                directory: config_1.default.defaultPaths.dist,
+                publicPath: '/',
+                watch: true,
             },
-            open: true
+            client: {
+                overlay: false,
+            },
+            setupExitSignals: true,
         };
         return { ...defaultDevServerConfig, ...userDefinedDevServerConfig };
     }
     config() {
         const conf = {
             devtool: 'cheap-module-source-map',
-            plugins: [
-                new webpack_1.default.HotModuleReplacementPlugin(),
-                this.opts.analyzer && new BundleAnalyzerPlugin()
-            ].filter(Boolean),
+            plugins: [this.opts.analyzer && new BundleAnalyzerPlugin()].filter(Boolean),
         };
         return this.mergeConfig([this.baseConfig, conf]);
     }
@@ -71,39 +67,20 @@ class Dev extends creator_1.WebpackCreator {
             return this.changePort(newPort, port);
         }
     }
-    getUrlHost(host) {
-        const regex = /^https?:\/\/(([a-zA-Z0-9_-])+(\.)?)*$/i;
-        return regex.test(host) ? host : `http://${host}`;
-    }
     async action() {
-        const { port, host } = this.devSerConf();
+        const devSerConf = this.devSerConf();
+        const { port } = devSerConf;
         const newPort = await this.checkPort(parseInt(port));
-        if (!newPort)
-            return;
-        webpack_dev_server_1.default.addDevServerEntrypoints(this.config(), this.devSerConf());
+        if (!newPort) {
+            process.exit(0);
+        }
+        devSerConf.port = newPort;
         const compiler = (0, webpack_1.default)(this.config());
-        const devServer = new webpack_dev_server_1.default(compiler, this.devSerConf());
-        let isFirstCompile = true;
-        compiler.hooks.done.tap('done', (stats) => {
-            if (isFirstCompile) {
-                isFirstCompile = false;
-                this.successStdout('development server has been started');
-                console.log(`server starts at: ${this.linkStdout(this.getUrlHost(host) + ':' + port)}`);
-            }
-            if (stats.hasErrors()) {
-                console.log(stats.toString({
-                    colors: true
-                }));
-            }
-        });
-        compiler.hooks.invalid.tap('invalid', () => {
-            console.log('Compiling...');
-        });
-        devServer.listen(port, host, (err) => {
-            if (err) {
-                console.error(err);
-                process.exit(500);
-            }
+        const devServer = new webpack_dev_server_1.default(devSerConf, compiler);
+        await devServer.start();
+        process.stdin.on('end', () => {
+            devServer.stop();
+            process.exit(0);
         });
     }
 }

package/lib/cli.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
-const ko_lints_1 = __importDefault(require("ko-lints"));
 const build_1 = __importDefault(require("./actions/build"));
 const dev_1 = __importDefault(require("./actions/dev"));
 const program = new commander_1.Command();
@@ -21,6 +20,7 @@ program
     .option('-t,--ts,--typescript', 'support typescript')
     .option('-e,--esbuild', 'enable esbuild')
     .action((opts) => {
+    process.env.NODE_ENV = 'production';
     const buildInstance = new build_1.default(opts);
     buildInstance.action();
 });
@@ -36,6 +36,4 @@ program
     const devInstance = new dev_1.default(opts);
     devInstance.action();
 });
-//attach lint features to program
-(0, ko_lints_1.default)(program);
 program.parse();

package/lib/utils/config.js

@@ -4,22 +4,23 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 class Config {
     constructor() {
+        this.babelPlugins = [];
         this.cwd = process.cwd();
     }
     static getInstance() {
         if (!Config.instance) {
-            Config.instance = new Config();
+            Config.instance = Object.freeze(new Config());
         }
         return Config.instance;
     }
     getFileRealPath(path) {
         return (0, path_1.isAbsolute)(path) ? path : (0, path_1.resolve)(this.cwd, path);
     }
-    //TODO: define userConf
     get userConf() {
         const userConfPath = this.getFileRealPath('ko.config.js');
         if ((0, fs_1.existsSync)(userConfPath)) {
-            return userConfPath ? require(userConfPath) : {};
+            const userConf = require(userConfPath);
+            return userConf;
         }
         else {
             throw new Error('user config file not exist, please check it!');
@@ -31,7 +32,7 @@ class Config {
             dist: this.getFileRealPath('dist'),
             public: this.getFileRealPath('public'),
             html: this.getFileRealPath('public/index.html'),
-            tsconfig: this.getFileRealPath('tsconfig.json')
+            tsconfig: this.getFileRealPath('tsconfig.json'),
         };
     }
     get isProductionEnv() {

package/lib/utils/config.test.js

@@ -24,7 +24,7 @@ describe('config instance', () => {
             dist: cwd + '/dist',
             public: cwd + '/public',
             html: cwd + '/public/index.html',
-            tsconfig: cwd + '/tsconfig.json'
+            tsconfig: cwd + '/tsconfig.json',
         });
     });
 });

package/lib/webpack/index.js

@@ -20,7 +20,7 @@ const extensions = [
     '.html',
 ];
 function getWebpackBaseConf(opts) {
-    const { ts, hash } = opts;
+    const { ts = true, hash } = opts;
     const webpackBaseConf = {
         mode: config_1.default.isProductionEnv ? 'production' : 'development',
         target: 'web',
@@ -32,23 +32,24 @@ function getWebpackBaseConf(opts) {
             publicPath: '/',
         },
         module: {
-            rules: (0, loaders_1.default)(opts),
+            rules: loaders_1.default,
         },
-        plugins: (0, plugins_1.default)(opts),
+        plugins: (0, plugins_1.default)(),
         resolve: {
             extensions,
             plugins: [
-                ts && new tsconfig_paths_webpack_plugin_1.default({
-                    configFile: config_1.default.defaultPaths.tsconfig
-                })
-            ].filter(Boolean)
+                ts &&
+                    new tsconfig_paths_webpack_plugin_1.default({
+                        configFile: config_1.default.defaultPaths.tsconfig,
+                    }),
+            ].filter(Boolean),
         },
         performance: {
             hints: false,
         },
         cache: {
             type: 'filesystem',
-        }
+        },
     };
     return webpackBaseConf;
 }

package/lib/webpack/loaders/index.js

@@ -6,7 +6,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const style_1 = __importDefault(require("./style"));
 const asset_1 = __importDefault(require("./asset"));
 const script_1 = __importDefault(require("./script"));
-function getLoaders(opts) {
-    return [...style_1.default, ...asset_1.default, ...(0, script_1.default)(opts.ts)];
-}
-exports.default = getLoaders;
+const loaders = [...style_1.default, ...asset_1.default, ...script_1.default];
+exports.default = loaders;

package/lib/webpack/loaders/script.js

@@ -7,53 +7,45 @@ const getCacheIdentifier_1 = __importDefault(require("react-dev-utils/getCacheId
 const config_1 = __importDefault(require("../../utils/config"));
 const THREAD_LOADER = require.resolve('thread-loader');
 const BABEL_LOADER = require.resolve('babel-loader');
-function getScriptLoaders(supportTypescript) {
-    let scriptLoader = [
-        {
-            test: /\.jsx?$/,
-            include: config_1.default.defaultPaths.src,
-            use: [
-                THREAD_LOADER,
-                {
-                    loader: BABEL_LOADER,
-                    options: {
-                        presets: [
-                            [
-                                require.resolve('babel-preset-ko-app'),
-                                {
-                                    useAbsoluteRuntime: true,
-                                },
-                            ],
-                        ],
-                        babelrc: false,
-                        configFile: false,
-                        cacheIdentifier: (0, getCacheIdentifier_1.default)(config_1.default.isProductionEnv ? 'production' : '', ['babel-preset-ko-app', 'react-dev-utils', 'ko']),
-                        cacheDirectory: true,
-                        cacheCompression: false,
-                        compact: config_1.default.isProductionEnv,
-                    },
-                },
-            ],
+const scriptLoader = [
+    {
+        test: /\.worker.[jt]s$/,
+        loader: 'worker-loader',
+        options: {
+            inline: 'fallback',
         },
-    ];
-    if (supportTypescript) {
-        const TS_LOADER = require.resolve('ts-loader');
-        const typescriptLoader = {
-            test: /\.tsx?$/,
-            use: [
-                THREAD_LOADER,
-                {
-                    loader: TS_LOADER,
-                    options: {
-                        transpileOnly: true,
-                        happyPackMode: true,
-                        allowTsInNodeModules: true
-                    },
+    },
+    {
+        test: /\.(t|j)sx?$/,
+        exclude: {
+            and: [/node_modules/],
+            not: [/dt-common/],
+        },
+        use: [
+            THREAD_LOADER,
+            {
+                loader: BABEL_LOADER,
+                options: {
+                    presets: [
+                        [
+                            require.resolve('babel-preset-ko-app'),
+                            {
+                                useAbsoluteRuntime: true,
+                            },
+                        ],
+                    ],
+                    plugins: config_1.default.isProductionEnv
+                        ? [require.resolve('react-refresh/babel')]
+                        : [],
+                    babelrc: false,
+                    configFile: false,
+                    cacheIdentifier: (0, getCacheIdentifier_1.default)(config_1.default.isProductionEnv ? 'production' : '', ['babel-preset-ko-app', 'react-dev-utils', 'ko']),
+                    cacheDirectory: true,
+                    cacheCompression: false,
+                    compact: config_1.default.isProductionEnv,
                 },
-            ],
-        };
-        scriptLoader.push(typescriptLoader);
-    }
-    return scriptLoader;
-}
-exports.default = getScriptLoaders;
+            },
+        ],
+    },
+];
+exports.default = scriptLoader;

package/lib/webpack/loaders/style.js

@@ -10,7 +10,7 @@ const LESS_LOADER = require.resolve('less-loader');
 const SASS_LOADER = require.resolve('sass-loader');
 const POSTCSS_LOADER = require.resolve('postcss-loader');
 const styleLoader = {
-    loader: mini_css_extract_plugin_1.loader
+    loader: mini_css_extract_plugin_1.loader,
 };
 const cssLoader = {
     loader: CSS_LOADER,
@@ -31,11 +31,7 @@ const postcssLoader = {
 const styleLoaders = [
     {
         test: /\.css$/,
-        use: [
-            styleLoader,
-            cssLoader,
-            postcssLoader,
-        ],
+        use: [styleLoader, cssLoader, postcssLoader],
     },
     {
         test: /\.s[ac]ss$/,

package/lib/webpack/plugins.js

@@ -6,45 +6,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const webpack_1 = require("webpack");
 const case_sensitive_paths_webpack_plugin_1 = __importDefault(require("case-sensitive-paths-webpack-plugin"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
-const html_webpack_plugin_1 = __importDefault(require("html-webpack-plugin"));
+const react_refresh_webpack_plugin_1 = __importDefault(require("@pmmmwh/react-refresh-webpack-plugin"));
+const webpackbar_1 = __importDefault(require("webpackbar"));
 const config_1 = __importDefault(require("../utils/config"));
-function getPlugins(opts) {
-    const { ts } = opts;
-    const { userConf, defaultPaths } = config_1.default;
-    const publicPath = (userConf.output && userConf.output.publicPath) ? userConf.output.publicPath : '/';
+function getPlugins() {
+    const { userConf } = config_1.default;
     let plugins = [
         new webpack_1.IgnorePlugin({
             resourceRegExp: /^\.\/locale$/,
             contextRegExp: /moment$/,
         }),
-        new webpack_1.ProgressPlugin(),
         //TODO: check if mini-css-extract-plugin should use base name if enable HMR
         new mini_css_extract_plugin_1.default({
             filename: 'css/[name].[contenthash].css',
             chunkFilename: 'css/[id].[contenthash].css',
         }),
         new case_sensitive_paths_webpack_plugin_1.default(),
-        new html_webpack_plugin_1.default({
-            template: defaultPaths.html,
-            title: 'Ko App',
-            templateParameters: {
-                configPath: `${publicPath}config/config.js`
-            },
-            inject: 'body'
-        }),
+        new react_refresh_webpack_plugin_1.default(),
+        new webpackbar_1.default(),
     ];
-    if (ts) {
-        const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-        const typescriptPlugins = [
-            new ForkTsCheckerWebpackPlugin({
-                async: false,
-                typescript: {
-                    configFile: defaultPaths.tsconfig,
-                },
-            }),
-        ];
-        plugins = plugins.concat(typescriptPlugins);
-    }
     plugins = plugins.concat(userConf.plugins || []);
     if (config_1.default.isProductionEnv) {
         const { CleanWebpackPlugin } = require('clean-webpack-plugin');
@@ -52,7 +32,7 @@ function getPlugins(opts) {
             new CleanWebpackPlugin({
                 verbose: false,
                 dry: false,
-            })
+            }),
         ];
         plugins.concat(prodPlugins);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ko",
-  "version": "5.2.2",
+  "version": "5.3.2",
   "description": "build & lint library",
   "keywords": [
     "ko",
@@ -34,58 +34,57 @@
     "scripts/*",
     "lib/*"
   ],
-  "scripts": {
-    "prepublishOnly": "rm -rf lib && tsc",
-    "preinstall": "node scripts/preinstall.js",
-    "debug": "tsc -w --sourceMap",
-    "test": "jest",
-    "build": "tsc"
-  },
   "dependencies": {
-    "autoprefixer": "^10.2.6",
-    "babel-loader": "^8.2.2",
-    "babel-preset-ko-app": "^1.0.0-alpha.1",
+    "@babel/core": "^7.17.5",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
+    "autoprefixer": "^10.4.2",
+    "babel-loader": "^8.2.3",
+    "babel-preset-ko-app": "^1.0.0",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "chalk": "^4.1.2",
-    "clean-webpack-plugin": "3.0.0",
-    "commander": "^8.1.0",
-    "css-loader": "^5.2.6",
-    "css-minimizer-webpack-plugin": "^3.0.1",
+    "clean-webpack-plugin": "4.0.0",
+    "commander": "^9.0.0",
+    "css-loader": "^6.6.0",
+    "css-minimizer-webpack-plugin": "^3.4.1",
     "detect-port": "^1.3.0",
-    "esbuild-loader": "^2.16.0",
-    "fork-ts-checker-webpack-plugin": "^6.2.10",
-    "html-webpack-plugin": "^5.3.1",
-    "inquirer": "^8.1.2",
-    "ko-lints": "^1.0.0",
+    "esbuild-loader": "^2.18.0",
+    "inquirer": "^8.2.0",
     "less": "^3.13.1",
-    "less-loader": "^9.0.0",
-    "mini-css-extract-plugin": "^1.6.0",
-    "postcss": "^8.3.0",
-    "postcss-loader": "^5.3.0",
-    "react-dev-utils": "^11.0.4",
-    "sass": "^1.34.0",
-    "sass-loader": "^11.1.1",
+    "less-loader": "^9.1.0",
+    "mini-css-extract-plugin": "^2.5.3",
+    "postcss": "^8.4.7",
+    "postcss-loader": "^6.2.1",
+    "react-dev-utils": "^12.0.0",
+    "react-refresh": "^0.11.0",
+    "sass": "^1.49.9",
+    "sass-loader": "^12.6.0",
     "thread-loader": "^3.0.4",
-    "ts-loader": "^9.2.2",
-    "tsconfig-paths-webpack-plugin": "^3.5.1",
-    "webpack": "^5.50.0",
-    "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-dev-server": "^3.11.2",
-    "webpack-merge": "^5.8.0"
+    "tsconfig-paths-webpack-plugin": "^3.5.2",
+    "webpack": "^5.69.1",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-dev-server": "^4.7.4",
+    "webpack-merge": "^5.8.0",
+    "webpackbar": "^5.0.2",
+    "worker-loader": "^3.0.8"
   },
   "devDependencies": {
     "@types/case-sensitive-paths-webpack-plugin": "^2.1.6",
-    "@types/detect-port": "^1.3.1",
-    "@types/inquirer": "^7.3.3",
-    "@types/jest": "^27.0.2",
-    "@types/mini-css-extract-plugin": "^2.2.0",
-    "@types/react-dev-utils": "^9.0.7",
-    "jest": "^27.2.5",
-    "ts-jest": "^27.0.5",
-    "typescript": "^4.4.4"
+    "@types/detect-port": "^1.3.2",
+    "@types/inquirer": "^8.2.0",
+    "@types/jest": "^27.4.1",
+    "@types/react-dev-utils": "^9.0.10",
+    "jest": "^27.5.1",
+    "ts-jest": "^27.1.3",
+    "typescript": "^4.6.2"
   },
   "engines": {
     "node": ">=10.13.0"
   },
-  "gitHead": "3ce5dfb8cb7b50b758ebe6fa0ebfba7a89667a07"
-}
+  "scripts": {
+    "preinstall": "node scripts/preinstall.js",
+    "debug": "tsc -w --sourceMap",
+    "test": "jest",
+    "build": "tsc"
+  },
+  "readme": "# ko\n\nbuild & lint library\n"
+}

package/scripts/preinstall.js

@@ -16,7 +16,7 @@ if (LOCK_NODE_VERSION) {
    *  webpack minor support version
    *  @link https://webpack.js.org/migrate/5/#preparations
    */
-  const webpack5SupportLeastVersion = 10.13; 
+  const webpack5SupportLeastVersion = 10.13;
 
   if (majorAndMinorNodeVersion < webpack5SupportLeastVersion) {
     console.error(
@@ -49,4 +49,4 @@ if (FORCE_YARN_INSTALL) {
   }
 }
 
-err && process.exit(1);
+err && process.exit(1);