arui-scripts 13.3.0 → 13.4.0-feat-vite-dev-build.1

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

@@ -33,12 +33,12 @@ function getSingleEntry(entryPoint) {
     ].filter(Boolean);
 }
 // This is the production configuration.
-const config = apply_overrides_1.default(['webpack', 'webpackClient', 'webpackProd', 'webpackClientProd'], {
+const config = (0, 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: get_entry_1.default(app_configs_1.default.clientEntry, getSingleEntry),
+    entry: (0, get_entry_1.default)(app_configs_1.default.clientEntry, getSingleEntry),
     bail: true,
     context: app_configs_1.default.cwd,
     output: {
@@ -291,6 +291,8 @@ const config = apply_overrides_1.default(['webpack', 'webpackClient', 'webpackPr
                     },
                 ].filter(Boolean)),
             },
+            // ** STOP ** Are you adding a new loader?
+            // Make sure to add the new loader(s) before the "file" loader.
         ],
     },
     plugins: ([
@@ -312,7 +314,7 @@ const config = apply_overrides_1.default(['webpack', 'webpackClient', 'webpackPr
             threshold: 10240,
             minRatio: 0.8
         }),
-        check_node_version_1.default(10) && new compression_webpack_plugin_1.default({
+        (0, 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: get_entry_1.default(app_configs_1.default.serverEntry, getSingleEntry),
+    entry: (0, 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: [webpack_node_externals_1.default({
+    externals: [(0, webpack_node_externals_1.default)({
             allowlist: [
                 /^arui-feather/,
                 /^arui-ft-private/,
@@ -239,5 +239,5 @@ const config = {
         ignored: /node_modules/,
     }
 };
-const webpackServerDev = apply_overrides_1.default(['webpack', 'webpackServer', 'webpackDev', 'webpackServerDev'], config);
+const webpackServerDev = (0, 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 = apply_overrides_1.default(['webpack', 'webpackServer', 'webpackProd', 'webpackServerProd'], {
+const config = (0, 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 = apply_overrides_1.default(['webpack', 'webpackServer', 'webpackPr
         __filename: true,
         __dirname: true
     },
-    entry: get_entry_1.default(app_configs_1.default.serverEntry, getSingleEntry),
+    entry: (0, 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 = apply_overrides_1.default(['webpack', 'webpackServer', 'webpackPr
             .replace(/\\/g, '/'),
     },
     externalsPresets: { node: true },
-    externals: [webpack_node_externals_1.default({
+    externals: [(0, webpack_node_externals_1.default)({
             allowlist: [
                 /^arui-feather/,
                 /^arui-ft-private/,

package/build/index.js

@@ -1,5 +1,6 @@
 "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,7 +6,16 @@ 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 pruneCommand = yarn_1.getPruningCommand();
+const installProductionCommand = (0, yarn_1.getInstallProductionCommand)();
+const yarnVersion = (0, yarn_1.getYarnVersion)();
+// В зависимости от используемого мендежера зависимостей для их установки нужно копировать разный набор файлов
+const filesRequiredToInstallDependencies = [
+    'package.json',
+    'yarn.lock',
+    yarnVersion === '2+' && '.yarnrc.yml',
+    yarnVersion === '2+' && '.yarn',
+    yarnVersion === 'unavailable' && 'package-lock.json',
+].filter(Boolean);
 const dockerfileTemplate = `
 FROM ${app_configs_1.default.baseDockerImage}
 ARG START_SH_LOCATION
@@ -19,10 +28,10 @@ ADD $START_SH_LOCATION /src/start.sh
 ADD $NGINX_CONF_LOCATION /src/nginx.conf
 
 # Зависимости. При некоторой удаче могут кешироваться и соответственно кешировать установку зависимостей
-ADD --chown=nginx:nginx yarn.lock /src/yarn.lock
-ADD --chown=nginx:nginx package.json /src/package.json
-RUN ${pruneCommand}  && \\
-    yarn cache clean
+${filesRequiredToInstallDependencies.map((file) => `ADD --chown=nginx:nginx ${file} /src/${file}`).join('\n')}
+
+RUN ${installProductionCommand}  && \\
+    ${yarnVersion === 'unavailable' ? 'npm cache clean --force' : 'yarn cache clean'}
 
 ADD --chown=nginx:nginx . /src
 
@@ -35,4 +44,4 @@ RUN touch /var/run/nginx.pid && \
    chown -R nginx:nginx /var/run/nginx.pid
 USER nginx
 `;
-exports.default = apply_overrides_1.default('DockerfileCompiled', dockerfileTemplate);
+exports.default = (0, apply_overrides_1.default)('DockerfileCompiled', dockerfileTemplate);

package/build/templates/dockerfile.template.js

@@ -29,4 +29,4 @@ ADD . /src
 
 ${nginxNonRootPart}
 `;
-exports.default = apply_overrides_1.default('Dockerfile', dockerfileTemplate);
+exports.default = (0, apply_overrides_1.default)('Dockerfile', dockerfileTemplate);

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

@@ -31,4 +31,4 @@ server {
         }
     }
 }`;
-exports.default = apply_overrides_1.default('nginx', nginxTemplate);
+exports.default = (0, 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 = apply_overrides_1.default('start.sh', startTemplate);
+exports.default = (0, apply_overrides_1.default)('start.sh', startTemplate);