From fcf848e23f416a6081f358354fc8a5bf5a92303c Mon Sep 17 00:00:00 2001 From: VitoAlbano Date: Mon, 5 Aug 2024 13:58:39 +0100 Subject: [PATCH] [MIGRATION] - added reference to @types also to general node_modules --- .github/workflows/pull-request.yml | 1 - .github/workflows/release-branch.yml | 1 - .github/workflows/release.yml | 1 - lib/cli/package-lock.json | 19 ++++++++++++++----- lib/cli/package.json | 2 +- lib/cli/tsconfig.json | 2 +- lib/testing/tsconfig.lib.json | 4 ++-- package-lock.json | 8 ++++---- package.json | 12 ++++++------ 9 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index e63a3d385d..bad82beeb8 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -205,7 +205,6 @@ jobs: - name: install run: | npm ci - npx nx run js-api:bundle npx nx run cli:bundle npx nx run testing:bundle - run: npx nx print-affected $NX_CALCULATION_FLAGS diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml index f4be76f60b..bec76765c7 100644 --- a/.github/workflows/release-branch.yml +++ b/.github/workflows/release-branch.yml @@ -97,7 +97,6 @@ jobs: - name: install run: | npm ci - npx nx run js-api:bundle npx nx run cli:bundle npx nx run testing:bundle - uses: ./.github/actions/upload-node-modules-and-artifacts diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b706323b6..28ba06261f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -102,7 +102,6 @@ jobs: - name: install run: | npm ci - npx nx run js-api:bundle npx nx run cli:bundle npx nx run testing:bundle - uses: ./.github/actions/upload-node-modules-and-artifacts diff --git a/lib/cli/package-lock.json b/lib/cli/package-lock.json index 707fb03745..0a0d7dc7bd 100644 --- a/lib/cli/package-lock.json +++ b/lib/cli/package-lock.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@types/ejs": "^3.1.2", - "@types/node": "^20.1.7", + "@types/node": "^20.14.14", "@types/shelljs": "^0.8.12", "typescript": "^4.9.5" } @@ -62,10 +62,13 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.1.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.7.tgz", - "integrity": "sha512-WCuw/o4GSwDGMoonES8rcvwsig77dGCMbZDrZr2x4ZZiNW4P/gcoZXe/0twgtobcTkmg9TuKflxYL/DuwDyJzg==", - "dev": true + "version": "20.14.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.14.tgz", + "integrity": "sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/shelljs": { "version": "0.8.12", @@ -1229,6 +1232,12 @@ "node": ">=4.2.0" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/util-extend": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", diff --git a/lib/cli/package.json b/lib/cli/package.json index 3ea3475faf..3f3a64d70f 100644 --- a/lib/cli/package.json +++ b/lib/cli/package.json @@ -35,7 +35,7 @@ "license": "Apache-2.0", "devDependencies": { "@types/ejs": "^3.1.2", - "@types/node": "^20.1.7", + "@types/node": "^20.14.14", "@types/shelljs": "^0.8.12", "typescript": "^4.9.5" } diff --git a/lib/cli/tsconfig.json b/lib/cli/tsconfig.json index 77703f589a..0bb5bfa9e3 100644 --- a/lib/cli/tsconfig.json +++ b/lib/cli/tsconfig.json @@ -19,7 +19,7 @@ "target": "es2018", "lib": ["es2018", "dom"], "baseUrl": ".", - "typeRoots": ["node_modules/@types"], + "typeRoots": ["node_modules/@types", "../../node_modules/@types"], "types": ["node"], "paths": { "@alfresco/js-api": ["../../dist/libs/js-api"], diff --git a/lib/testing/tsconfig.lib.json b/lib/testing/tsconfig.lib.json index d6772281bc..837bd0d5c7 100644 --- a/lib/testing/tsconfig.lib.json +++ b/lib/testing/tsconfig.lib.json @@ -6,8 +6,8 @@ "declarationMap": true, "resolveJsonModule": true, "paths": { - "@alfresco/js-api": ["../../../dist/libs/js-api"], - "@alfresco/js-api/*": ["../../../dist/libs/js-api/*"] + "@alfresco/js-api": ["../../dist/libs/js-api"], + "@alfresco/js-api/*": ["../../dist/libs/js-api/*"] } } } diff --git a/package-lock.json b/package-lock.json index e6e9162ee8..b6142d1326 100644 --- a/package-lock.json +++ b/package-lock.json @@ -88,7 +88,7 @@ "@types/jsdom": "^21.1.5", "@types/minimatch": "^3.0.3", "@types/mocha": "^10.0.6", - "@types/node": "^20.10.0", + "@types/node": "^20.14.14", "@types/pdfjs-dist": "^2.10.378", "@types/selenium-webdriver": "^4.1.17", "@types/shelljs": "^0.8.15", @@ -12313,9 +12313,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.14.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.12.tgz", - "integrity": "sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==", + "version": "20.14.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.14.tgz", + "integrity": "sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ==", "dependencies": { "undici-types": "~5.26.4" } diff --git a/package.json b/package.json index 5c389fb2e4..ad64a84fec 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,10 @@ "@editorjs/list": "1.9.0", "@editorjs/marker": "1.4.0", "@editorjs/underline": "1.1.0", + "@nx/angular": "16.10.0", + "@nx/eslint-plugin": "16.10.0", "@nx/js": "16.10.0", + "@nx/node": "16.10.0", "@nx/storybook": "^19.5.6", "@nx/workspace": "16.10.0", "@paperist/types-remark": "0.1.3", @@ -126,7 +129,7 @@ "@types/jsdom": "^21.1.5", "@types/minimatch": "^3.0.3", "@types/mocha": "^10.0.6", - "@types/node": "^20.10.0", + "@types/node": "^20.14.14", "@types/pdfjs-dist": "^2.10.378", "@types/selenium-webdriver": "^4.1.17", "@types/shelljs": "^0.8.15", @@ -199,11 +202,8 @@ "typescript": "5.1.6", "webdriver-manager": "12.1.9", "webpack": "^5.90.3", - "webpack-cli": "^5.1.4", - "@nx/eslint-plugin": "16.10.0", - "@nx/node": "16.10.0", - "@nx/angular": "16.10.0" - }, + "webpack-cli": "^5.1.4" + }, "license": "Apache-2.0", "bundlesize": [ {