arui-scripts 12.3.0 → 12.5.0-alfa.0

package/CHANGELOG.md

@@ -1,7 +1,14 @@
-# [12.3.0](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v12.2.0...v12.3.0) (2022-04-18)
+## [12.4.1](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v12.4.0...v12.4.1) (2022-06-07)
+
+
+### Bug Fixes
+
+* **ts-config:** ignore local tsconfigs for ts-node ([0235ade](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/0235ade62cbf9d14ac55f7c518ca170fdc7d364e))
+* **ts-configs:** disable processing of js files with ts-node ([edbb9d2](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/edbb9d2d23ba1c0f7950fedf5fff394b695c6cd5))
+
+# [12.4.0](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v12.3.0...v12.4.0) (2022-05-25)
 
 
 ### Features
 
-* add support for ts override files ([d36b5da](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/d36b5dac0ac73dc580cc0a22c47438d6136e6b9e))
-* allow using config files instead of package config ([5063d23](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/5063d23abc1a13b503c73b0906d68aaa57840a74))
+* add removeDevDependenciesDuringDockerBuild setting ([51f016f](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/51f016f3aad3e2e5e489659d0b26e6005cacdafe))

package/README.md

@@ -74,6 +74,7 @@ npm install arui-scripts --save-dev
 - `useTscLoader` -  использовать ts-loader вместо babel-loader для обработки ts файлов. У babel-loader есть [ряд ограничений](https://blogs.msdn.microsoft.com/typescript/2018/08/27/typescript-and-babel-7/). По умолчанию `false`.
 - `componentsTheme` - путь к css файлу с темой для [core-components](https://alfa-laboratory.github.io/core-components). Используется для настройки [postcss-custom-properties](https://github.com/postcss/postcss-custom-properties#importfrom).
 - `keepCssVars` - отключает `postcss-custom-properties`, css переменные будут оставаться в бандле.
+- `removeDevDependenciesDuringDockerBuild` - отключает удаление devDependencies из node_modules при сборке докер образа. Используется когда вам не нужно удалять devDependencies, т.к. в своём Dockerfile вы не переносите node_modules в докер-контейнер
 
 В целях отладки все эти настройки можно переопределить не изменяя package.json
 Просто передайте необходимые настройки в environment переменной ARUI_SCRIPTS_CONFIG

package/build/commands/docker-build/index.js

@@ -70,15 +70,17 @@ const imageFullName = `${dockerRegistry ? `${dockerRegistry}/` : ''}${imageName}
         // run build script
         yield exec_1.default('npm run build');
         console.timeEnd('Build application time');
-        console.time('Remove dev dependencies time');
-        // if yarn is available prune dev dependencies with yarn, otherwise use npm
-        if (app_configs_1.default.useYarn && shelljs_1.default.which('yarn')) {
-            yield exec_1.default('yarn install --production --ignore-optional --frozen-lockfile --ignore-scripts --prefer-offline');
+        if (app_configs_1.default.removeDevDependenciesDuringDockerBuild) {
+            console.time('Remove dev dependencies time');
+            // if yarn is available prune dev dependencies with yarn, otherwise use npm
+            if (app_configs_1.default.useYarn && shelljs_1.default.which('yarn')) {
+                yield exec_1.default('yarn install --production --ignore-optional --frozen-lockfile --ignore-scripts --prefer-offline');
+            }
+            else {
+                yield exec_1.default('npm prune --production');
+            }
+            console.timeEnd('Remove dev dependencies time');
         }
-        else {
-            yield exec_1.default('npm prune --production');
-        }
-        console.timeEnd('Remove dev dependencies time');
         console.time('Build docker image time');
         yield exec_1.default(`docker build -f "./${tempDirName}/Dockerfile" \\
  --build-arg START_SH_LOCATION="./${tempDirName}/start.sh" \\

package/build/configs/app-configs/available-package-settings.d.ts

@@ -2,7 +2,7 @@ import { AppConfigs } from './types';
 /**
  * Эти ключи из конфига будут обновляться из package.json при их наличии
  */
-export declare const availablePackageSettings: readonly ["dockerRegistry", "baseDockerImage", "serverEntry", "buildPath", "assetsPath", "additionalBuildPath", "nginxRootPath", "runFromNonRootUser", "archiveName", "serverOutput", "clientPolyfillsEntry", "clientEntry", "keepPropTypes", "useTscLoader", "useServerHMR", "clientServerPort", "serverPort", "debug", "statsOutputFilename", "componentsTheme", "keepCssVars"];
+export declare const availablePackageSettings: readonly ["dockerRegistry", "baseDockerImage", "serverEntry", "buildPath", "assetsPath", "additionalBuildPath", "nginxRootPath", "runFromNonRootUser", "archiveName", "serverOutput", "clientPolyfillsEntry", "clientEntry", "keepPropTypes", "useTscLoader", "useServerHMR", "clientServerPort", "serverPort", "debug", "statsOutputFilename", "componentsTheme", "keepCssVars", "removeDevDependenciesDuringDockerBuild"];
 declare type ArrayElementType<ArrayType extends ReadonlyArray<unknown>> = ArrayType[number];
 export declare type PackageSettings = Partial<Pick<AppConfigs, ArrayElementType<typeof availablePackageSettings>>>;
 export {};

package/build/configs/app-configs/available-package-settings.js

@@ -26,4 +26,5 @@ exports.availablePackageSettings = [
     'statsOutputFilename',
     'componentsTheme',
     'keepCssVars',
+    'removeDevDependenciesDuringDockerBuild'
 ];

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

@@ -55,6 +55,7 @@ function getDefaults() {
         debug: false,
         overridesPath: overridesPath ? [overridesPath] : [],
         statsOutputFilename: 'stats.json',
+        removeDevDependenciesDuringDockerBuild: true,
         componentsTheme: undefined,
         keepCssVars: false,
         // Эти пути зависят от других настроек, которые могут быть переопределены пользователем

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

@@ -29,6 +29,7 @@ export declare type AppConfigs = {
     debug: boolean;
     overridesPath: string[];
     statsOutputFilename: string;
+    removeDevDependenciesDuringDockerBuild: boolean;
     componentsTheme: string | undefined;
     keepCssVars: boolean;
     publicPath: string;

package/build/configs/util/register-ts-node.js

@@ -8,8 +8,10 @@ require('ts-node')
         target: 'ES2016',
         module: 'CommonJS',
         skipLibCheck: true,
+        allowJs: false,
         allowSyntheticDefaultImports: true,
         moduleResolution: 'node',
         esModuleInterop: true,
     },
+    skipProject: true,
 });

package/build/templates/start.template.js

@@ -18,8 +18,12 @@ cat ./nginx.conf \\
     | sed 's/~~\\([a-zA-Z0-9_-]\\{1,\\}\\)~~/$\\1/g' \\
     > /etc/nginx/conf.d/default.conf
 
-# Достаем лимит памяти из cgroup, это то, как его докер задает.  https://shuheikagawa.com/blog/2017/05/27/memory-usage/
-max_total_memory=$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes)
+# Достаем лимит памяти из cgroup, это то, как его докер задает.
+if [[ -f /sys/fs/cgroup/cgroup.controllers ]]; then
+   max_total_memory=$(cat /sys/fs/cgroup/memory.max)
+else
+   max_total_memory=$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes)
+fi
 # Самой nodejs мы не можем отдать совсем всю память, операционная система+nginx все же требуют какого то количества.
 # Поэтому мы вычитаем 100мб на нужды ос
 node_memory_limit="$(($max_total_memory / 1024 / 1024 - 100))"

package/build/tsconfig-local.tsbuildinfo

@@ -597,13 +597,13 @@
         "affectsGlobalScope": false
       },
       "../src/configs/util/register-ts-node.ts": {
-        "version": "e69958949659a3b7ac7871be78c8035762c217068bdb8a351da80d4f7454d4f1",
+        "version": "a806ff42cf28f9ceb3b5e73b8683bf3f820946226669351f626c900d780f6436",
         "signature": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
         "affectsGlobalScope": true
       },
       "../src/configs/app-configs/types.ts": {
-        "version": "e32939029d8674a8248080e6baff3883c7957cf93d35b1d6c1b80e09aa70de7a",
-        "signature": "0452e36d13b7ee697c72289e9b1866656c9517de5d6d49cb3dcd459bd7f3ef3d",
+        "version": "26d68b5ad7a9a6e47346984c915611d452f560764aaec153e014bc8f6588221c",
+        "signature": "d515261b42d96bab440c2b496fdbef1e4caf0fbdb16f32d3984d80fb37266d2d",
         "affectsGlobalScope": false
       },
       "../src/configs/util/try-resolve.ts": {
@@ -612,7 +612,7 @@
         "affectsGlobalScope": false
       },
       "../src/configs/app-configs/get-defaults.ts": {
-        "version": "ec624bb92786ce134582662ae85fb276dffac7ca4fa855b14564f62243c93cc8",
+        "version": "d3ac931c5bc4b57982ec4bf4505f63921b676fea862fa27f865d41afd01b4419",
         "signature": "32ce4848d302065a0608781a400430ff0f4fb5757a501c614f3ab8aaad45afd0",
         "affectsGlobalScope": false
       },
@@ -692,8 +692,8 @@
         "affectsGlobalScope": false
       },
       "../src/configs/app-configs/available-package-settings.ts": {
-        "version": "ee822b78f86e38080903a1c9df6709027d79c78a217c7ea97aa5ffe8e47fd3e6",
-        "signature": "32945b08e981ce48ed91837d6acf258f8d0243fcee5f4900599055d441205e37",
+        "version": "d8870fed947c21ef7cd799f019e27b205e47d3d2eb6bbd1699a511abea07e156",
+        "signature": "670a083c7ad4c5ddc8f95b5c48f5e099d7fd11e3b4b7846b0a3b7078fba86813",
         "affectsGlobalScope": false
       },
       "../src/configs/app-configs/update-with-env.ts": {
@@ -792,7 +792,7 @@
         "affectsGlobalScope": false
       },
       "../src/templates/start.template.ts": {
-        "version": "545c8001c5ff6d1dbcf46c60b061cd8a36d0a4a79e72d8c2f0653341ce96264a",
+        "version": "880f33b82d22e208683f9096f25507b29f038c0ac42858f4bae39edb1dd988c6",
         "signature": "0fffbf1a5f54522ff7b89592bab1cf72966d7bdc613d52b0087717fcfec14b29",
         "affectsGlobalScope": false
       },
@@ -1247,7 +1247,7 @@
         "affectsGlobalScope": false
       },
       "../src/commands/docker-build/index.ts": {
-        "version": "a542e91b8bab577125795efd413730aec19e881b61fc1681cf567bb8ed4f4dee",
+        "version": "1b5c4842fdd8a6f8c3da38afa0b4eab277f567bd0161cb5cc01f707fc2f7e2a3",
         "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
         "affectsGlobalScope": false
       },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "arui-scripts",
-    "version": "12.3.0",
+    "version": "12.5.0-alfa.0",
     "main": "./build/index.js",
     "typings": "./build/index.d.ts",
     "license": "MPL-2.0",

package/release.config.js

@@ -10,6 +10,7 @@ module.exports = {
         '@semantic-release/release-notes-generator',
         '@semantic-release/changelog',
         '@semantic-release/npm',
+        '@semantic-release/git'
     ],
     branches: [
         { name: 'master' },