ko 5.3.5 → 5.3.8

package/lib/actions/build.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const webpack_1 = __importDefault(require("webpack"));
-const esbuild_loader_1 = require("esbuild-loader");
 const creator_1 = require("./creator");
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 class Build extends creator_1.WebpackCreator {
@@ -12,28 +11,31 @@ class Build extends creator_1.WebpackCreator {
         super(opts);
     }
     config() {
-        const { esbuild } = this.opts;
+        // const { esbuild } = this.opts;
         const conf = {
             optimization: {
-                minimizer: [
-                    !esbuild && new CssMinimizerPlugin(),
-                    esbuild &&
-                        new esbuild_loader_1.ESBuildMinifyPlugin({
-                            target: 'es2015',
-                            css: true,
-                        }),
-                ].filter(Boolean),
+                minimize: true,
+                minimizer: ['...', new CssMinimizerPlugin()],
             },
             plugins: [
                 new webpack_1.default.optimize.SplitChunksPlugin({
-                    chunks: 'async',
+                    chunks: 'all',
                     minSize: 30000,
                     maxSize: 600000,
                     minChunks: 1,
-                    maxAsyncRequests: 5,
-                    maxInitialRequests: 3,
                     automaticNameDelimiter: '_',
                     cacheGroups: {
+                        baseCommon: {
+                            test: new RegExp(`[\\/]node_modules[\\/](${[
+                                'react',
+                                'react-router',
+                                'react-dom',
+                                'react-redux',
+                                'redux',
+                                'react-router-redux',
+                            ].join('|')})`),
+                            priority: 1,
+                        },
                         antd: {
                             name: 'antd',
                             test: /[\\/]node_modules[\\/]antd[\\/]/,

package/lib/webpack/loaders/script.js

@@ -7,19 +7,28 @@ 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');
+const WORKER_LOADER = require.resolve('worker-loader');
 const scriptLoader = [
     {
         test: /\.worker.[jt]s$/,
-        loader: 'worker-loader',
+        loader: WORKER_LOADER,
         options: {
             inline: 'fallback',
         },
     },
     {
         test: /\.(t|j)sx?$/,
-        exclude: {
-            and: [/node_modules/],
-            not: [/dt-common/],
+        include: (input) => {
+            // internal modules dt-common compatible
+            if (input.includes('node_modules/dt-common/src/')) {
+                return true;
+            }
+            else if (input.includes('node_modules')) {
+                return false;
+            }
+            else {
+                return true;
+            }
         },
         use: [
             {

package/lib/webpack/loaders/style.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
 const mini_css_extract_plugin_1 = require("mini-css-extract-plugin");
 const autoprefixer_1 = __importDefault(require("autoprefixer"));
 const CSS_LOADER = require.resolve('css-loader');
@@ -49,6 +50,7 @@ const styleLoaders = [
     },
     {
         test: /\.less$/,
+        exclude: [path_1.default.join(process.cwd(), 'node_modules/antd-v4')],
         use: [
             styleLoader,
             cssLoader,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ko",
-  "version": "5.3.5",
+  "version": "5.3.8",
   "description": "build & lint library",
   "keywords": [
     "ko",
@@ -86,7 +86,6 @@
     "node": ">=10.13.0"
   },
   "scripts": {
-    "preinstall": "node scripts/preinstall.js",
     "debug": "tsc -w --sourceMap",
     "test": "jest",
     "build": "tsc"

package/lib/utils/config.test.js

@@ -1,30 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = __importDefault(require("./config"));
-console.log(typeof config_1.default.getFileRealPath);
-describe('config instance', () => {
-    it('getFileRealPath should return absolute path', () => {
-        const absolutePath = '/foo/bar';
-        expect(config_1.default.getFileRealPath(absolutePath)).toBe(absolutePath);
-        const relativePath = 'ko.config.js';
-        expect(config_1.default.getFileRealPath(relativePath)).toBe(process.cwd() + '/' + relativePath);
-    });
-    it('userConf should throw', () => {
-        expect(() => {
-            config_1.default.userConf;
-        }).toThrow();
-    });
-    it('defaultPaths should ', () => {
-        const cwd = process.cwd();
-        expect(config_1.default.defaultPaths).toEqual({
-            src: cwd + '/src',
-            dist: cwd + '/dist',
-            public: cwd + '/public',
-            html: cwd + '/public/index.html',
-            tsconfig: cwd + '/tsconfig.json',
-        });
-    });
-});

package/scripts/preinstall.js

@@ -1,52 +0,0 @@
-/* eslint-disable no-octal-escape */
-/**
- * @link https://github.com/DTStack/devops/blob/main/force-using-yarn-and-lock-version/preinstall.js
- */
-let err = false;
-
-const LOCK_NODE_VERSION = true;
-const LOCK_YARN_VERSION = false;
-const FORCE_YARN_INSTALL = false;
-
-if (LOCK_NODE_VERSION) {
-  const majorAndMinorNodeVersion = Number(
-    /(\d+).(\d+)/.exec(process.versions.node)[0]
-  );
-  /**
-   *  webpack minor support version
-   *  @link https://webpack.js.org/migrate/5/#preparations
-   */
-  const webpack5SupportLeastVersion = 10.13;
-
-  if (majorAndMinorNodeVersion < webpack5SupportLeastVersion) {
-    console.error(
-      '\033[1;31m*** Webpack 5 requires at least Node.js 10.13.0 (LTS), please make sure you upgrade your Node.js.\033[0;0m'
-    );
-    err = true;
-  }
-}
-
-if (LOCK_YARN_VERSION) {
-  const cp = require('child_process');
-  const yarnVersion = cp.execSync('yarn -v', { encoding: 'utf8' }).trim();
-  const parsedYarnVersion = /^(\d+)\.(\d+)\./.exec(yarnVersion);
-  const majorYarnVersion = parseInt(parsedYarnVersion[1]);
-  const minorYarnVersion = parseInt(parsedYarnVersion[2]);
-
-  if (majorYarnVersion < 1 || minorYarnVersion < 10) {
-    console.error('\033[1;31m*** Please use yarn >=1.10.1.\033[0;0m');
-    err = true;
-  }
-}
-
-if (FORCE_YARN_INSTALL) {
-  // eslint-disable-next-line dot-notation
-  if (!/yarn[\w-.]*\.js$|yarnpkg$/.test(process.env['npm_execpath'])) {
-    console.error(
-      '\033[1;31m*** Please use yarn to install dependencies.\033[0;0m'
-    );
-    err = true;
-  }
-}
-
-err && process.exit(1);