@gravity-ui/app-builder 0.5.2 → 0.5.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.5.4](https://github.com/gravity-ui/app-builder/compare/v0.5.3...v0.5.4) (2023-07-06)
+
+
+### Features
+
+* **ForkTSCheckerWebpackPlugin:** allow overwrite config ([#40](https://github.com/gravity-ui/app-builder/issues/40)) ([7490647](https://github.com/gravity-ui/app-builder/commit/74906477d707973dc885b0050ecc018ad6e43a00))
+
+## [0.5.3](https://github.com/gravity-ui/app-builder/compare/v0.5.2...v0.5.3) (2023-06-30)
+
+
+### Bug Fixes
+
+* **storybook:** support storybook 7 ([#38](https://github.com/gravity-ui/app-builder/issues/38)) ([1e51ac3](https://github.com/gravity-ui/app-builder/commit/1e51ac3dca99acd9b5a2a53a2525bcd90224e861))
+
 ## [0.5.2](https://github.com/gravity-ui/app-builder/compare/v0.5.1...v0.5.2) (2023-06-28)
 
 

package/README.md

@@ -187,7 +187,7 @@ With this `{rootDir}/src/ui/tsconfig.json`:
 - `svgr` (`SvgrConfig`) — svgr plugin options. [more](https://react-svgr.com/docs/options/)
 - `entryFilter` (`string[]`) — filter used entrypoints.
 - `excludeFromClean` (`string[]`) — do not clean provided paths before build.
-- `disableForkTsChecker` (`boolean`) - do not use `ForkTsChecker`.
+- `forkTsCheker` (`false | ForkTsCheckerWebpackPluginOptions`) - config for ForkTsCheckerWebpackPlugin [more](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin#options). If `false`, ForkTsCheckerWebpackPlugin will be disabled.
 
 ##### Dev build
 

package/dist/common/config.d.ts

@@ -1,5 +1,7 @@
 import type { NormalizedServiceConfig, ServiceConfig, LibraryConfig } from './models';
 import type { CliArgs } from '../create-cli';
-export declare function getProjectConfig(command: string, { env, ...argv }: Partial<CliArgs>): Promise<LibraryConfig | NormalizedServiceConfig>;
+export declare function getProjectConfig(command: string, { env, storybook, ...argv }: Partial<CliArgs> & {
+    storybook?: boolean;
+}): Promise<LibraryConfig | NormalizedServiceConfig>;
 export declare function normalizeConfig(userConfig: ServiceConfig, mode?: 'dev' | 'build' | string): Promise<NormalizedServiceConfig>;
 export declare function normalizeConfig(userConfig: LibraryConfig, mode?: 'dev' | 'build' | string): Promise<LibraryConfig>;

package/dist/common/config.js

@@ -19,7 +19,26 @@ function remapPaths(paths) {
 function omitUndefined(obj) {
     return lodash_1.default.omitBy(obj, lodash_1.default.isUndefined);
 }
-async function getProjectConfig(command, { env, ...argv }) {
+function getModuleLoader({ storybook } = {}) {
+    if (!storybook) {
+        return (0, cosmiconfig_typescript_loader_1.TypeScriptLoader)();
+    }
+    // storybook 7 uses esbuild-register to compile ts to cjs
+    // https://github.com/storybookjs/storybook/blob/c1ec290b3a74ce05b23f74250539ae571bffaa66/code/lib/core-common/src/utils/interpret-require.ts#L11
+    // esbuild-register uses pirates.addHook which adds _extensions[ext] to Module
+    const hasEsbuildRegistered = Boolean(require('module')._extensions['.ts']);
+    if (hasEsbuildRegistered) {
+        return (pathname) => {
+            // eslint-disable-next-line security/detect-non-literal-require
+            const result = require(pathname);
+            return result.default || result;
+        };
+    }
+    else {
+        return (0, cosmiconfig_typescript_loader_1.TypeScriptLoader)();
+    }
+}
+async function getProjectConfig(command, { env, storybook, ...argv }) {
     function getLoader(loader) {
         return async (pathname, content) => {
             const config = loader(pathname, content);
@@ -29,7 +48,7 @@ async function getProjectConfig(command, { env, ...argv }) {
             return config;
         };
     }
-    const tsLoader = getLoader((0, cosmiconfig_typescript_loader_1.TypeScriptLoader)());
+    const tsLoader = getLoader(getModuleLoader({ storybook }));
     const moduleName = 'app-builder';
     const explorer = (0, cosmiconfig_1.cosmiconfigSync)(moduleName, {
         cache: false,

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

@@ -6,6 +6,7 @@ import type { Configuration, ResolveOptions, DefinePlugin } 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';
+import type { ForkTsCheckerWebpackPluginOptions } from 'fork-ts-checker-webpack-plugin/lib/plugin-options';
 export interface Entities<T> {
     data: Record<string, T>;
     keys: string[];
@@ -137,7 +138,11 @@ export interface ClientConfig {
      * use new JSX Transform
      */
     newJsxTransform?: boolean;
+    /**
+     * @deprecated
+     * */
     disableForkTsChecker?: boolean;
+    forkTsChecker?: false | ForkTsCheckerWebpackPluginOptions;
     disableSourceMapGeneration?: boolean;
     lazyCompilation?: boolean | LazyCompilationConfig;
     polyfill?: {

package/dist/common/webpack/config.js

@@ -585,8 +585,9 @@ function configurePlugins(options) {
         }
         plugins.push(new circular_dependency_plugin_1.default(circularPluginOptions));
     }
-    if (!config.disableForkTsChecker) {
+    if (!config.disableForkTsChecker && config.forkTsChecker !== false) {
         plugins.push(new fork_ts_checker_webpack_plugin_1.default({
+            ...config.forkTsChecker,
             typescript: {
                 typescriptPath: require.resolve((0, path_1.resolve)(paths_1.default.appNodeModules, 'typescript')),
                 configFile: (0, path_1.resolve)(paths_1.default.app, 'src/ui/tsconfig.json'),
@@ -594,6 +595,7 @@ function configurePlugins(options) {
                     syntactic: true,
                 },
                 mode: 'write-references',
+                ...config.forkTsChecker?.typescript,
             },
         }));
     }

package/dist/common/webpack/storybook.js

@@ -12,7 +12,9 @@ const config_1 = require("./config");
 const config_2 = require("../config");
 const models_1 = require("../models");
 async function configureServiceWebpackConfig(mode, storybookConfig) {
-    const serviceConfig = await (0, config_2.getProjectConfig)(mode === "production" /* WebpackMode.Prod */ ? 'build' : 'dev', {});
+    const serviceConfig = await (0, config_2.getProjectConfig)(mode === "production" /* WebpackMode.Prod */ ? 'build' : 'dev', {
+        storybook: true,
+    });
     let options = {};
     if ((0, models_1.isLibraryConfig)(serviceConfig)) {
         options = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "main": "dist/index.js",
@@ -56,7 +56,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.293.0",
+    "@aws-sdk/client-s3": "^3.353.0",
     "@babel/core": "^7.21.4",
     "@babel/plugin-proposal-decorators": "^7.21.0",
     "@babel/plugin-proposal-dynamic-import": "^7.18.6",
@@ -108,7 +108,7 @@
     "rimraf": "^5.0.0",
     "sass": "^1.62.1",
     "sass-loader": "^13.3.1",
-    "semver": "^7.5.0",
+    "semver": "^7.5.2",
     "signal-exit": "^3.0.7",
     "source-map-loader": "^4.0.1",
     "strip-ansi": "^6.0.1",
@@ -126,8 +126,8 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.5",
-    "@commitlint/config-conventional": "^17.6.5",
+    "@commitlint/cli": "^17.6.6",
+    "@commitlint/config-conventional": "^17.6.6",
     "@gravity-ui/eslint-config": "^1.0.2",
     "@gravity-ui/prettier-config": "^1.0.1",
     "@gravity-ui/tsconfig": "^1.0.0",