arui-scripts 17.0.2 → 17.1.1

package/.turbo/turbo-lint.log

@@ -23,9 +23,6 @@
   81:9   warning  Unexpected console statement                                    no-console
   83:13  warning  Unexpected console statement                                    no-console
 
-/home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/commands/bundle-analyze/index.ts
-  6:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
-
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/commands/changelog/index.ts
   11:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
 
@@ -55,8 +52,8 @@
   71:9   warning  Unexpected console statement                                    no-console
   73:13  warning  Unexpected console statement                                    no-console
 
-/home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/commands/start/index.ts
-  1:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
+/home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/commands/start-prod/index.ts
+  1:1  warning  Run autofix to sort these imports!  simple-import-sort/imports
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/commands/start/print-compiler-output.ts
    5:8   warning  Prefer named exports                      import/no-default-export
@@ -108,9 +105,6 @@
   10:54  warning  Unexpected console statement                                    no-console
   11:53  warning  Unexpected any. Specify a different type                        @typescript-eslint/no-explicit-any
 
-/home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/commands/util/yarn.ts
-  3:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
-
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/app-configs/__tests__/update-with-presets.tests.ts
   26:28  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
   56:45  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
@@ -122,8 +116,8 @@
   32:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/app-configs/types.ts
-   88:17  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
-  107:17  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+   89:17  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+  108:17  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/app-configs/update-with-env.ts
   12:9  warning  Unexpected console statement  no-console
@@ -147,8 +141,7 @@
   3:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/dev-server.ts
-   7:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
-  71:8  warning  Prefer named exports                                            import/no-default-export
+  75:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/jest/index.js
   16:13  warning  Unexpected console statement  no-console
@@ -191,11 +184,11 @@
    27:18  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
    28:24  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
    30:14  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-   41:38  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-  100:9   warning  Unexpected console statement                                       no-console
-  101:9   warning  Unexpected console statement                                       no-console
-  119:48  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-  142:8   warning  Prefer named exports                                               import/no-default-export
+   43:38  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+  102:9   warning  Unexpected console statement                                       no-console
+  103:9   warning  Unexpected console statement                                       no-console
+  121:48  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+  144:8   warning  Prefer named exports                                               import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/util/check-node-version.ts
   7:8  warning  Prefer named exports  import/no-default-export
@@ -226,11 +219,9 @@
   16:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/webpack.client.ts
-    4:1   warning  Run autofix to sort these imports!                              simple-import-sort/imports
-   24:8   warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
-  164:47  warning  Unexpected any. Specify a different type                        @typescript-eslint/no-explicit-any
-  183:58  warning  Unexpected any. Specify a different type                        @typescript-eslint/no-explicit-any
-  427:52  warning  Unexpected any. Specify a different type                        @typescript-eslint/no-explicit-any
+  167:47  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+  186:58  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+  440:60  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/webpack.server.dev.ts
   12:8  warning  Prefer named exports  import/no-default-export
@@ -254,12 +245,10 @@
   48:8  warning  Prefer named exports                                            import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/templates/dockerfile.template.ts
-   1:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
-  30:8  warning  Prefer named exports                                            import/no-default-export
+  36:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/templates/nginx.conf.template.ts
-   1:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
-  31:8  warning  Prefer named exports                                            import/no-default-export
+  36:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/templates/start.template.ts
    1:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
@@ -268,6 +257,6 @@
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/types.d.ts
   4:12  warning  Prefer named exports  import/no-default-export
 
-✖ 149 problems (0 errors, 149 warnings)
+✖ 142 problems (0 errors, 142 warnings)
   0 errors and 2 warnings potentially fixable with the `--fix` option.
 

package/.turbo/turbo-test.log

@@ -1,5 +1,5 @@
-PASS src/configs/util/__tests__/get-polyfills.tests.ts (35.086 s)
-PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (35.521 s)
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (33.866 s)
+PASS src/configs/util/__tests__/get-polyfills.tests.ts (34.399 s)
 PASS src/configs/util/__tests__/apply-overrides.tests.ts
 PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
 PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
@@ -8,10 +8,10 @@ Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
-PASS src/configs/util/__tests__/find-plugin.tests.ts (39.341 s)
+PASS src/configs/util/__tests__/find-plugin.tests.ts (38.213 s)
 
 Test Suites: 7 passed, 7 total
 Tests:       21 passed, 21 total
 Snapshots:   0 total
-Time:        41.212 s
+Time:        39.964 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # [15.3.0](https://github.com/core-ds/arui-scripts/compare/v15.2.0...v15.3.0) (2023-06-30)
 
+## 17.1.1
+
+### Patch Changes
+
+-   [#223](https://github.com/core-ds/arui-scripts/pull/223) [`028c5d3`](https://github.com/core-ds/arui-scripts/commit/028c5d34f99353e5123b64b6a319428d42aa56bb) Thanks [@qrik116](https://github.com/qrik116)! - Исправлено формирование имени css файлов, с учётом configName
+
+## 17.1.0
+
+### Minor Changes
+
+-   [#221](https://github.com/core-ds/arui-scripts/pull/221) [`4e7843f`](https://github.com/core-ds/arui-scripts/commit/4e7843f4e2ca53e62e9c15c782ab3ec05e9c0d1e) Thanks [@heymdall-legal](https://github.com/heymdall-legal)! - Добавлен режим clientOnly, позволяющий использовать arui-scripts для сборки проектов, не требующих серверной части
+
 ## 17.0.2
 
 ### Patch Changes

package/README.md

@@ -44,3 +44,4 @@ npm install arui-scripts --save-dev
 - [Настройки компиляторов](docs/compilers.md)
 - [Особенности поведения](docs/caveats.md)
 - [Использование модулей](docs/modules.md)
+- [Client-only режим](./docs/client-only.md)

package/build/commands/build/index.js

@@ -1,8 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const run_compilers_1 = require("../util/run-compilers");
+const app_configs_1 = require("../../configs/app-configs");
 process.env.BABEL_ENV = 'production';
 process.env.NODE_ENV = 'production';
 process.env.BROWSERSLIST_CONFIG =
     process.env.BROWSERSLIST_CONFIG || require.resolve('../../../.browserslistrc');
-(0, run_compilers_1.runCompilers)([require.resolve('./client'), require.resolve('./server')]);
+const compilersCommands = [
+    require.resolve('./client'),
+];
+if (!app_configs_1.configs.clientOnly) {
+    compilersCommands.push(require.resolve('./server'));
+}
+(0, run_compilers_1.runCompilers)(compilersCommands);

package/build/commands/bundle-analyze/index.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable no-param-reassign */
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
-const app_configs_1 = __importDefault(require("../../configs/app-configs"));
+const app_configs_1 = require("../../configs/app-configs");
 const webpack_client_prod_1 = __importDefault(require("../../configs/webpack.client.prod"));
 const make_tmp_dir_1 = __importDefault(require("../util/make-tmp-dir"));
 (() => __awaiter(void 0, void 0, void 0, function* () {
@@ -27,7 +27,7 @@ const make_tmp_dir_1 = __importDefault(require("../util/make-tmp-dir"));
             ...(webpackConfig.plugins || []),
             new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({
                 generateStatsFile: true,
-                statsFilename: app_configs_1.default.statsOutputPath,
+                statsFilename: app_configs_1.configs.statsOutputPath,
                 analyzerPort: 'auto',
             }),
         ];

package/build/commands/start/index.js

@@ -1,23 +1,17 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const app_configs_1 = __importDefault(require("../../configs/app-configs"));
+const app_configs_1 = require("../../configs/app-configs");
 const run_compilers_1 = require("../util/run-compilers");
+const tsc_1 = require("../util/tsc");
 process.env.BROWSERSLIST_CONFIG =
     process.env.BROWSERSLIST_CONFIG || require.resolve('../../../.browserslistrc');
-if (app_configs_1.default.tsconfig && app_configs_1.default.disableDevWebpackTypecheck) {
-    const TSC_WATCH_COMMAND = [
-        require.resolve('typescript/lib/tsc.js'),
-        '--watch',
-        '--noEmit',
-        '--project',
-        app_configs_1.default.tsconfig,
-        '--skipLibCheck',
-    ];
-    (0, run_compilers_1.runCompilers)([require.resolve('./client'), require.resolve('./server'), TSC_WATCH_COMMAND]);
+const compilersCommands = [
+    require.resolve('./client'),
+];
+if (!app_configs_1.configs.clientOnly) {
+    compilersCommands.push(require.resolve('./server'));
 }
-else {
-    (0, run_compilers_1.runCompilers)([require.resolve('./client'), require.resolve('./server')]);
+if (app_configs_1.configs.tsconfig && app_configs_1.configs.disableDevWebpackTypecheck) {
+    compilersCommands.push((0, tsc_1.getTscWatchCommand)(app_configs_1.configs.tsconfig));
 }
+(0, run_compilers_1.runCompilers)(compilersCommands);

package/build/commands/start-prod/index.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const app_configs_1 = require("../../configs/app-configs");
+const tsc_1 = require("../util/tsc");
 const run_compilers_1 = require("../util/run-compilers");
 process.env.BROWSERSLIST_CONFIG =
     process.env.BROWSERSLIST_CONFIG || require.resolve('../../../.browserslistrc');
-(0, run_compilers_1.runCompilers)([require.resolve('./client'), require.resolve('./server')]);
+const compilersCommands = [
+    require.resolve('./client'),
+];
+if (!app_configs_1.configs.clientOnly) {
+    compilersCommands.push(require.resolve('./server'));
+}
+if (app_configs_1.configs.tsconfig && app_configs_1.configs.disableDevWebpackTypecheck) {
+    compilersCommands.push((0, tsc_1.getTscWatchCommand)(app_configs_1.configs.tsconfig));
+}
+(0, run_compilers_1.runCompilers)(compilersCommands);

package/build/commands/util/tsc.d.ts

@@ -0,0 +1 @@
+export declare function getTscWatchCommand(tsconfig: string): string[];

package/build/commands/util/tsc.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTscWatchCommand = void 0;
+function getTscWatchCommand(tsconfig) {
+    return [
+        require.resolve('typescript/lib/tsc.js'),
+        '--watch',
+        '--noEmit',
+        '--project',
+        tsconfig,
+        '--skipLibCheck',
+    ];
+}
+exports.getTscWatchCommand = getTscWatchCommand;

package/build/commands/util/yarn.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInstallProductionCommand = exports.getPruningCommand = exports.getYarnVersion = void 0;
 const shelljs_1 = __importDefault(require("shelljs"));
-const app_configs_1 = __importDefault(require("../../configs/app-configs"));
+const app_configs_1 = require("../../configs/app-configs");
 function getYarnVersion() {
-    if (app_configs_1.default.useYarn && shelljs_1.default.which('yarn')) {
+    if (app_configs_1.configs.useYarn && shelljs_1.default.which('yarn')) {
         const yarnVersion = shelljs_1.default.exec('yarn -v', { silent: true });
         const yarnMajorVersion = Number(yarnVersion.split('.')[0]);
         return yarnMajorVersion > 1 ? '2+' : '1';
@@ -16,6 +16,9 @@ function getYarnVersion() {
 }
 exports.getYarnVersion = getYarnVersion;
 function getPruningCommand() {
+    if (app_configs_1.configs.clientOnly) {
+        return 'echo "Skipping pruning in client only mode"';
+    }
     const yarnVersion = getYarnVersion();
     switch (yarnVersion) {
         case '1': {

package/build/configs/app-configs/calculate-dependent-config.d.ts

@@ -14,6 +14,7 @@ export declare function calculateDependentConfig(config: AppConfigs): {
     proxy: {
         [url: string]: import("webpack-dev-server").ProxyConfigArrayItem;
     } | null;
+    clientOnly: boolean;
     buildPath: string;
     assetsPath: string;
     additionalBuildPath: string[];

package/build/configs/app-configs/get-defaults.js

@@ -24,6 +24,7 @@ function getDefaultAppConfig() {
         useServerHMR: false,
         presets: (configFile === null || configFile === void 0 ? void 0 : configFile.presets) || ((_a = appPackage === null || appPackage === void 0 ? void 0 : appPackage.aruiScripts) === null || _a === void 0 ? void 0 : _a.presets) || null,
         proxy: appPackage.proxy || null,
+        clientOnly: false,
         // paths
         buildPath: '.build',
         assetsPath: 'assets',

package/build/configs/app-configs/types.d.ts

@@ -13,6 +13,7 @@ export type AppConfigs = {
     proxy: null | {
         [url: string]: ProxyConfigArrayItem;
     };
+    clientOnly: boolean;
     buildPath: string;
     assetsPath: string;
     additionalBuildPath: string[];

package/build/configs/dev-server.js

@@ -5,9 +5,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
-const app_configs_1 = __importDefault(require("./app-configs"));
+const app_configs_1 = require("./app-configs");
+const serverProxyConfig = {
+    '/**': Object.assign({ target: `http://127.0.0.1:${app_configs_1.configs.serverPort}`, bypass: (req) => {
+            var _a;
+            const assetsRoot = path_1.default.normalize(`/${app_configs_1.configs.publicPath}`).replace(/\\/g, '/');
+            if ((_a = req === null || req === void 0 ? void 0 : req.url) === null || _a === void 0 ? void 0 : _a.startsWith(assetsRoot)) {
+                return req.url;
+            }
+            return null;
+        } }, (app_configs_1.configs.devSourceMaps.includes('eval') || app_configs_1.configs.devServerCors
+        ? {
+            onProxyRes: (proxyRes) => {
+                // Для дев режима, когда мы используем в качестве соурсмапов что-то, основанное на eval - нужно
+                // разрешить браузеру исполнять наш код, даже когда content-security-policy приложения не позволяет этого делать.
+                if (app_configs_1.configs.devSourceMaps.includes('eval')) {
+                    const cspHeader = proxyRes.headers['content-security-policy'];
+                    if (typeof cspHeader === 'string' &&
+                        !cspHeader.includes('unsafe-eval')) {
+                        proxyRes.headers['content-security-policy'] = cspHeader.replace(/script-src/, "script-src 'unsafe-eval'");
+                    }
+                }
+                // если включен devServerCors, то нужно принудительно менять статус ответа на 200, чтобы
+                // браузер не отклонял ответы с CORS
+                if (app_configs_1.configs.devServerCors && proxyRes.method === 'OPTIONS') {
+                    proxyRes.statusCode = 200;
+                }
+            },
+        }
+        : {})),
+};
 const devServerConfig = (0, apply_overrides_1.default)('devServer', {
-    port: app_configs_1.default.clientServerPort,
+    port: app_configs_1.configs.clientServerPort,
     liveReload: false,
     client: {
         overlay: {
@@ -16,39 +45,13 @@ const devServerConfig = (0, apply_overrides_1.default)('devServer', {
         },
     },
     devMiddleware: {
-        publicPath: `/${app_configs_1.default.publicPath}`,
+        publicPath: `/${app_configs_1.configs.publicPath}`,
+        // dev-сервер не может корректно обработать файлы, которые лежат на уровень выше чем publicPath, а html, создаваемый для client-only режима как раз такой
+        writeToDisk: (filename) => filename.endsWith('.html'),
     },
-    static: [app_configs_1.default.serverOutputPath],
-    proxy: Object.assign(app_configs_1.default.proxy || {}, {
-        '/**': Object.assign({ target: `http://127.0.0.1:${app_configs_1.default.serverPort}`, bypass: (req) => {
-                var _a;
-                const assetsRoot = path_1.default.normalize(`/${app_configs_1.default.publicPath}`).replace(/\\/g, '/');
-                if ((_a = req === null || req === void 0 ? void 0 : req.url) === null || _a === void 0 ? void 0 : _a.startsWith(assetsRoot)) {
-                    return req.url;
-                }
-                return null;
-            } }, (app_configs_1.default.devSourceMaps.includes('eval') || app_configs_1.default.devServerCors
-            ? {
-                onProxyRes: (proxyRes) => {
-                    // Для дев режима, когда мы используем в качестве соурсмапов что-то, основанное на eval - нужно
-                    // разрешить браузеру исполнять наш код, даже когда content-security-policy приложения не позволяет этого делать.
-                    if (app_configs_1.default.devSourceMaps.includes('eval')) {
-                        const cspHeader = proxyRes.headers['content-security-policy'];
-                        if (typeof cspHeader === 'string' &&
-                            !cspHeader.includes('unsafe-eval')) {
-                            proxyRes.headers['content-security-policy'] = cspHeader.replace(/script-src/, "script-src 'unsafe-eval'");
-                        }
-                    }
-                    // если включен devServerCors, то нужно принудительно менять статус ответа на 200, чтобы
-                    // браузер не отклонял ответы с CORS
-                    if (app_configs_1.default.devServerCors && proxyRes.method === 'OPTIONS') {
-                        proxyRes.statusCode = 200;
-                    }
-                },
-            }
-            : {})),
-    }),
-    headers: app_configs_1.default.devServerCors
+    static: [app_configs_1.configs.serverOutputPath],
+    proxy: Object.assign(app_configs_1.configs.proxy || {}, app_configs_1.configs.clientOnly ? {} : serverProxyConfig),
+    headers: app_configs_1.configs.devServerCors
         ? {
             'Access-Control-Allow-Origin': '*',
             'Access-Control-Allow-Headers': '*',

package/build/configs/util/apply-overrides.d.ts

@@ -28,6 +28,7 @@ type Overrides = {
     nginx: string;
     'start.sh': string;
     serverExternalsExemptions: Array<string | RegExp>;
+    html: string;
 };
 type OmitFirstArg<F> = F extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
 type BoundCreateSingleClientWebpackConfig = OmitFirstArg<typeof createSingleClientWebpackConfig>;