From eff4ed11d60368365394ea39c167cd3df394c7e5 Mon Sep 17 00:00:00 2001 From: Rajnikant Lodhi Date: Thu, 14 Jul 2022 11:08:26 +0530 Subject: [PATCH 1/3] I upadate package @synk/protect instead of "snyk": "^1.915.0" --- package.json | 4 ++-- yarn.lock | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 513d0e93..dd53fbe0 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "prebuildforelectron": "node set-variables-in-env.js --set src/environments/environment.electron.prod.ts", "postbuildforelectron": "node set-variables-in-env.js --unset src/environments/environment.electron.prod.ts", "postinstall": "ngcc --properties es5 browser module main --first-only --create-ivy-entry-points && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points", - "snyk-protect": "snyk protect", + "snyk-protect": "snyk-protect", "prepare": "yarn run snyk-protect" }, "private": true, @@ -53,6 +53,7 @@ "@angular/platform-browser-dynamic": "^13.3.5", "@angular/router": "^13.3.5", "@sentry/browser": "^6.14.1", + "@snyk/protect": "^1.972.0", "@types/jest": "^27.0.2", "@types/mocha": "^9.1.1", "@types/react": "^17.0.34", @@ -82,7 +83,6 @@ "rxjs": "^6.6.7", "rxjs-compat": "^6.6.7", "save-svg-as-png": "^1.4.17", - "snyk": "^1.915.0", "spark-md5": "^3.0.2", "svg-crowbar": "^0.7.0", "tree-kill": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index 359e5af0..5b80591c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1618,6 +1618,11 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@snyk/protect@^1.972.0": + version "1.972.0" + resolved "https://registry.yarnpkg.com/@snyk/protect/-/protect-1.972.0.tgz#fe878eed10887e683f3a131f07c3ea583a908a56" + integrity sha512-Yj5Spug6t/rcjjvtK9JL4dBlkSDR+LzJqQ5O3yQxswqiRVGFu746LRIB04x1x4uw//bzsTr3GS5F46/F9rGbAw== + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -8511,11 +8516,6 @@ smart-buffer@^4.0.2, smart-buffer@^4.2.0: resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -snyk@^1.915.0: - version "1.947.0" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.947.0.tgz#98d033367e0533d9c35302d207e17aa9aa5d6843" - integrity sha512-/u+HyhaIaFhnrpn+aOiGR0ts9ZR7mr6uiqgRn5EQIwaFKpCFOEnOJTlQAM25ggomqmxRldArMMXe4dBWw855LA== - socket.io-adapter@~2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" From fe7f65c723c8f8a1460036e54e8e9e709f54181a Mon Sep 17 00:00:00 2001 From: Rajnikant Lodhi Date: Thu, 14 Jul 2022 16:10:33 +0530 Subject: [PATCH 2/3] add a path of tsconfig.base.json file in tsconfig --- tsconfig.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tsconfig.json b/tsconfig.json index 26abde9a..137dfd94 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,6 +12,9 @@ }, { "path": "./src/tsconfig.spec.json" + }, + { + "path": "tsconfig.base.json" } ] } \ No newline at end of file From 1cd479751fb00a5a2815340495944c67704cbb70 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 15 Jul 2022 00:11:28 +0200 Subject: [PATCH 3/3] Set --tsconfig "./src/tsconfig.app.json" in package.json --- package.json | 2 +- tsconfig.json | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index dd53fbe0..70f228cd 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "generate-licenses-file": "yarn license-checker --production --csv --out licenses.csv", "prebuildforelectron": "node set-variables-in-env.js --set src/environments/environment.electron.prod.ts", "postbuildforelectron": "node set-variables-in-env.js --unset src/environments/environment.electron.prod.ts", - "postinstall": "ngcc --properties es5 browser module main --first-only --create-ivy-entry-points && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points", + "postinstall": "ngcc --properties es5 browser module main --first-only --create-ivy-entry-points --tsconfig \"./src/tsconfig.app.json\" && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig \"./src/tsconfig.app.json\"", "snyk-protect": "snyk-protect", "prepare": "yarn run snyk-protect" }, diff --git a/tsconfig.json b/tsconfig.json index 137dfd94..343f21cd 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,9 +12,6 @@ }, { "path": "./src/tsconfig.spec.json" - }, - { - "path": "tsconfig.base.json" } ] -} \ No newline at end of file +}