@gravity-ui/app-builder 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [0.3.0](https://github.com/gravity-ui/app-builder/compare/v0.2.2...v0.3.0) (2023-05-08)
+
+
+### ⚠ BREAKING CHANGES
+
+* **LibraryConfig:** move newJsxTransform option under lib property
+
+### Features
+
+* **config:** add defineConfig helper ([31daecc](https://github.com/gravity-ui/app-builder/commit/31daecccc33fc58bc14d85c217b990c1f4302218))
+* **server:** use APP_PORT env variable to pass port to server ([6b14651](https://github.com/gravity-ui/app-builder/commit/6b14651adae6cf18f0da7447636d2a8363979166))
+* **storybook:** use configureServiceWebpackConfig for libraries too ([4204cf9](https://github.com/gravity-ui/app-builder/commit/4204cf9e1e5e63e16e7631477beb251e496d2690))
+
+
+### Bug Fixes
+
+* **client:** use newJsxTransform in svgr options ([cd01f55](https://github.com/gravity-ui/app-builder/commit/cd01f552177c73b20de7e95ca65cf770e8b63dbc))
+* **LibraryConfig:** move newJsxTransform option under lib property ([847a38c](https://github.com/gravity-ui/app-builder/commit/847a38cc4138741559f053ba594bcdd997c44063))
+
+
+### docs
+
+* add documentation for services ([d78b63b](https://github.com/gravity-ui/app-builder/commit/d78b63beb03c0e446e060d977942787dc33eee2c))
+
+## [0.2.2](https://github.com/gravity-ui/app-builder/compare/v0.2.1...v0.2.2) (2023-05-05)
+
+
+### Features
+
+* allow upload of additional files to CDN ([#15](https://github.com/gravity-ui/app-builder/issues/15)) ([dcdf8e0](https://github.com/gravity-ui/app-builder/commit/dcdf8e06d4d19a50fce3f6bbc48f4cf9ac2c7926))
+
 ## [0.2.1](https://github.com/gravity-ui/app-builder/compare/v0.2.0...v0.2.1) (2023-04-24)
 
 

package/README.md

@@ -1,4 +1,6 @@
-# @gravity-ui/app-builder · [![npm package](https://img.shields.io/npm/v/@gravity-ui/app-builder)](https://www.npmjs.com/package/@gravity-ui/app-builder) [![CI](https://img.shields.io/github/workflow/status/gravity-ui/app-builder/CI/main?label=CI&logo=github)](https://github.com/gravity-ui/app-builder/actions/workflows/ci.yml?query=branch:main)
+# @gravity-ui/app-builder · [![npm package](https://img.shields.io/npm/v/@gravity-ui/app-builder)](https://www.npmjs.com/package/@gravity-ui/app-builder) [![CI](https://img.shields.io/github/actions/workflow/status/gravity-ui/app-builder/.github/workflows/ci.yml?branch=main)](https://github.com/gravity-ui/app-builder/actions/workflows/ci.yml?query=branch:main)
+
+Develop and build your client-server projects, powered by typescript and webpack.
 
 ## Install
 
@@ -7,3 +9,226 @@ npm install --save-dev @gravity-ui/app-builder
 ```
 
 ## Usage
+
+`@gravity-ui/app-builder` provides CLI (`npx app-builder`). You can view available commands with the `--help` flag.
+
+### Develop your project
+
+```sh
+npx app-builder dev # to view supported options add the --help flag.
+```
+
+### Build your project
+
+```sh
+npx app-builder build # to view supported options add the --help flag.
+```
+
+### Configuration
+
+You can use any of these files:
+
+- app-builder.config.ts
+- app-builder.config.js
+- app-builder.config.json
+- app-builder property in your package.json
+
+You can also specify a custom filename using the `--config` flag
+
+#### TypeScript/JavaScript
+
+```ts
+import {defineConfig} from '@gravity-ui/app-builder';
+
+export default defineConfig({
+  client: {
+    // client settings
+  },
+  server: {
+    // server settings
+  },
+});
+```
+
+#### Conditional config
+
+If the config needs to be conditionally determined, it can export a function instead:
+
+```ts
+import {defineConfig} from '@gravity-ui/app-builder';
+
+export default defineConfig(async function (
+  /** @type dev | build */
+  command,
+  /**
+   * values specified with --env flag
+   *
+   * @type {[k in string]: string}
+   *
+   * @example
+   *   With follow command:
+   *       app-build dev --env=path.to.member1=value1 --env=path.to.member2=value2
+   *   you get:
+   *       env = {path: {to: {member1: 'value1', member2: 'value2'}}}
+   */
+  env,
+) {
+  return {
+    verbose: command === 'dev',
+    client: {
+      // client settings
+    },
+    server: {
+      // server settings
+    },
+  };
+});
+
+export default config;
+```
+
+#### package.json
+
+```json
+{
+  "app-builder": {
+    "client": {
+      // client settings
+    },
+    "server": {
+      // server settings
+    }
+  },
+  "scripts": {
+    "dev": "app-builder dev",
+    "build": "app-builder build"
+  }
+}
+```
+
+### Common
+
+- `target` (`client | server`) — select compilation unit.
+- `verbose` (`boolean`) - turn on verbose output.
+
+### Server
+
+`app-builder` compiles server with typescript.
+Default folder for server code is `src/server`. There is must be file `tsconfig.json`
+
+```json
+{
+  "compilerOptions": {
+    "outDir": "../../dist/server"
+  }
+}
+```
+
+and `index.ts` - server entrypoint.
+
+`outDir` - must be configured to place compiled files to `{rootDir}/dist/server`.
+The server is started with the command `node {rootDir}/dist/server/index.js`.
+
+#### Options
+
+All server settings are used only in dev mode:
+
+- `port` (`number | true`) — specify port that server listens. The port will be used to
+  pass through requests from the client to the server. If set to `true`, the port will be selected automatically.
+  The server is started with the command `APP_PORT=${port} node dist/server/index.js --port ${port}`.
+- `watch` (`string[]`) — by default `app-builder` monitors only `src/server` directory.
+  If you need to watch other directories, specify them here.
+- `watchThrottle` (`number`) — use to add an extra throttle, or delay restarting.
+- `inspect/inspectBrk` (`number | true`) — listen for a debugging client on specified port.
+  If specified `true`, try to listen on `9229`.
+
+### Client
+
+`app-builder` bundles client with [webpack](https://webpack.js.org). Client code must be in `src/ui` folder.
+`src/ui/entries` - each file in this folder is used as entrypoint. `dist/public/build` is output directory for bundles.
+
+#### Options
+
+All paths must be specified relative `rootDir` of the project.
+
+- `modules` (`string[]`) — Tell webpack what directories should be searched when resolving modules. `modules` automatically
+  populates with `baseUrl` from `src/ui/tsconfig.json`.
+- `alias` (`Record<string, string>`) — Create aliases to import or require certain modules more easily, [more](https://webpack.js.org/configuration/resolve/#resolvealias)
+
+With this `{rootDir}/src/ui/tsconfig.json`:
+
+```json
+{
+  "compilerOptions": {
+    "baseDir": ".",
+    "paths": {
+      "~units": ["units/*"]
+    }
+  }
+}
+```
+
+`modules` will contain `["{rootDir}/src"]` and aliases - `{"~units": ["{rootDir}/src/units"]}`;
+
+- `includes` (`string[]`) — additional compilation paths. Example: `includes: ['node_modules/my-lib', 'src/shared']`
+- `images` (`string[]`) — Additional paths for images. Example: `images: ['node_modules/my-lib/img']`
+- `icons` (`string[]`) — Additional paths for svg icons. By default, all svgs with paths including `icons/` will be processed.
+  Example: `icons: [node_modules/@fortawesome/fontawesome-pro/svgs]`
+- `publicPathPrefix` (`string`) — publicPath prefix, will be added to `/build/`
+- `symlinks` (`boolean`) — Follow symbolic links while looking for a file. [more](https://webpack.js.org/configuration/resolve/#resolvesymlinks)
+- `externals` — specify dependencies that shouldn't be resolved by webpack, but should become dependencies of the resulting bundle. [more](https://webpack.js.org/configuration/externals/)
+- `node` — include polyfills or mocks for various node stuff. [more](https://webpack.js.org/configuration/node/)
+- `fallback` — Redirect module requests when normal resolving fails. [more](https://webpack.js.org/configuration/resolve/#resolvefallback)
+- `polyfill` — allow enable Node.js `process` object polyfill.
+- `hiddenSourceMap` (`boolean=true`) - if `false` - source maps will be generated for prod builds
+- `disableSourceMapGeneration` (`boolean`) — disable sourcemap generation;
+- `definitions` — add additional options to DefinePlugin. [more](https://webpack.js.org/plugins/define-plugin/#usage)
+- `newJsxTransform` (`boolean=true`) — use new JSX Transform.
+- `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`.
+
+##### Dev build
+
+- `devServer` (`Object`) — webpack dev server options.
+  - `ipc` (`string`) — the Unix socket to listen to. If `ipc` and `port` are not defined, then the socket `{rootDir}/dist/run/client.sock` is used.
+  - `port` (`number | true`) — specify a port number to listen for requests on. If `true`, the free port will be selected automatically.
+  - `webSocketPath` (`string`) — tells clients connected to devServer to use the provided path to connect. Default is `${publicPathPrefix}/build/sockjs-node`.
+  - `type` (`'https'`) — allow to serve over HTTPS.
+  - `options` (`import('https').ServerOptions`) — allow to provide your own certificate.
+- `watchOptions` — a set of options used to customize watch mode, [more](https://webpack.js.org/configuration/watch/#watchoptions)
+- `disableReactRefresh` (`boolean`) — disable `react-refresh` in dev mode.
+- `detectCircularDependencies` (`true | CircularDependenciesOptions`) - detect modules with circular dependencies, [more](https://github.com/aackerman/circular-dependency-plugin)
+
+##### Production build
+
+- `analyzeBundle` (`true | statoscope`) — tools to analyze bundle.
+  - `true` — enable [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) plugin. Report generated to `dist/public/build/stats.html`
+  - `statoscope` — enable [statoscope](https://github.com/statoscope/statoscope) plugin. Reports generated to `dist/public/build/stats.json` and `dist/public/build/report.json`
+- `reactProfiling` (`boolean`) — use react profiler API in production, this option also disable minimization. The API is required by React developers tools for profile.
+- `cdn` (`CdnUploadConfig | CdnUploadConfig[]`) - upload bundled client files to CDN.
+  - `bucket` (`string`) — bucket name
+  - `prefix` (`string`) — path to files inside the bucket
+  - `region` (`string`) — AWS region or any string
+  - `endpoint` (`string`) - cdn host to upload files
+  - `compress` (`boolean`) - upload also gzip and brotli compressed versions of files
+  - `additionalPattern` (`string[]`) — patterns for uploading additional files. By default, only files generated by webpack are loaded.
+
+##### Optimization
+
+- `vendors` (`string[]`) — additional libraries for vendor chunk
+- `momentTz` — [settings](https://www.npmjs.com/package/moment-timezone-data-webpack-plugin) for moment-timezone (by default data is truncated);
+- `contextReplacement` (`object`)
+  - `highlight.js` (`string[]`) — list of language names to include, e.g. `['javascript', 'python', 'bash']`;
+  - `locale`: (`string[]=['ru']`) — list of `moment.js` or `day.js` locales to include, e.g. `['de', 'es']`. Locale `En` is always present.
+- `safari10` (`boolean`) — Enables `safari10` terser's option. [Terser options](https://github.com/terser/terser#minify-options)
+
+##### Monaco editor support
+
+- `monaco` (`object`) — use [monaco-editor-webpack-plugin](https://github.com/microsoft/monaco-editor/tree/main/webpack-plugin#monaco-editor-webpack-loader-plugin)
+
+  - `fileName` (`string`) — custom filename template for worker scripts
+  - `languages` (`string[]`) - include only a subset of the languages supported.
+  - `features` (`string[]`) - include only a subset of the editor features.
+  - `customLanguages` (`IFeatureDefinition[]`) - include custom languages (outside of the ones shipped with the `monaco-editor`).

package/dist/commands/build/build-lib.js

@@ -9,11 +9,8 @@ function default_1(config) {
     return new Promise((resolve, reject) => {
         const build = new controllable_script_1.ControllableScript(`
         const {buildLibrary} = require(${JSON.stringify(require.resolve('../../common/library'))});
-        buildLibrary({
-            lib: ${JSON.stringify(config.lib)},
-            newJsxTransform: ${JSON.stringify(config.newJsxTransform)}
-        });
-        `, null);
+        buildLibrary({lib: ${JSON.stringify(config.lib)}});
+            `, null);
         build.start();
         build.onExit((code) => {
             if (code) {

package/dist/commands/build/index.js

@@ -22,12 +22,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const models_1 = require("../../common/models");
 async function default_1(config) {
     process.env.NODE_ENV = 'production';
-    const { default: build } = await (_a = (0, models_1.isLibraryConfig)(config) ? './build-lib' : './build-service', Promise.resolve().then(() => __importStar(require(_a))));
+    const { default: build } = await Promise.resolve(`${(0, models_1.isLibraryConfig)(config) ? './build-lib' : './build-service'}`).then(s => __importStar(require(s)));
     return build(config);
 }
 exports.default = default_1;

package/dist/commands/dev/client.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -32,40 +21,55 @@ async function watchClientCompilation(config, onCompilationEnd) {
 exports.watchClientCompilation = watchClientCompilation;
 async function buildWebpackServer(config) {
     const logger = new logger_1.Logger('webpack', config.verbose);
-    const _a = config.client.devServer || {}, { webSocketPath = path_1.default.normalize(`/${config.client.publicPathPrefix}/build/sockjs-node`) } = _a, devServer = __rest(_a, ["webSocketPath"]);
-    const normalizedConfig = Object.assign(Object.assign({}, config.client), { devServer: Object.assign(Object.assign({}, devServer), { webSocketPath }) });
+    const { webSocketPath = path_1.default.normalize(`/${config.client.publicPathPrefix}/build/sockjs-node`), ...devServer } = config.client.devServer || {};
+    const normalizedConfig = { ...config.client, devServer: { ...devServer, webSocketPath } };
     const webpackConfig = (0, config_1.webpackConfigFactory)("development" /* WebpackMode.Dev */, normalizedConfig, { logger });
-    const options = Object.assign({ static: path_1.default.resolve(paths_1.default.appDist, 'public'), devMiddleware: {
+    const options = {
+        static: path_1.default.resolve(paths_1.default.appDist, 'public'),
+        devMiddleware: {
             publicPath: path_1.default.normalize(config.client.publicPathPrefix + '/build/'),
             stats: 'errors-warnings',
-        }, liveReload: false, hot: true, client: {
+        },
+        liveReload: false,
+        hot: true,
+        client: {
             webSocketURL: { pathname: webSocketPath },
             overlay: {
                 runtimeErrors: config.verbose,
                 warnings: config.verbose,
             },
-        }, webSocketServer: {
+        },
+        webSocketServer: {
             options: {
                 path: webSocketPath,
             },
-        }, host: '0.0.0.0', allowedHosts: 'all', headers: {
+        },
+        host: '0.0.0.0',
+        allowedHosts: 'all',
+        headers: {
             'Access-Control-Allow-Origin': '*',
             'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, PATCH, OPTIONS',
             'Access-Control-Allow-Headers': 'X-Requested-With, content-type, Authorization',
-        } }, devServer);
-    let listenOn = options.port || options.ipc;
+        },
+        ...devServer,
+    };
+    const listenOn = options.port || options.ipc;
     if (!listenOn) {
-        listenOn = path_1.default.resolve(paths_1.default.appDist, 'run/client.sock');
-        options.ipc = listenOn;
+        options.ipc = path_1.default.resolve(paths_1.default.appDist, 'run/client.sock');
     }
     if (config.client.lazyCompilation) {
-        options.proxy = Object.assign(Object.assign({}, options.proxy), { '/build/lazy': {
+        options.proxy = {
+            ...options.proxy,
+            '/build/lazy': {
                 target: `http://localhost:${config.client.lazyCompilation.port}`,
                 pathRewrite: { '^/build/lazy': '' },
-            } });
+            },
+        };
     }
     if (config.server.port) {
-        options.proxy = Object.assign(Object.assign({}, options.proxy), { '/': {
+        options.proxy = {
+            ...options.proxy,
+            '/': {
                 target: `http://localhost:${config.server.port}`,
                 bypass: (req) => {
                     if (req.method !== 'GET' && req.method !== 'HEAD') {
@@ -82,7 +86,8 @@ async function buildWebpackServer(config) {
                     }
                     return req.path;
                 },
-            } });
+            },
+        };
     }
     const compiler = (0, webpack_1.default)(webpackConfig);
     const server = new webpack_dev_server_1.default(options, compiler);

package/dist/commands/dev/index.js

@@ -42,15 +42,17 @@ async function default_1(config) {
     const serverPath = path_1.default.resolve(paths_1.default.appDist, 'server');
     const { inspect, inspectBrk } = config.server;
     const startNodemon = () => {
-        var _a;
         if (needToStartNodemon && serverCompiled && clientCompiled) {
             logger_1.default.message('Starting application at', serverPath);
-            const serverWatch = (_a = config.server.watch) !== null && _a !== void 0 ? _a : [];
+            const serverWatch = config.server.watch ?? [];
             const delay = config.server.watchThrottle;
             const nodemonInstance = (0, nodemon_1.default)({
                 ext: 'js json',
                 script: `${serverPath}/index.js`,
                 args: ['--dev', config.server.port ? `--port=${config.server.port}` : ''],
+                env: {
+                    ...(config.server.port ? { APP_PORT: config.server.port } : undefined),
+                },
                 nodeArgs: inspect || inspectBrk
                     ? [`--${inspect ? 'inspect' : 'inspect-brk'}=:::${inspect || inspectBrk}`]
                     : undefined,
@@ -83,19 +85,19 @@ async function default_1(config) {
     }
     process.on('SIGINT', async () => {
         logger_1.default.success('\nCleaning up...');
-        await (serverCompilation === null || serverCompilation === void 0 ? void 0 : serverCompilation.stop('SIGINT'));
-        await (clientCompilation === null || clientCompilation === void 0 ? void 0 : clientCompilation.stop());
+        await serverCompilation?.stop('SIGINT');
+        await clientCompilation?.stop();
         process.exit(1);
     });
     process.on('SIGTERM', async () => {
         logger_1.default.success('\nCleaning up...');
-        await (serverCompilation === null || serverCompilation === void 0 ? void 0 : serverCompilation.stop('SIGTERM'));
-        await (clientCompilation === null || clientCompilation === void 0 ? void 0 : clientCompilation.stop());
+        await serverCompilation?.stop('SIGTERM');
+        await clientCompilation?.stop();
         process.exit(1);
     });
     (0, signal_exit_1.default)((_code, signal) => {
-        serverCompilation === null || serverCompilation === void 0 ? void 0 : serverCompilation.stop(signal);
-        clientCompilation === null || clientCompilation === void 0 ? void 0 : clientCompilation.stop();
+        serverCompilation?.stop(signal);
+        clientCompilation?.stop();
     });
 }
 exports.default = default_1;

package/dist/commands/dev/server.js

@@ -5,14 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watchServerCompilation = void 0;
 const path_1 = __importDefault(require("path"));
-const rimraf_1 = __importDefault(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const controllable_script_1 = require("../../common/child-process/controllable-script");
 const utils_1 = require("../../common/utils");
 const paths_1 = __importDefault(require("../../common/paths"));
 function watchServerCompilation(config) {
     const serverPath = path_1.default.resolve(paths_1.default.appDist, 'server');
-    rimraf_1.default.sync(serverPath);
-    rimraf_1.default.sync(paths_1.default.appRun);
+    rimraf_1.rimraf.sync(serverPath);
+    rimraf_1.rimraf.sync(paths_1.default.appRun);
     (0, utils_1.createRunFolder)();
     const build = new controllable_script_1.ControllableScript(`
         const ts = require('typescript');

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

@@ -54,7 +54,9 @@ class ControllableScript {
             }
         }
         this.process = execa.node(this.tmpFileName, args, {
-            env: Object.assign({}, process.env),
+            env: {
+                ...process.env,
+            },
             stdio: [`inherit`, `inherit`, `inherit`, `ipc`],
             nodeOptions: ['--unhandled-rejections=strict'],
         });

package/dist/common/child-process/utils.js

@@ -32,7 +32,6 @@ const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs-extra"));
 const RANDOM_CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 function randomChars(howMany) {
-    var _a, _b;
     const value = [];
     let rnd = null;
     // make sure that we do not fail because we ran out of entropy
@@ -44,7 +43,7 @@ function randomChars(howMany) {
         rnd = crypto_1.default.pseudoRandomBytes(howMany);
     }
     for (let i = 0; i < howMany; i++) {
-        value.push((_b = RANDOM_CHARS[((_a = rnd[i]) !== null && _a !== void 0 ? _a : 0) % RANDOM_CHARS.length]) !== null && _b !== void 0 ? _b : '0');
+        value.push(RANDOM_CHARS[(rnd[i] ?? 0) % RANDOM_CHARS.length] ?? '0');
     }
     return value.join('');
 }

package/dist/common/config.d.ts

@@ -1,5 +1,5 @@
 import type { NormalizedServiceConfig, ServiceConfig, LibraryConfig } from './models';
 import type { CliArgs } from '../create-cli';
-export declare function getProjectConfig(command: string, { env, ...argv }: Partial<CliArgs>): Promise<NormalizedServiceConfig>;
+export declare function getProjectConfig(command: string, { env, ...argv }: Partial<CliArgs>): 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

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,8 +19,7 @@ function remapPaths(paths) {
 function omitUndefined(obj) {
     return lodash_1.default.omitBy(obj, lodash_1.default.isUndefined);
 }
-async function getProjectConfig(command, _a) {
-    var { env } = _a, argv = __rest(_a, ["env"]);
+async function getProjectConfig(command, { env, ...argv }) {
     function getLoader(loader) {
         return async (pathname, content) => {
             const config = loader(pathname, content);
@@ -85,13 +73,30 @@ async function getProjectConfig(command, _a) {
         inspect: argv.inspect,
         inspectBrk: argv.inspectBrk,
     };
-    const config = Object.assign({}, (await (cfg === null || cfg === void 0 ? void 0 : cfg.config)));
-    const projectConfig = Object.assign(Object.assign(Object.assign({}, config), omitUndefined({ target: argv.target, verbose: argv.verbose })), { client: Object.assign(Object.assign(Object.assign({}, config.client), omitUndefined(client)), (argv.cdn === 'false' ? { cdn: undefined } : undefined)), server: Object.assign(Object.assign({}, config.server), omitUndefined(server)) });
+    const config = { ...(await cfg?.config) };
+    if ((0, models_1.isLibraryConfig)(config)) {
+        return normalizeConfig({
+            ...config,
+            ...omitUndefined({ verbose: argv.verbose }),
+        });
+    }
+    const projectConfig = {
+        ...config,
+        ...omitUndefined({ target: argv.target, verbose: argv.verbose }),
+        client: {
+            ...config.client,
+            ...omitUndefined(client),
+            ...(argv.cdn === 'false' ? { cdn: undefined } : undefined),
+        },
+        server: {
+            ...config.server,
+            ...omitUndefined(server),
+        },
+    };
     return normalizeConfig(projectConfig, command);
 }
 exports.getProjectConfig = getProjectConfig;
 async function normalizeConfig(userConfig, mode) {
-    var _a;
     if ((0, models_1.isServiceConfig)(userConfig)) {
         const config = lodash_1.default.cloneDeep(userConfig);
         const client = typeof config.client === 'object' ? config.client : (config.client = {});
@@ -108,19 +113,18 @@ async function normalizeConfig(userConfig, mode) {
         return config;
     }
     const config = lodash_1.default.cloneDeep(userConfig);
-    config.newJsxTransform = (_a = config.newJsxTransform) !== null && _a !== void 0 ? _a : true;
+    config.lib.newJsxTransform = config.lib.newJsxTransform ?? true;
     return config;
 }
 exports.normalizeConfig = normalizeConfig;
 async function normalizeClientConfig(client, mode) {
-    var _a, _b, _c, _d, _e, _f;
-    client.newJsxTransform = (_a = client.newJsxTransform) !== null && _a !== void 0 ? _a : true;
+    client.newJsxTransform = client.newJsxTransform ?? true;
     client.publicPathPrefix = client.publicPathPrefix || '';
     client.modules = client.modules && remapPaths(client.modules);
     client.includes = client.includes && remapPaths(client.includes);
     client.images = client.images && remapPaths(client.images);
-    client.hiddenSourceMap = (_b = client.hiddenSourceMap) !== null && _b !== void 0 ? _b : true;
-    client.svgr = (_c = client.svgr) !== null && _c !== void 0 ? _c : {};
+    client.hiddenSourceMap = client.hiddenSourceMap ?? true;
+    client.svgr = client.svgr ?? {};
     client.entryFilter = client.entryFilter && splitPaths(client.entryFilter);
     if (mode === 'dev') {
         if (client.lazyCompilation) {
@@ -133,19 +137,23 @@ async function normalizeClientConfig(client, mode) {
                 client.lazyCompilation.port = await (0, get_port_1.default)({ port: 6000 });
             }
         }
-        const devServer = ((_d = client.devServer) === null || _d === void 0 ? void 0 : _d.port)
+        const devServer = client.devServer?.port
             ? {
                 port: client.devServer.port === true
                     ? await (0, get_port_1.default)({ port: 8000 })
                     : client.devServer.port,
                 ipc: undefined,
             }
-            : { port: undefined, ipc: (_e = client.devServer) === null || _e === void 0 ? void 0 : _e.ipc };
-        const _g = (_f = client.devServer) !== null && _f !== void 0 ? _f : {}, { type, options } = _g, other = __rest(_g, ["type", "options"]);
-        client.devServer = Object.assign(Object.assign(Object.assign({}, other), devServer), { server: {
+            : { port: undefined, ipc: client.devServer?.ipc };
+        const { type, options, ...other } = client.devServer ?? {};
+        client.devServer = {
+            ...other,
+            ...devServer,
+            server: {
                 type,
                 options,
-            } });
+            },
+        };
         delete client.cdn;
     }
     else {