From 74a18b1de6a8bc8517520adf3f9319b56317f8b7 Mon Sep 17 00:00:00 2001 From: Dariusz Filipiak Date: Tue, 4 Jun 2024 11:21:51 +0200 Subject: [PATCH] feat: proper ignore cli --- .editorconfig | 18 ++++++++++++++++++ .gitignore | 4 ---- .vscode/settings.json | 8 ++++---- README.md | 2 +- package.json | 8 ++++---- projects/container-v4/package.json | 8 ++++---- src/assets/shared/shared_folder_info.txt | 2 +- src/cli.ts | 3 ++- 8 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..578226e7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ + +# Editor configuration, see http://editorconfig.org +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.ts] +quote_type = single + + +[*.md] +max_line_length = off +trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index 96f16c25..5da57352 100644 --- a/.gitignore +++ b/.gitignore @@ -37,10 +37,6 @@ Thumbs.db /backup /module /www -/.eslintrc.json -/.prettierignore -/.prettierrc -/.editorconfig /Thumbs.db /.DS_Store /**/.DS_Store diff --git a/.vscode/settings.json b/.vscode/settings.json index 32223812..ae7d2c56 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,10 +17,6 @@ "backup": true, "module": true, "www": true, - ".eslintrc.json": true, - ".prettierignore": true, - ".prettierrc": true, - ".editorconfig": true, "Thumbs.db": true, ".DS_Store": true, "**/.DS_Store": true, @@ -45,6 +41,10 @@ ".npmignore": true, ".babelrc": true, ".npmrc": true, + ".eslintrc.json": true, + ".prettierignore": true, + ".prettierrc": true, + ".editorconfig": true, "devDependencies.json": true, "package.json": true, "logo.svg": true diff --git a/README.md b/README.md index 63fceab6..7c735444 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ (for windows only git bash supported https://gitforwindows.org) -2. (linux only) Increased memory limit: +2. Increased memory limit: ``` export NODE_OPTIONS=--max_old_space_size=4096 ``` diff --git a/package.json b/package.json index 8898dc1e..eabea8e7 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "homepage": "https://github.com/darekf77/firedev#readme" }, "name": "firedev", - "version": "16.100.16", + "version": "16.100.18", "description": "Isomorphic solution for backend and frontend", "scripts": {}, "repository": { @@ -67,7 +67,7 @@ "ora": "3.4.0", "socket.io": "2.4.1", "tslib": "~2.3.0", - "tnp": "~16.100.22" + "tnp": "~16.100.32" }, "license": "MIT", "private": false, @@ -334,9 +334,9 @@ "threads": "1.7.0", "tnp-cli": "16.100.5", "tnp-config": "16.100.10", - "tnp-core": "16.100.22", + "tnp-core": "16.100.23", "tnp-db": "16.100.9", - "tnp-helpers": "16.100.20", + "tnp-helpers": "16.100.25", "tnp-models": "16.100.10", "ts-debug": "1.3.0", "ts-json-schema-generator": "2.1.1", diff --git a/projects/container-v4/package.json b/projects/container-v4/package.json index 103cb6e5..3ba513ad 100644 --- a/projects/container-v4/package.json +++ b/projects/container-v4/package.json @@ -416,6 +416,7 @@ "file-loader": "1.1.5", "file-saver": "2.0.5", "file-type": "18.5.0", + "firedev": "^16", "firedev-crud": "16.100.10", "firedev-crud-deamon": "16.100.9", "firedev-ports": "16.100.10", @@ -544,9 +545,9 @@ "threads": "1.7.0", "tnp-cli": "16.100.5", "tnp-config": "16.100.10", - "tnp-core": "16.100.22", + "tnp-core": "16.100.23", "tnp-db": "16.100.9", - "tnp-helpers": "16.100.20", + "tnp-helpers": "16.100.25", "tnp-models": "16.100.10", "ts-debug": "1.3.0", "ts-json-schema-generator": "2.1.1", @@ -570,8 +571,7 @@ "webpack-dev-middleware": "~6.0.2", "webpack-dev-server": "~4.13.2", "yup": "1.1.1", - "zone.js": "~0.13.0", - "firedev": "^16" + "zone.js": "~0.13.0" }, "devDependencies": {}, "license": "UNLICENSED", diff --git a/src/assets/shared/shared_folder_info.txt b/src/assets/shared/shared_folder_info.txt index 9c8dcdf3..d2f1fb7c 100644 --- a/src/assets/shared/shared_folder_info.txt +++ b/src/assets/shared/shared_folder_info.txt @@ -1,6 +1,6 @@ THIS FILE IS GENERATED. THIS FILE IS GENERATED. THIS FILE IS GENERATED. -Assets from this folder are being shipped with this npm package (firedev@16.100.16) +Assets from this folder are being shipped with this npm package (firedev@16.100.18) created from this project. THIS FILE IS GENERATED.THIS FILE IS GENERATED. THIS FILE IS GENERATED. diff --git a/src/cli.ts b/src/cli.ts index 6a2e8876..76d6dc94 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -1,4 +1,5 @@ -let tnpStart = require('tnp/src').start; +// @firedev-ignore +let tnpStart = require('tnp/cli').start; //#region @notForNpm let tnpStartLocal = require('tnp/src').start; //#endregion