@gravity-ui/app-builder 0.5.5 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.6.0](https://github.com/gravity-ui/app-builder/compare/v0.5.6...v0.6.0) (2023-07-23)
+
+
+### Features
+
+* add caching to worker loader ([#48](https://github.com/gravity-ui/app-builder/issues/48)) ([c7db4fb](https://github.com/gravity-ui/app-builder/commit/c7db4fb2786729a173e5fbe0f62c679639b9a99a))
+
+## [0.5.6](https://github.com/gravity-ui/app-builder/compare/v0.5.5...v0.5.6) (2023-07-21)
+
+
+### Features
+
+* add webpack cache option ([#47](https://github.com/gravity-ui/app-builder/issues/47)) ([fb5311a](https://github.com/gravity-ui/app-builder/commit/fb5311a5635dfc95051434fdeb878b4c34c457c2))
+
+
+### Bug Fixes
+
+* make statoscope config fields optional ([#45](https://github.com/gravity-ui/app-builder/issues/45)) ([1e80938](https://github.com/gravity-ui/app-builder/commit/1e809384b3af358ed4837d57c28928a291e99a4e))
+
 ## [0.5.5](https://github.com/gravity-ui/app-builder/compare/v0.5.4...v0.5.5) (2023-07-07)
 
 

package/README.md

@@ -188,6 +188,8 @@ With this `{rootDir}/src/ui/tsconfig.json`:
 - `entryFilter` (`string[]`) — filter used entrypoints.
 - `excludeFromClean` (`string[]`) — do not clean provided paths before build.
 - `forkTsCheker` (`false | ForkTsCheckerWebpackPluginOptions`) - config for ForkTsCheckerWebpackPlugin [more](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin#options). If `false`, ForkTsCheckerWebpackPlugin will be disabled.
+- `cache` (`boolean | FileCacheOptions | MemoryCacheOptions`) — Cache the generated webpack modules and chunks to improve build speed. [more](https://webpack.js.org/configuration/cache/)
+- `babelCacheDirectory` (`boolean | string`) — Set directory for babel-loader cache (`default: node_modules/.cache/babel-loader``)
 
 ##### Dev build
 

package/dist/common/child-process/controllable-script.js

@@ -22,15 +22,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ControllableScript = void 0;
 const utils_1 = require("./utils");
-const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs-extra"));
 const execa = __importStar(require("execa"));
+const utils_2 = require("../utils");
 class ControllableScript {
     constructor(script, debugInfo) {
         this.isRunning = false;
@@ -41,7 +38,7 @@ class ControllableScript {
     }
     start() {
         const args = [];
-        this.tmpFileName = (0, utils_1.tmpNameSync)(path_1.default.join(process.cwd(), 'node_modules'));
+        this.tmpFileName = (0, utils_1.tmpNameSync)((0, utils_2.getCacheDir)());
         fs.outputFileSync(this.tmpFileName, this.script);
         this.isRunning = true;
         // Passing --inspect isn't necessary for the child process to launch a port, but it allows some editors to automatically attach

package/dist/common/models/index.d.ts

@@ -2,7 +2,7 @@ import type { EditorLanguage } from 'monaco-editor-webpack-plugin/out/languages'
 import type { EditorFeature } from 'monaco-editor-webpack-plugin/out/features';
 import type { IFeatureDefinition } from 'monaco-editor-webpack-plugin/out/types';
 import type { Options as MomentTzOptions } from 'moment-timezone-data-webpack-plugin';
-import type { Configuration, ResolveOptions, DefinePlugin } from 'webpack';
+import type { Configuration, ResolveOptions, DefinePlugin, FileCacheOptions, MemoryCacheOptions } from 'webpack';
 import type { ServerConfiguration } from 'webpack-dev-server';
 import type { Options as CircularDependenciesOptions } from 'circular-dependency-plugin';
 import type { Config as SvgrConfig } from '@svgr/core';
@@ -126,7 +126,7 @@ export interface ClientConfig {
     entryFilter?: string[];
     excludeFromClean?: string[];
     analyzeBundle?: 'true' | 'statoscope';
-    statoscopeConfig?: StatoscopeOptions;
+    statoscopeConfig?: Partial<StatoscopeOptions>;
     reactProfiling?: boolean;
     /**
      *  Disable react-refresh in dev mode
@@ -165,6 +165,8 @@ export interface ClientConfig {
      * use webpack 5 Web Workers [syntax](https://webpack.js.org/guides/web-workers/#syntax)
      */
     newWebWorkerSyntax?: boolean;
+    babelCacheDirectory?: boolean | string;
+    cache?: boolean | FileCacheOptions | MemoryCacheOptions;
 }
 interface CdnUploadConfig {
     bucket: string;

package/dist/common/utils.d.ts

@@ -1,2 +1,3 @@
 export declare function createRunFolder(): void;
 export declare function shouldCompileTarget(target: 'client' | 'server' | undefined, targetName: string): boolean;
+export declare function getCacheDir(): string;

package/dist/common/utils.js

@@ -3,8 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldCompileTarget = exports.createRunFolder = void 0;
+exports.getCacheDir = exports.shouldCompileTarget = exports.createRunFolder = void 0;
 const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+const find_cache_dir_1 = __importDefault(require("find-cache-dir"));
 const paths_1 = __importDefault(require("./paths"));
 function createRunFolder() {
     const runPath = paths_1.default.appRun;
@@ -17,3 +19,7 @@ function shouldCompileTarget(target, targetName) {
     return target === undefined || target === targetName;
 }
 exports.shouldCompileTarget = shouldCompileTarget;
+function getCacheDir() {
+    return (0, find_cache_dir_1.default)({ name: '@gravity-ui/app-builder', create: true }) || os_1.default.tmpdir();
+}
+exports.getCacheDir = getCacheDir;

package/dist/common/webpack/config.js

@@ -91,6 +91,7 @@ function webpackConfigFactory(webpackMode, config, { logger } = {}) {
         snapshot: {
             managedPaths: config.watchOptions?.watchPackages ? [] : undefined,
         },
+        cache: config.cache,
     };
 }
 exports.webpackConfigFactory = webpackConfigFactory;
@@ -274,7 +275,7 @@ function createJavaScriptLoader({ isEnvProduction, isEnvDevelopment, config, })
                 isEnvProduction && require.resolve('babel-plugin-lodash'),
             ].filter(Boolean),
             sourceType: 'unambiguous',
-            cacheDirectory: true,
+            cacheDirectory: config.babelCacheDirectory ? config.babelCacheDirectory : true,
             cacheCompression: isEnvProduction,
             compact: isEnvProduction,
             sourceMap: !config.disableSourceMapGeneration,

package/dist/common/webpack/worker/worker-loader.js

@@ -11,6 +11,7 @@ const WebWorkerTemplatePlugin_1 = __importDefault(require("webpack/lib/webworker
 const FetchCompileWasmPlugin_1 = __importDefault(require("webpack/lib/web/FetchCompileWasmPlugin"));
 const FetchCompileAsyncWasmPlugin_1 = __importDefault(require("webpack/lib/web/FetchCompileAsyncWasmPlugin"));
 const paths_1 = __importDefault(require("../../paths"));
+const pluginId = 'APP_BUILDER_WORKER_LOADER';
 const publicPath = node_path_1.default.resolve(__dirname, 'public-path.worker.js');
 const pitch = function (request) {
     this.cacheable(false);
@@ -18,7 +19,7 @@ const pitch = function (request) {
         throw new Error('Something went wrong');
     }
     const compilerOptions = this._compiler.options;
-    const logger = this.getLogger('APP_BUILDER_WORKER_LOADER');
+    const logger = this.getLogger(pluginId);
     if (compilerOptions.output.globalObject === 'window') {
         logger.warn('Warning (app-builder-worker-loader): output.globalObject is set to "window". It should be set to "self" or "this" to support HMR in Workers.');
     }
@@ -67,23 +68,39 @@ const pitch = function (request) {
                 .join('\n');
             return cb(new Error('Child compilation failed:\n' + errorDetails));
         }
-        const contents = compilation.assets[filename]?.source();
-        const mapFile = `${filename}.map`;
-        let map = compilation.assets[mapFile]?.source();
-        if (map) {
-            const sourceMap = JSON.parse(map.toString());
-            if (Array.isArray(sourceMap.sources)) {
-                sourceMap.sources = sourceMap.sources.map((pathname) => pathname.replace(/webpack:\/\/[^/]+\//, 'webpack://'));
+        const cache = workerCompiler.getCache(pluginId);
+        const cacheIdent = request;
+        const cacheETag = cache.getLazyHashedEtag(compilation.assets[filename]);
+        return cache.get(cacheIdent, cacheETag, (getCacheError, cacheContent) => {
+            if (getCacheError) {
+                return cb(getCacheError);
             }
-            map = JSON.stringify(sourceMap);
-        }
-        for (const [assetName, asset] of Object.entries(compilation.assets)) {
-            if ([filename, mapFile].includes(assetName)) {
-                continue;
+            if (cacheContent) {
+                return cb(null, cacheContent.content, cacheContent.map);
             }
-            workerCompiler.parentCompilation?.emitAsset(assetName, asset, compilation.assetsInfo.get(assetName));
-        }
-        return cb(null, contents, map?.toString());
+            const content = compilation.assets[filename]?.source();
+            const mapFile = `${filename}.map`;
+            let map = compilation.assets[mapFile]?.source();
+            if (map) {
+                const sourceMap = JSON.parse(map.toString());
+                if (Array.isArray(sourceMap.sources)) {
+                    sourceMap.sources = sourceMap.sources.map((pathname) => pathname.replace(/webpack:\/\/[^/]+\//, 'webpack://'));
+                }
+                map = JSON.stringify(sourceMap);
+            }
+            for (const [assetName, asset] of Object.entries(compilation.assets)) {
+                if ([filename, mapFile].includes(assetName)) {
+                    continue;
+                }
+                workerCompiler.parentCompilation?.emitAsset(assetName, asset, compilation.assetsInfo.get(assetName));
+            }
+            return cache.store(cacheIdent, cacheETag, { content, map: map?.toString() }, (storeCacheError) => {
+                if (storeCacheError) {
+                    return cb(storeCacheError);
+                }
+                return cb(null, content, map?.toString());
+            });
+        });
     });
 };
 exports.pitch = pitch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "main": "dist/index.js",
@@ -87,6 +87,7 @@
     "execa": "^5.1.1",
     "fast-glob": "^3.2.12",
     "file-type": "^16.5.3",
+    "find-cache-dir": "^3.3.2",
     "fork-ts-checker-webpack-plugin": "^8.0.0",
     "fs-extra": "^11.1.1",
     "get-port": "^5.1.1",
@@ -133,6 +134,7 @@
     "@gravity-ui/tsconfig": "^1.0.0",
     "@types/circular-dependency-plugin": "^5.0.5",
     "@types/common-tags": "^1.8.1",
+    "@types/find-cache-dir": "^3.2.1",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "^29.5.2",
     "@types/lodash": "^4.14.195",