arui-scripts 13.4.0-feat-vite-dev-build.3 → 13.4.0

package/build/configs/jest/index.d.ts

@@ -1,17 +1,17 @@
-export const testRegex: string;
-export const moduleFileExtensions: string[];
-export const collectCoverageFrom: string[];
-export const transform: {
+export declare const testRegex: string;
+export declare const moduleFileExtensions: string[];
+export declare const collectCoverageFrom: string[];
+export declare const transform: {
     '^.+\\.jsx?$': string;
     '^.+\\.tsx?$': string;
     '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': string;
 };
-export const moduleNameMapper: {
+export declare const moduleNameMapper: {
     '\\.css$': string;
 };
-export const setupFiles: string[];
-export const snapshotSerializers: string[];
-export const globals: {
+export declare const setupFiles: string[];
+export declare const snapshotSerializers: string[];
+export declare const globals: {
     'ts-jest': {
         tsconfig: string | null;
         babelConfig: any;

package/build/configs/postcss.config.d.ts

@@ -10,7 +10,7 @@ export declare const postcssPluginsOptions: {
     'postcss-custom-properties'?: {
         preserve: boolean;
         importFrom: string | undefined;
-    } | undefined;
+    };
     'postcss-import': {
         path: string[];
         plugins: any[];

package/build/configs/postcss.js

@@ -5,5 +5,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
 const postcss_config_1 = require("./postcss.config");
-const postcssConfig = (0, apply_overrides_1.default)('postcss', (0, postcss_config_1.createPostcssConfig)(postcss_config_1.postcssPlugins, postcss_config_1.postcssPluginsOptions));
+const postcssConfig = apply_overrides_1.default('postcss', postcss_config_1.createPostcssConfig(postcss_config_1.postcssPlugins, postcss_config_1.postcssPluginsOptions));
 exports.default = postcssConfig;

package/build/configs/stats-options.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
-const statsOptions = (0, apply_overrides_1.default)('stats', {
+const statsOptions = apply_overrides_1.default('stats', {
     // Add asset Information
     assets: false,
     // Add information about cached (not built) modules

package/build/configs/supporting-browsers.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
-const supportingBrowsers = (0, apply_overrides_1.default)(['browsers', 'supportingBrowsers'], [
+const supportingBrowsers = apply_overrides_1.default(['browsers', 'supportingBrowsers'], [
     'last 2 versions',
     'ie >= 10',
     'Android >= 4',

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

@@ -1,8 +1,7 @@
 import type { Configuration as WebpackConfiguration, WebpackOptionsNormalized } from 'webpack';
 import type { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
 import { AppConfigs } from '../app-configs/types';
-import { InlineConfig } from 'vite';
-type Overrides = {
+declare type Overrides = {
     webpack: WebpackConfiguration;
     webpackClient: WebpackConfiguration;
     webpackDev: WebpackConfiguration;
@@ -14,8 +13,6 @@ type Overrides = {
     webpackServerProd: WebpackConfiguration;
     devServer: WebpackDevServerConfiguration;
     stats: WebpackOptionsNormalized['stats'];
-    vite: InlineConfig;
-    viteHtml: string;
     babel: any;
     babelClient: any;
     babelServer: any;
@@ -28,8 +25,8 @@ type Overrides = {
     nginx: string;
     'start.sh': string;
 };
-type OverrideFunction<K extends keyof Overrides> = (config: Overrides[K], appConfig: AppConfigs) => Overrides[K];
-export type OverrideFile = {
+declare type OverrideFunction<K extends keyof Overrides> = (config: Overrides[K], appConfig: AppConfigs) => Overrides[K];
+export declare type OverrideFile = {
     [K in keyof Overrides]?: OverrideFunction<K>;
 };
 /**

package/build/configs/vite.config.js

@@ -9,6 +9,7 @@ const app_configs_1 = __importDefault(require("./app-configs"));
 const plugin_react_1 = __importDefault(require("@vitejs/plugin-react"));
 const vite_tsconfig_paths_1 = __importDefault(require("vite-tsconfig-paths"));
 const postcss_1 = __importDefault(require("./postcss"));
+const vite_1 = require("vite");
 exports.viteConfig = (0, apply_overrides_1.default)('vite', {
     server: {
         middlewareMode: true,
@@ -16,6 +17,12 @@ exports.viteConfig = (0, apply_overrides_1.default)('vite', {
             protocol: 'ws',
         }
     },
+    customLogger: Object.assign(Object.assign({}, (0, vite_1.createLogger)('info')), { warn(msg) {
+            // ignore warning about css import, they are created incorrectly
+            if (!msg.includes('Default and named imports from CSS files are deprecated.')) {
+                console.log(msg);
+            }
+        } }),
     appType: 'custom',
     build: {
         manifest: true,

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

@@ -29,21 +29,18 @@ function getSingleEntry(clientEntry) {
         require.resolve('webpack/hot/dev-server'),
         // Finally, this is your app's code:
         ...clientEntry,
-        // We include the app code last so that if there is a runtime error during
-        // initialization, it doesn't blow up the WebpackDevServer client, and
-        // changing JS code would still trigger a refresh.
     ].filter(Boolean);
 }
 // This is the development configuration.
 // It is focused on developer experience and fast rebuilds.
 // The production configuration is different and lives in a separate file.
-const webpackClientDev = (0, apply_overrides_1.default)(['webpack', 'webpackClient', 'webpackDev', 'webpackClientDev'], {
+const webpackClientDev = apply_overrides_1.default(['webpack', 'webpackClient', 'webpackDev', 'webpackClientDev'], {
     target: 'web',
     mode: 'development',
     devtool: app_configs_1.default.devSourceMaps,
     // These are the "entry points" to our application.
     // This means they will be the "root" imports that are included in JS bundle.
-    entry: (0, get_entry_1.default)(app_configs_1.default.clientEntry, getSingleEntry),
+    entry: get_entry_1.default(app_configs_1.default.clientEntry, getSingleEntry),
     context: app_configs_1.default.cwd,
     output: {
         // Add /* filename */ comments to generated require()s in the output.
@@ -250,8 +247,6 @@ const webpackClientDev = (0, apply_overrides_1.default)(['webpack', 'webpackClie
                     },
                 ].filter(Boolean)),
             },
-            // ** STOP ** Are you adding a new loader?
-            // Make sure to add the new loader(s) before the "file" loader.
         ],
     },
     plugins: ([

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

@@ -33,12 +33,12 @@ function getSingleEntry(entryPoint) {
     ].filter(Boolean);
 }
 // This is the production configuration.
-const config = (0, apply_overrides_1.default)(['webpack', 'webpackClient', 'webpackProd', 'webpackClientProd'], {
+const config = apply_overrides_1.default(['webpack', 'webpackClient', 'webpackProd', 'webpackClientProd'], {
     mode: 'production',
     // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
     devtool: 'cheap-module-source-map',
     // In production, we only want to load the polyfills and the app code.
-    entry: (0, get_entry_1.default)(app_configs_1.default.clientEntry, getSingleEntry),
+    entry: get_entry_1.default(app_configs_1.default.clientEntry, getSingleEntry),
     bail: true,
     context: app_configs_1.default.cwd,
     output: {
@@ -291,8 +291,6 @@ const config = (0, apply_overrides_1.default)(['webpack', 'webpackClient', 'webp
                     },
                 ].filter(Boolean)),
             },
-            // ** STOP ** Are you adding a new loader?
-            // Make sure to add the new loader(s) before the "file" loader.
         ],
     },
     plugins: ([
@@ -314,7 +312,7 @@ const config = (0, apply_overrides_1.default)(['webpack', 'webpackClient', 'webp
             threshold: 10240,
             minRatio: 0.8
         }),
-        (0, check_node_version_1.default)(10) && new compression_webpack_plugin_1.default({
+        check_node_version_1.default(10) && new compression_webpack_plugin_1.default({
             filename: '[file].br',
             algorithm: 'brotliCompress',
             test: /\.(js|css|html|svg)$/,

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

@@ -39,7 +39,7 @@ const config = {
         __filename: true,
         __dirname: true
     },
-    entry: (0, get_entry_1.default)(app_configs_1.default.serverEntry, getSingleEntry),
+    entry: get_entry_1.default(app_configs_1.default.serverEntry, getSingleEntry),
     context: app_configs_1.default.cwd,
     output: {
         // Add /* filename */ comments to generated require()s in the output.
@@ -61,7 +61,7 @@ const config = {
         },
     },
     externalsPresets: { node: true },
-    externals: [(0, webpack_node_externals_1.default)({
+    externals: [webpack_node_externals_1.default({
             allowlist: [
                 /^arui-feather/,
                 /^arui-ft-private/,
@@ -239,5 +239,5 @@ const config = {
         ignored: /node_modules/,
     }
 };
-const webpackServerDev = (0, apply_overrides_1.default)(['webpack', 'webpackServer', 'webpackDev', 'webpackServerDev'], config);
+const webpackServerDev = apply_overrides_1.default(['webpack', 'webpackServer', 'webpackDev', 'webpackServerDev'], config);
 exports.default = webpackServerDev;

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

@@ -27,7 +27,7 @@ function getSingleEntry(entryPoint) {
 // This is the production configuration.
 // It compiles slowly and is focused on producing a fast and minimal bundle.
 // The development configuration is different and lives in a separate file.
-const config = (0, apply_overrides_1.default)(['webpack', 'webpackServer', 'webpackProd', 'webpackServerProd'], {
+const config = apply_overrides_1.default(['webpack', 'webpackServer', 'webpackProd', 'webpackServerProd'], {
     mode: 'production',
     // Don't attempt to continue if there are any errors.
     bail: true,
@@ -38,7 +38,7 @@ const config = (0, apply_overrides_1.default)(['webpack', 'webpackServer', 'webp
         __filename: true,
         __dirname: true
     },
-    entry: (0, get_entry_1.default)(app_configs_1.default.serverEntry, getSingleEntry),
+    entry: get_entry_1.default(app_configs_1.default.serverEntry, getSingleEntry),
     context: app_configs_1.default.cwd,
     output: {
         // Add /* filename */ comments to generated require()s in the output.
@@ -53,7 +53,7 @@ const config = (0, apply_overrides_1.default)(['webpack', 'webpackServer', 'webp
             .replace(/\\/g, '/'),
     },
     externalsPresets: { node: true },
-    externals: [(0, webpack_node_externals_1.default)({
+    externals: [webpack_node_externals_1.default({
             allowlist: [
                 /^arui-feather/,
                 /^arui-ft-private/,

package/build/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBuildParamsFromArgs = exports.prepareFilesForDocker = void 0;
 var docker_build_1 = require("./commands/util/docker-build");
 Object.defineProperty(exports, "prepareFilesForDocker", { enumerable: true, get: function () { return docker_build_1.prepareFilesForDocker; } });
 var docker_build_2 = require("./commands/util/docker-build");

package/build/templates/dockerfile-compiled.template.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const app_configs_1 = __importDefault(require("../configs/app-configs"));
 const apply_overrides_1 = __importDefault(require("../configs/util/apply-overrides"));
 const yarn_1 = require("../commands/util/yarn");
-const installProductionCommand = (0, yarn_1.getInstallProductionCommand)();
-const yarnVersion = (0, yarn_1.getYarnVersion)();
+const installProductionCommand = yarn_1.getInstallProductionCommand();
+const yarnVersion = yarn_1.getYarnVersion();
 // В зависимости от используемого мендежера зависимостей для их установки нужно копировать разный набор файлов
 const filesRequiredToInstallDependencies = [
     'package.json',
@@ -44,4 +44,4 @@ RUN touch /var/run/nginx.pid && \
    chown -R nginx:nginx /var/run/nginx.pid
 USER nginx
 `;
-exports.default = (0, apply_overrides_1.default)('DockerfileCompiled', dockerfileTemplate);
+exports.default = apply_overrides_1.default('DockerfileCompiled', dockerfileTemplate);

package/build/templates/dockerfile.template.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const app_configs_1 = __importDefault(require("../configs/app-configs"));
 const apply_overrides_1 = __importDefault(require("../configs/util/apply-overrides"));
 const nginxNonRootPart = app_configs_1.default.runFromNonRootUser ?
-    `RUN chown -R nginx:nginx /src && chmod -R 755 /src && \\
+    `RUN chown -R nginx:nginx /src && \\
        mkdir -p /var/lib/nginx && \\
        chown -R nginx:nginx /var/lib/nginx && \\
        chown -R nginx:nginx /var/log/nginx && \\
@@ -25,8 +25,8 @@ ARG NGINX_CONF_LOCATION
 WORKDIR /src
 ADD $START_SH_LOCATION /src/start.sh
 ADD $NGINX_CONF_LOCATION /src/nginx.conf
-ADD . /src
-
 ${nginxNonRootPart}
+${app_configs_1.default.runFromNonRootUser ? 'ADD --chown=nginx:nginx . /src' : 'ADD . /src'}
+
 `;
-exports.default = (0, apply_overrides_1.default)('Dockerfile', dockerfileTemplate);
+exports.default = apply_overrides_1.default('Dockerfile', dockerfileTemplate);

package/build/templates/nginx.conf.template.js

@@ -31,4 +31,4 @@ server {
         }
     }
 }`;
-exports.default = (0, apply_overrides_1.default)('nginx', nginxTemplate);
+exports.default = apply_overrides_1.default('nginx', nginxTemplate);

package/build/templates/start.template.js

@@ -34,4 +34,4 @@ nginx &
 # Start nodejs process
 node --max-old-space-size="$node_memory_limit" ./${app_configs_1.default.buildPath}/${app_configs_1.default.serverOutput}
 `;
-exports.default = (0, apply_overrides_1.default)('start.sh', startTemplate);
+exports.default = apply_overrides_1.default('start.sh', startTemplate);