arui-scripts 13.0.1-feat-speadup.1 → 13.1.0

package/CHANGELOG.md

@@ -1,9 +1,16 @@
-## [13.0.1-feat-speadup.1](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.0.0...v13.0.1-feat-speadup.1) (2022-08-03)
+# [13.1.0](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.0.0...v13.1.0) (2022-08-05)
 
 
-### Performance Improvements
+### Features
+
+* add yarn 2 support ([5d4bb8c](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/5d4bb8c5e4debb3d0db430c094effbedd9b7bcc3))
+
+# [13.1.0-feature-yarn2.1](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.0.0...v13.1.0-feature-yarn2.1) (2022-08-04)
+
+
+### Features
 
-* **webpack-dev:** add caching ([ed76817](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/ed7681710130e6d0716114b11c5b698a15eb4b45))
+* add yarn 2 support ([5d4bb8c](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/5d4bb8c5e4debb3d0db430c094effbedd9b7bcc3))
 
 # [13.0.0](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v12.5.0...v13.0.0) (2022-07-11)
 

package/README.md

@@ -297,6 +297,7 @@ docker
 
 Команда предполагает наличие установленных `node_modules` перед сборкой, в процессе работы же очищает дев зависимости используя `yarn` или `npm`.
 yarn будет использоваться когда в рутовой папке проекта есть `yarn.lock` и `yarn` доступен в системе.
+Если вы используете yarn 2, для выполнения команды очистки используется плагин [workspace-tools](https://github.com/yarnpkg/berry/blob/HEAD/packages/plugin-workspace-tools/README.md), поэтому он должен быть установлен и указан в `.yarnrc.yml` вашего проекта.
 
 Итоговый контейнер будет содержать `nginx` и скрипт для запуска `nginx` одновременно с `nodejs` сервером.
 
@@ -323,6 +324,7 @@ archive
 
 Команда предполагает наличие установленных `node_modules` перед сборкой, в процессе работы же очищает дев зависимости используя `yarn` или `npm`.
 yarn будет использоваться когда в рутовой папке проекта есть `yarn.lock` и `yarn` доступен в системе.
+Если вы используете yarn 2, для выполнения команды очистки используется плагин [workspace-tools](https://github.com/yarnpkg/berry/blob/HEAD/packages/plugin-workspace-tools/README.md), поэтому он должен быть установлен и указан в `.yarnrc.yml` вашего проекта.
 
 Итоговый архив будет содержать в себе `.build`, `node_modules`, `package.json` и `config` папки вашего проекта.
 

package/build/commands/archive-build/index.js

@@ -51,7 +51,14 @@ const packageJsonPath = path_1.default.join(app_configs_1.default.cwd, packageJs
         console.time('Remove build dependencies time');
         // if yarn is available prune dev dependencies with yarn, otherwise use npm
         if (app_configs_1.default.useYarn && shelljs_1.default.which('yarn')) {
-            yield exec_1.default('yarn install --production --ignore-optional --frozen-lockfile --ignore-scripts --prefer-offline');
+            const yarnVersion = shelljs_1.default.exec('yarn -v', { silent: true });
+            const yarnMajorVersion = Number(yarnVersion.split('.')[0]);
+            if (yarnMajorVersion > 1) {
+                yield exec_1.default('yarn workspaces focus --production --all');
+            }
+            else {
+                yield exec_1.default('yarn install --production --ignore-optional --frozen-lockfile --ignore-scripts --prefer-offline');
+            }
         }
         else {
             yield exec_1.default('npm prune --production');

package/build/commands/docker-build/index.js

@@ -74,7 +74,14 @@ const imageFullName = `${dockerRegistry ? `${dockerRegistry}/` : ''}${imageName}
             console.time('Remove dev dependencies time');
             // if yarn is available prune dev dependencies with yarn, otherwise use npm
             if (app_configs_1.default.useYarn && shelljs_1.default.which('yarn')) {
-                yield exec_1.default('yarn install --production --ignore-optional --frozen-lockfile --ignore-scripts --prefer-offline');
+                const yarnVersion = shelljs_1.default.exec('yarn -v', { silent: true });
+                const yarnMajorVersion = Number(yarnVersion.split('.')[0]);
+                if (yarnMajorVersion > 1) {
+                    yield exec_1.default('yarn workspaces focus --production --all');
+                }
+                else {
+                    yield exec_1.default('yarn install --production --ignore-optional --frozen-lockfile --ignore-scripts --prefer-offline');
+                }
             }
             else {
                 yield exec_1.default('npm prune --production');

package/build/configs/webpack.client.dev.js

@@ -9,9 +9,11 @@ const case_sensitive_paths_webpack_plugin_1 = __importDefault(require("case-sens
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
 const assets_webpack_plugin_1 = __importDefault(require("assets-webpack-plugin"));
 const tsconfig_paths_webpack_plugin_1 = __importDefault(require("tsconfig-paths-webpack-plugin"));
+const WatchMissingNodeModulesPlugin_1 = __importDefault(require("react-dev-utils/WatchMissingNodeModulesPlugin"));
 const getCSSModuleLocalIdent_1 = __importDefault(require("react-dev-utils/getCSSModuleLocalIdent"));
 const PnpWebpackPlugin = require('pnp-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 const ReactRefreshTypeScript = require('react-refresh-typescript');
 const app_configs_1 = __importDefault(require("./app-configs"));
@@ -79,12 +81,6 @@ const webpackClientDev = apply_overrides_1.default(['webpack', 'webpackClient',
             PnpWebpackPlugin.moduleLoader(module),
         ],
     },
-    cache: {
-        type: 'filesystem',
-        buildDependencies: {
-            config: [__filename],
-        },
-    },
     module: {
         // typescript interface will be removed from modules, and we will get an error on correct code
         // see https://github.com/webpack/webpack/issues/7378
@@ -142,7 +138,6 @@ const webpackClientDev = apply_overrides_1.default(['webpack', 'webpackClient',
                                     // It enables caching results in ./node_modules/.cache/babel-loader/
                                     // directory for faster rebuilds.
                                     cacheDirectory: true,
-                                    cacheCompression: false,
                                     plugins: require.resolve('react-refresh/babel')
                                 }, babel_client_1.default)
                             },
@@ -259,6 +254,17 @@ const webpackClientDev = apply_overrides_1.default(['webpack', 'webpackClient',
         // a plugin that prints an error when you attempt to do this.
         // See https://github.com/facebookincubator/create-react-app/issues/240
         new case_sensitive_paths_webpack_plugin_1.default(),
+        // If you require a missing module and then `npm install` it, you still have
+        // to restart the development server for Webpack to discover it. This plugin
+        // makes the discovery automatic so you don't have to restart.
+        // See https://github.com/facebookincubator/create-react-app/issues/186
+        new WatchMissingNodeModulesPlugin_1.default(app_configs_1.default.appNodeModules),
+        // new CopyWebpackPlugin([
+        //     {
+        //         from: configs.staticFilesLocation,
+        //         to: configs.clientOutputPath
+        //     }
+        // ])
         app_configs_1.default.tsconfig !== null && new fork_ts_checker_webpack_plugin_1.default(),
         new MiniCssExtractPlugin(),
     ].filter(Boolean)),
@@ -269,16 +275,34 @@ const webpackClientDev = apply_overrides_1.default(['webpack', 'webpackClient',
         hints: false,
     },
     optimization: {
-        minimize: false,
+        minimize: true,
         nodeEnv: false,
-        // Оптимизации времени билда, см https://webpack.js.org/guides/build-performance/
-        removeAvailableModules: false,
-        removeEmptyChunks: false,
-        splitChunks: false
+        minimizer: [
+            new CssMinimizerPlugin({
+                minimizerOptions: {
+                    processorOptions: {
+                        map: {
+                            // `inline: false` generates the source map in a separate file.
+                            // Otherwise, the CSS file is needlessly large.
+                            inline: false,
+                            // `annotation: false` skips appending the `sourceMappingURL`
+                            // to the end of the CSS file. Webpack already handles this.
+                            annotation: false,
+                        },
+                    },
+                    preset: () => ({
+                        plugins: [
+                            // eslint-disable-next-line global-require
+                            require('postcss-discard-duplicates'),
+                        ],
+                    }),
+                },
+            }),
+        ],
     },
     // Без этого комиляция трирегилась на изменение в node_modules и приводила к утечке памяти
     watchOptions: {
-        ignored: /node_modules/,
+        ignored: '**/node_modules',
     }
 });
 exports.default = webpackClientDev;

package/build/configs/webpack.server.dev.js

@@ -53,13 +53,6 @@ const config = {
             .relative(app_configs_1.default.appSrc, info.absoluteResourcePath)
             .replace(/\\/g, '/'),
     },
-    cache: {
-        type: 'filesystem',
-        name: 'server',
-        buildDependencies: {
-            config: [__filename],
-        },
-    },
     externalsPresets: { node: true },
     externals: [webpack_node_externals_1.default({
             allowlist: [
@@ -224,9 +217,6 @@ const config = {
     performance: {
         hints: false,
     },
-    watchOptions: {
-        ignored: /node_modules/,
-    }
 };
 const webpackServerDev = apply_overrides_1.default(['webpack', 'webpackServer', 'webpackDev', 'webpackServerDev'], config);
 exports.default = webpackServerDev;

package/build/tsconfig-local.tsbuildinfo

@@ -797,7 +797,7 @@
         "affectsGlobalScope": false
       },
       "../src/commands/archive-build/index.ts": {
-        "version": "2b19da65c72de5ab026dda1bcaa7ca47aaa095115043ec3d2adb33b553f748f5",
+        "version": "dd67bcf3100cbd10b03627a144dfa3e311d40b9d64c443bcd16e6e378d5045f4",
         "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
         "affectsGlobalScope": false
       },
@@ -1247,7 +1247,7 @@
         "affectsGlobalScope": false
       },
       "../src/commands/docker-build/index.ts": {
-        "version": "1b5c4842fdd8a6f8c3da38afa0b4eab277f567bd0161cb5cc01f707fc2f7e2a3",
+        "version": "3e1518759f88ff6c846f5fd5f3293d4fb65958073f013bcd68a192e2e40bebfc",
         "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
         "affectsGlobalScope": false
       },
@@ -1311,8 +1311,13 @@
         "signature": "a36125690b0197836e27f150c6848c40aeca31d692b7b3f58ac2fb9d9fce28b5",
         "affectsGlobalScope": false
       },
+      "../../../.yarn/cache/@types-react-dev-utils-npm-9.0.8-14221814bb-d7b6cdc89a.zip/node_modules/@types/react-dev-utils/WatchMissingNodeModulesPlugin.d.ts": {
+        "version": "c4ecf6cf29e03d5b9947d634f72561d87a6c16e0081933b759f9eb97c81c305a",
+        "signature": "c4ecf6cf29e03d5b9947d634f72561d87a6c16e0081933b759f9eb97c81c305a",
+        "affectsGlobalScope": false
+      },
       "../src/configs/webpack.client.dev.ts": {
-        "version": "ab613f3f0228e6654c545b4e0976ce30a7ff265ef978a70452e64ef253d71928",
+        "version": "b0faf6fe2b3727ce933e8f061febf434270230d6a0e329b851373b9c6053ce7f",
         "signature": "bf4cb593d7c7ac6097823d647f70fdf078e1b8175693cf9e24537625e3e69fa0",
         "affectsGlobalScope": false
       },
@@ -1336,13 +1341,8 @@
         "signature": "735d19ae41bbcd78b654d84c5bbd2474472cc20b5299aaeabb0b096cdd05a59d",
         "affectsGlobalScope": false
       },
-      "../../../.yarn/cache/@types-react-dev-utils-npm-9.0.8-14221814bb-d7b6cdc89a.zip/node_modules/@types/react-dev-utils/WatchMissingNodeModulesPlugin.d.ts": {
-        "version": "c4ecf6cf29e03d5b9947d634f72561d87a6c16e0081933b759f9eb97c81c305a",
-        "signature": "c4ecf6cf29e03d5b9947d634f72561d87a6c16e0081933b759f9eb97c81c305a",
-        "affectsGlobalScope": false
-      },
       "../src/configs/webpack.server.dev.ts": {
-        "version": "bac57268e464424a7c9ac90ea88623edf45792a6cc2ca60ca8e8966fbe03e2e3",
+        "version": "0597234884dd74415bee23d36364cc4151225e8d0dae8bfd7de6f026733e1aec",
         "signature": "4289eb8081c31f5b009209c36c04417fd4a0f39c5740422650d076d059d0a5d3",
         "affectsGlobalScope": false
       },
@@ -5568,6 +5568,7 @@
         "../../../.yarn/cache/@types-node-npm-12.12.58-b4a5c5f701-2e86ae45c7.zip/node_modules/@types/node/ts3.1/util.d.ts",
         "../../../.yarn/cache/@types-node-npm-12.12.58-b4a5c5f701-2e86ae45c7.zip/node_modules/@types/node/ts3.3/fs.d.ts",
         "../../../.yarn/cache/@types-node-npm-12.12.58-b4a5c5f701-2e86ae45c7.zip/node_modules/@types/node/ts3.3/util.d.ts",
+        "../../../.yarn/cache/@types-react-dev-utils-npm-9.0.8-14221814bb-d7b6cdc89a.zip/node_modules/@types/react-dev-utils/WatchMissingNodeModulesPlugin.d.ts",
         "../../../.yarn/cache/@types-react-dev-utils-npm-9.0.8-14221814bb-d7b6cdc89a.zip/node_modules/@types/react-dev-utils/getCSSModuleLocalIdent.d.ts",
         "../../../.yarn/cache/tsconfig-paths-webpack-plugin-npm-3.5.1-f1a5ca3b27-86a58fc9ab.zip/node_modules/tsconfig-paths-webpack-plugin/lib/index.d.ts",
         "../src/configs/app-configs/index.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "arui-scripts",
-    "version": "13.0.1-feat-speadup.1",
+    "version": "13.1.0",
     "main": "./build/index.js",
     "typings": "./build/index.d.ts",
     "license": "MPL-2.0",