From deac1d088d510e9137d89c97175f0bbdc23963b3 Mon Sep 17 00:00:00 2001 From: Nev <54870357+MSNev@users.noreply.github.com> Date: Tue, 3 Feb 2026 14:38:59 -0800 Subject: [PATCH] chore: Update Dependencies - @microsoft/rush - @nevware21/ts-utils - @nevware21/ts-async --- AISKU/package.json | 6 +- AISKULight/package.json | 4 +- channels/1ds-post-js/package.json | 4 +- .../package.json | 4 +- channels/offline-channel-js/package.json | 4 +- channels/tee-channel-js/package.json | 4 +- common/Tests/Framework/package.json | 4 +- common/config/rush/npm-shrinkwrap.json | 130 ++++---- common/scripts/install-run-rush.js | 34 +- common/scripts/install-run.js | 310 +++++++++++------- examples/AISKU/package.json | 2 +- examples/cfgSync/package.json | 2 +- examples/dependency/package.json | 2 +- examples/shared-worker/package.json | 2 +- examples/startSpan/package.json | 2 +- .../package.json | 2 +- .../package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- package.json | 2 +- rush.json | 2 +- shared/1ds-core-js/package.json | 6 +- shared/AppInsightsCommon/package.json | 2 +- shared/AppInsightsCore/package.json | 4 +- tools/chrome-debug-extension/package.json | 4 +- tools/shims/package.json | 2 +- 30 files changed, 310 insertions(+), 248 deletions(-) diff --git a/AISKU/package.json b/AISKU/package.json index 7b752a5cb..7d4bbcabd 100644 --- a/AISKU/package.json +++ b/AISKU/package.json @@ -40,7 +40,7 @@ "finalhandler": "^1.1.1", "grunt": "^1.5.3", "grunt-cli": "^1.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", "@nevware21/grunt-ts-plugin": "^0.4.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "globby": "^11.0.0", @@ -71,8 +71,8 @@ "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/applicationinsights-dependencies-js": "3.3.11", "@microsoft/applicationinsights-properties-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "license": "MIT" } diff --git a/AISKULight/package.json b/AISKULight/package.json index c9f6acea2..e249b0624 100644 --- a/AISKULight/package.json +++ b/AISKULight/package.json @@ -60,8 +60,8 @@ "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-channel-js": "3.3.11", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "license": "MIT" } diff --git a/channels/1ds-post-js/package.json b/channels/1ds-post-js/package.json index a9118356e..9b91d2300 100644 --- a/channels/1ds-post-js/package.json +++ b/channels/1ds-post-js/package.json @@ -28,8 +28,8 @@ "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/1ds-core-js": "4.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "devDependencies": { "@microsoft/ai-test-framework": "0.0.1", diff --git a/channels/applicationinsights-channel-js/package.json b/channels/applicationinsights-channel-js/package.json index f2e1758fd..ef0d085c8 100644 --- a/channels/applicationinsights-channel-js/package.json +++ b/channels/applicationinsights-channel-js/package.json @@ -58,8 +58,8 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "license": "MIT" } diff --git a/channels/offline-channel-js/package.json b/channels/offline-channel-js/package.json index 957c77b50..346fa7001 100644 --- a/channels/offline-channel-js/package.json +++ b/channels/offline-channel-js/package.json @@ -32,8 +32,8 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "peerDependencies": { "tslib": ">= 1.0.0" diff --git a/channels/tee-channel-js/package.json b/channels/tee-channel-js/package.json index 22e3f32ea..4d943ca4f 100644 --- a/channels/tee-channel-js/package.json +++ b/channels/tee-channel-js/package.json @@ -59,8 +59,8 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "license": "MIT" } diff --git a/common/Tests/Framework/package.json b/common/Tests/Framework/package.json index cd78a0517..bd8b25913 100644 --- a/common/Tests/Framework/package.json +++ b/common/Tests/Framework/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" } } diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json index df3c28540..9c3327460 100644 --- a/common/config/rush/npm-shrinkwrap.json +++ b/common/config/rush/npm-shrinkwrap.json @@ -12,8 +12,8 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -723,12 +723,12 @@ "node_modules/@rush-temp/1ds-core-js": { "version": "0.0.0", "resolved": "file:projects/1ds-core-js.tgz", - "integrity": "sha512-sV6VNr0t85iRwV3eQfxfZWRDLLB3LdUWZ7B//XQoHCYnzE9VknRJ2r0D16ciFXDHiW6Iag92lf8zzYHhhMfIrg==", + "integrity": "sha512-I13YbsFizUkWTZQl4Xd2EWcq0wdtGmoewed3ZmwmXrcS/rtF9JfzxloVd+ne4aHY+Y+q0wTJCLHA6paZ9u999g==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -751,12 +751,12 @@ "node_modules/@rush-temp/1ds-post-js": { "version": "0.0.0", "resolved": "file:projects/1ds-post-js.tgz", - "integrity": "sha512-6GyZVvCSQHDgQAMpNd8kxIcjxP+/Fj+5QCFOWY3ry0BuaiIuj9SpAyMhL7qJJxG4tCBWuxxUIF/PE2y0Ocq87g==", + "integrity": "sha512-lo/Bt3HnpvTLuVd/zme6ny5sh2TZsXtvy9DEK8KfkszpzyM9Eo/4SpmbymkZfU+KWGaKsNv3nvaa7dyb+UMAAA==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -774,12 +774,12 @@ "node_modules/@rush-temp/ai-test-framework": { "version": "0.0.0", "resolved": "file:projects/ai-test-framework.tgz", - "integrity": "sha512-1IXYBUsH3c0y4355BstSfEWUXvoBm8YTHrFHgp3hAznqfYMLrz3dZMpHJlg9sLMLbQy2CZJSwTndWRekE4Ujug==", + "integrity": "sha512-LrTIJ1nC55SeW6KjK/eaHgOgl0Gf5ckTItecXx5SlFgH43HqiCl3ZAqOXIs43IzgF6CJHOtCF6d2lIssgz0Yvg==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -800,13 +800,13 @@ "node_modules/@rush-temp/applicationinsights-analytics-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-analytics-js.tgz", - "integrity": "sha512-Ni9Enj/Le/qnsgCRABSlaOHH8ma6OPhRW7RuIZyDelTD8XP8cQL8Joa+Ng608teAcajT0v2f/FdVFebE/j3Ywg==", + "integrity": "sha512-wfJb7njpoWhFawjGUq/8n1oSWczxT2zheUxxjINFuwi2zNsTnhvEU2geN01Rv1F87ZyMLouc6UNBNN6rH38P4w==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -828,14 +828,14 @@ "node_modules/@rush-temp/applicationinsights-cfgsync-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-cfgsync-js.tgz", - "integrity": "sha512-B3titPfeIiUFSV55pG6WRWWb+sObg+hdPkCMaVKySVoRCIfzjJCSTXaETtsR9ylinXU1Kxj9zsTAQv1VAxF/aA==", + "integrity": "sha512-uP5pd87yqb+qT7KS+xex41Nafw3zx/RaiC+XybpP5Xyx2zLUrX4dda9QVdKDjxAMzGTplEY1kRz01XC3X08iWA==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -857,14 +857,14 @@ "node_modules/@rush-temp/applicationinsights-channel-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-channel-js.tgz", - "integrity": "sha512-ojWUfmLGqa68QfCtSaAgeFaeTH26sG20Ih4Je4q9OHNnIVV+pxg4JgKfpXbZmKkyx0/aaJgjAsgnBY1xs3a4hg==", + "integrity": "sha512-H59C3nak4fwjdK3KlOzVlIZkkOkOMYvvnxJIzdw2LUMPJrgVLgNDRDGC5O74tMGIQKlrcuod41TtnIrYluNLIg==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -885,13 +885,13 @@ "node_modules/@rush-temp/applicationinsights-chrome-debug-extension": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-chrome-debug-extension.tgz", - "integrity": "sha512-aNAkiIlav3gxNG+UXDOzCHhsD9FFIDMc2cs6jqnRseZle8ob/aejGChjKp078hOs+Ix9zEt8FuyC4ptn+jKm9w==", + "integrity": "sha512-hiG0yG4DFdGaRILqkbUaUseG9B5qNROhFmVIzpoQ7b7p9UTG+ihcYOJGC6AiBRdLbjpY2RHGr27ujYzH8Cfzdw==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -921,13 +921,13 @@ "node_modules/@rush-temp/applicationinsights-clickanalytics-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-clickanalytics-js.tgz", - "integrity": "sha512-1aP2WKWqBGqbjtxaL62dOq8VFk2+2tAKxeTSiiX7MNd521XhjHc4xUbDEe8gMC7agaY4H2hkd9AwY2sn5I9JiA==", + "integrity": "sha512-aIeQwariRHMO6X3znhk/nKC3AcOjxImNZxwYbGuqEscve5h1dF5i4FolWBiBz11jRg6JMHlJ8phhqmdHB5oZFA==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -946,13 +946,13 @@ "node_modules/@rush-temp/applicationinsights-common": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-common.tgz", - "integrity": "sha512-NPMVYrYJb0uAZlDT1Itb5ya0vdiUKiDZM9Q6UA+EWZU+634dRntv3rGPT3PcWLutqriIMElh57TYAARTxeirNA==", + "integrity": "sha512-eAM+wMN+qARD4Ta7DGq5ynV3PgRbD+yvEFp6dyIvyfNMxlznzDG04ysGD+EQUlfUsQAiYfGnGarbBHf5d3/vCg==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -972,14 +972,14 @@ "node_modules/@rush-temp/applicationinsights-core-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-core-js.tgz", - "integrity": "sha512-xdr5kdi6NN03BdpmSj+kZbLQG08HpyDcyxHEzGpK2yER5+lfmBINTeouTmEJ6ZVuo0oreHIYka1ERHXWn7iIkQ==", + "integrity": "sha512-wJBmltVy6LDrUiBUo2fDA5kEsftT9Q7gIuqfE53Dsf+s7ue5bAgvCKKvn5ChrjY9EANNb25CCx3lLZ+LkuE1RA==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1001,13 +1001,13 @@ "node_modules/@rush-temp/applicationinsights-debugplugin-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-debugplugin-js.tgz", - "integrity": "sha512-hEZ95vYGtREkFxMiSAyM3AkjgIt9PcsIVtbLDH39dPfPTNy8mCyywFSKPSLFuuEzYHOjUW1dWLi+1fQLyyjwQg==", + "integrity": "sha512-g3yxVCq8Zng45+lLFcHGiWAxdiERgLIoUNVg4I7RZtkjH6npBahDIMSfneOxyJEPOZzN09J2ra1RI0yIGh4FYA==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1026,14 +1026,14 @@ "node_modules/@rush-temp/applicationinsights-dependencies-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-dependencies-js.tgz", - "integrity": "sha512-prvNZHFYxbDdViRX9iqWMYSqE/6SkWJJuTtlvA7Oo/q2bHBgCySs35TtVGrf3pDGrBsJCskOaEcBfQAdSqJFPA==", + "integrity": "sha512-Az3r/mDVmEWo/BgVgyRq1OeMJFpwLE7+qoS0p3i6rwr59ocDlHBQipBmcWO4BOO/WGIcKE9/RfFbDsfwUcaStw==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1054,10 +1054,10 @@ "node_modules/@rush-temp/applicationinsights-example-aisku": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-example-aisku.tgz", - "integrity": "sha512-oyYVOZf689rSAMfxlnfdpaDqMwNJDf2Q+QDY6yIx5OxUqwgvg4R11B8ZIqQVbvabAZxLK3MC+WilJc3nlu9GSA==", + "integrity": "sha512-jgyGQbmjQlaeoVN81/fBmJPHoLMRqtKe2wnAjp05BFRIuXUC0Sf1qY2gjLDsgvnVYl7c4DtWADnzO3MWKG6YYg==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1073,12 +1073,12 @@ "node_modules/@rush-temp/applicationinsights-example-cfgsync": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-example-cfgsync.tgz", - "integrity": "sha512-hfniiVlg6PmR+T453y+ATu1UAtSa0tultNGH3QLjbXNkHaDx11CrssYM9cPfWMRDXsDEfH7M0m2TgyrThDhn+g==", + "integrity": "sha512-7dEnYnyD5ZhWCuong2ZUMTS89n0ub4HxFtW4hJzpD7n74onG/VD7qM0oWfrYEyRBUAyARuLOF75cZhg+9mmYAQ==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1099,10 +1099,10 @@ "node_modules/@rush-temp/applicationinsights-example-dependencies": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-example-dependencies.tgz", - "integrity": "sha512-AJPGqkSDoSFt9Bwt5YnWiKssyRbkfzlcEl5gNncNGkiorz8fAGDDqoQQWAtcrdH+UuSnpdlxSyDLQcl0Y86sLg==", + "integrity": "sha512-8qOzUKh+KpTzu5bhL37ro5GB5OWXMsheYX7K9bsOWgXOnr4pxeeve1L4WE3i3W6SnXYPmAJdaiFu2SzUBbhSfQ==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1118,12 +1118,12 @@ "node_modules/@rush-temp/applicationinsights-example-shared-worker": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-example-shared-worker.tgz", - "integrity": "sha512-JV2DUiAu9/rC2DAZi82jkP1h0eSQBCWqknumUmj7sUepHJ7OcJFNpJ0c+6aAhuM/rBrupgPo4lD1s/ibFozZ1g==", + "integrity": "sha512-MmD/A8thCanYxfbH/YRQq8qH9aAz0AuHHisfvq5EaVywqEcoSvPt8uzzPnr8Bdxpr8uQotI5GaWCbbwMGUlH+g==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1144,10 +1144,10 @@ "node_modules/@rush-temp/applicationinsights-example-startspan": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-example-startspan.tgz", - "integrity": "sha512-evZKECYEMMoSou5ih9d2BzApf4xVfdQzshhwhtNRZJsY34sk4CU2R5ZxBPs3Dl7IcTONgSSHFluOC7KX55PFxQ==", + "integrity": "sha512-x/vhkhOmGEm/K5MFQ5oP6jodpZx7Qeo/jFhlVK3SPMV3XDZ8xcxWcV2tjpwSXPaKBQz+xN+yayoBEHW5e6/nvA==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1172,14 +1172,14 @@ "node_modules/@rush-temp/applicationinsights-offlinechannel-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-offlinechannel-js.tgz", - "integrity": "sha512-bAWCA4zZh2IXvUJGBTfsU0Agndlnx/zSkFs1K1BMY6jAEy26kjI77yNhE3F1eHlttOSWWIxYWZ9xLVg/eb+Dpw==", + "integrity": "sha512-HPT+sfK1IHa482G1+kfZg756FITSgFnkJ9TfJQOixBguWzQS6QB5L871MVXThCKRZdSmjzb6eZYl8wLVs7RvnQ==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1200,12 +1200,12 @@ "node_modules/@rush-temp/applicationinsights-osplugin-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-osplugin-js.tgz", - "integrity": "sha512-9Be4B4Nue46rmQOO9/5X8lHy7CFClSA2VhtOSf6bNChP4gMOUaRHtqdGPa4xakHhIGitufTt07NlcozFQViegA==", + "integrity": "sha512-jWlnGs25+hzKf6Jino/Az6/LV4/+3LMyHsY4Pwyv+8zY4gdkZlr6/7BvHPSVBEQSHabBSXNQ2klw9eNcbitVmw==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1223,13 +1223,13 @@ "node_modules/@rush-temp/applicationinsights-perfmarkmeasure-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-perfmarkmeasure-js.tgz", - "integrity": "sha512-70yennADpd/qMfoVnwjwHrkR3xSmpARH/56VmTHnF3Kdm7SKS5NTzFk3WCOZtnN3fuiyqIfUJ6FOXwijFRgJQw==", + "integrity": "sha512-ducECCRjLtdd7+Iqw3x/1lGdo18oBTVDnViJuqjrjNQg0Fb2W5TVi1sVciiyN3vjVKe1QIho9L8a7mPvQJBB9Q==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1249,13 +1249,13 @@ "node_modules/@rush-temp/applicationinsights-properties-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-properties-js.tgz", - "integrity": "sha512-6QUJAjdMG0cjw3R/AD6X55ko95aUVgbFBvgfJqbypNutE6bOcyFhqECMTSsW/byQmpZH1pV4vzRn7o0zQ0clKA==", + "integrity": "sha512-MtCaHhrGxUHyyJwgNkbRg4Wegrk0vH91Rd+I6Iv3CSks4pyxed9kcNn3N/HIdWEMkS1n3XevK7GWC0UzG5BrUw==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1320,12 +1320,12 @@ "node_modules/@rush-temp/applicationinsights-shims": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-shims.tgz", - "integrity": "sha512-/LDrKuajGdS1Se/oG6SC6Wf+8VTV/CkEeR1NQ+SueKM8U1G1MlQSAs+K5w3i9zCbYS1oikk5OjHUYDwKokO2EQ==", + "integrity": "sha512-LtOFSdv4T85zQ0iZErWcX1a7BONsx2QUqjpWtWhf2Qp/eWBZwoyLKpDAuFkxgByr/FUBXUzjL86D5/+RUEYOjQ==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1342,14 +1342,14 @@ "node_modules/@rush-temp/applicationinsights-teechannel-js": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-teechannel-js.tgz", - "integrity": "sha512-HeGjRWECidEMZykHxP80H4pkDiKkeqXXs210DZSBaIUqNVEJ6AACZecA+u2M8yKPo42g0UQWgYfCmDXVUJ0pjA==", + "integrity": "sha512-wKeg3Gr8N2TT/VdPyfdKiTQIiPVKc0bNwaBxiEfsm7QlQVKleLXT+kPhUN9D9OSW1H5wXYttNy/+BRkRsnJq5A==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1379,14 +1379,14 @@ "node_modules/@rush-temp/applicationinsights-web": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-web.tgz", - "integrity": "sha512-rgF++eKqFsvgJUYwaqYJlnyahjvqf97+NJev04Ph0VZH97QrIWxwkQMPaydsBYInF07P7mHQjbmJuIxNQ584zw==", + "integrity": "sha512-BFsG8eHPbdUGncBp1dAY528MvdQ4AnEBwjZByKoXcI+gQGulBF7ptvrdbvAJ/4nmPhVGEfbZaN6T0jbKggG/5g==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", @@ -1411,14 +1411,14 @@ "node_modules/@rush-temp/applicationinsights-web-basic": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-web-basic.tgz", - "integrity": "sha512-3mG44RRJZL4MSjJ/l4VxkVMegrIqZHEzNsh+3ASGMqJXT0uu99X5TmbFFcuUstrCLoSY+sXOqaBnAE7ZdUVHfA==", + "integrity": "sha512-8pSCt+QP4Iyrj7lf73EZYVqe2nn8iAdDLgtDsE8+LuRUrI+pkvEDY6RwItjgJZ6jV+glvmdWs9Gka293cJ3lYA==", "dependencies": { "@microsoft/api-extractor": "^7.40.0", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", diff --git a/common/scripts/install-run-rush.js b/common/scripts/install-run-rush.js index ef1d697f9..dc8980d1a 100644 --- a/common/scripts/install-run-rush.js +++ b/common/scripts/install-run-rush.js @@ -16,23 +16,23 @@ /******/ "use strict"; /******/ var __webpack_modules__ = ({ -/***/ 16928: -/*!***********************!*\ - !*** external "path" ***! - \***********************/ +/***/ 176760: +/*!****************************!*\ + !*** external "node:path" ***! + \****************************/ /***/ ((module) => { -module.exports = require("path"); +module.exports = require("node:path"); /***/ }), -/***/ 179896: -/*!*********************!*\ - !*** external "fs" ***! - \*********************/ +/***/ 973024: +/*!**************************!*\ + !*** external "node:fs" ***! + \**************************/ /***/ ((module) => { -module.exports = require("fs"); +module.exports = require("node:fs"); /***/ }) @@ -111,10 +111,10 @@ var __webpack_exports__ = {}; !*** ./lib-esnext/scripts/install-run-rush.js ***! \************************************************/ __webpack_require__.r(__webpack_exports__); -/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! path */ 16928); -/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! fs */ 179896); -/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__); +/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! node:path */ 176760); +/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(node_path__WEBPACK_IMPORTED_MODULE_0__); +/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! node:fs */ 973024); +/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(node_fs__WEBPACK_IMPORTED_MODULE_1__); // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. /* eslint-disable no-console */ @@ -131,9 +131,9 @@ function _getRushVersion(logger) { return rushPreviewVersion; } const rushJsonFolder = findRushJsonFolder(); - const rushJsonPath = path__WEBPACK_IMPORTED_MODULE_0__.join(rushJsonFolder, RUSH_JSON_FILENAME); + const rushJsonPath = node_path__WEBPACK_IMPORTED_MODULE_0__.join(rushJsonFolder, RUSH_JSON_FILENAME); try { - const rushJsonContents = fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync(rushJsonPath, 'utf-8'); + const rushJsonContents = node_fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync(rushJsonPath, 'utf-8'); // Use a regular expression to parse out the rushVersion value because rush.json supports comments, // but JSON.parse does not and we don't want to pull in more dependencies than we need to in this script. const rushJsonMatches = rushJsonContents.match(/\"rushVersion\"\s*\:\s*\"([0-9a-zA-Z.+\-]+)\"/); @@ -159,7 +159,7 @@ function _run() { const [nodePath /* Ex: /bin/node */, scriptPath /* /repo/common/scripts/install-run-rush.js */, ...packageBinArgs /* [build, --to, myproject] */] = process.argv; // Detect if this script was directly invoked, or if the install-run-rushx script was invokved to select the // appropriate binary inside the rush package to run - const scriptName = path__WEBPACK_IMPORTED_MODULE_0__.basename(scriptPath); + const scriptName = node_path__WEBPACK_IMPORTED_MODULE_0__.basename(scriptPath); const bin = _getBin(scriptName); if (!nodePath || !scriptPath) { throw new Error('Unexpected exception: could not detect node path or script path'); diff --git a/common/scripts/install-run.js b/common/scripts/install-run.js index a35726bf1..2b2b91aca 100644 --- a/common/scripts/install-run.js +++ b/common/scripts/install-run.js @@ -16,43 +16,56 @@ /******/ "use strict"; /******/ var __webpack_modules__ = ({ -/***/ 16928: -/*!***********************!*\ - !*** external "path" ***! - \***********************/ -/***/ ((module) => { - -module.exports = require("path"); - -/***/ }), - -/***/ 179896: -/*!*********************!*\ - !*** external "fs" ***! - \*********************/ -/***/ ((module) => { +/***/ 90178: +/*!****************************************************!*\ + !*** ./lib-esnext/utilities/executionUtilities.js ***! + \****************************************************/ +/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { -module.exports = require("fs"); +__webpack_require__.r(__webpack_exports__); +/* harmony export */ __webpack_require__.d(__webpack_exports__, { +/* harmony export */ IS_WINDOWS: () => (/* binding */ IS_WINDOWS), +/* harmony export */ escapeArgumentIfNeeded: () => (/* binding */ escapeArgumentIfNeeded) +/* harmony export */ }); +// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. +// See LICENSE in the project root for license information. +const IS_WINDOWS = process.platform === 'win32'; +function escapeArgumentIfNeeded(command, isWindows = IS_WINDOWS) { + if (command.includes(' ')) { + if (isWindows) { + // Windows: use double quotes and escape internal double quotes + return `"${command.replace(/"/g, '""')}"`; + } + else { + // Unix: use JSON.stringify for proper escaping + return JSON.stringify(command); + } + } + else { + return command; + } +} +//# sourceMappingURL=executionUtilities.js.map /***/ }), -/***/ 370857: -/*!*********************!*\ - !*** external "os" ***! - \*********************/ +/***/ 176760: +/*!****************************!*\ + !*** external "node:path" ***! + \****************************/ /***/ ((module) => { -module.exports = require("os"); +module.exports = require("node:path"); /***/ }), -/***/ 535317: -/*!********************************!*\ - !*** external "child_process" ***! - \********************************/ +/***/ 731421: +/*!*************************************!*\ + !*** external "node:child_process" ***! + \*************************************/ /***/ ((module) => { -module.exports = require("child_process"); +module.exports = require("node:child_process"); /***/ }), @@ -68,10 +81,10 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ syncNpmrc: () => (/* binding */ syncNpmrc), /* harmony export */ trimNpmrcFileLines: () => (/* binding */ trimNpmrcFileLines) /* harmony export */ }); -/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! fs */ 179896); -/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! path */ 16928); -/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__); +/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! node:fs */ 973024); +/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(node_fs__WEBPACK_IMPORTED_MODULE_0__); +/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! node:path */ 176760); +/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(node_path__WEBPACK_IMPORTED_MODULE_1__); // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. // IMPORTANT - do not use any non-built-in libraries in this file @@ -96,8 +109,8 @@ function _trimNpmrcFile(options) { if (linesToPrepend) { npmrcFileLines.push(...linesToPrepend); } - if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath)) { - npmrcFileLines.push(...fs__WEBPACK_IMPORTED_MODULE_0__.readFileSync(sourceNpmrcPath).toString().split('\n')); + if (node_fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath)) { + npmrcFileLines.push(...node_fs__WEBPACK_IMPORTED_MODULE_0__.readFileSync(sourceNpmrcPath).toString().split('\n')); } if (linesToAppend) { npmrcFileLines.push(...linesToAppend); @@ -188,7 +201,7 @@ function _copyAndTrimNpmrcFile(options) { logger.info(`Transforming ${sourceNpmrcPath}`); // Verbose logger.info(` --> "${targetNpmrcPath}"`); const combinedNpmrc = _trimNpmrcFile(options); - fs__WEBPACK_IMPORTED_MODULE_0__.writeFileSync(targetNpmrcPath, combinedNpmrc); + node_fs__WEBPACK_IMPORTED_MODULE_0__.writeFileSync(targetNpmrcPath, combinedNpmrc); return combinedNpmrc; } function syncNpmrc(options) { @@ -198,13 +211,13 @@ function syncNpmrc(options) { // eslint-disable-next-line no-console error: console.error }, createIfMissing = false } = options; - const sourceNpmrcPath = path__WEBPACK_IMPORTED_MODULE_1__.join(sourceNpmrcFolder, !useNpmrcPublish ? '.npmrc' : '.npmrc-publish'); - const targetNpmrcPath = path__WEBPACK_IMPORTED_MODULE_1__.join(targetNpmrcFolder, '.npmrc'); + const sourceNpmrcPath = node_path__WEBPACK_IMPORTED_MODULE_1__.join(sourceNpmrcFolder, !useNpmrcPublish ? '.npmrc' : '.npmrc-publish'); + const targetNpmrcPath = node_path__WEBPACK_IMPORTED_MODULE_1__.join(targetNpmrcFolder, '.npmrc'); try { - if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath) || createIfMissing) { + if (node_fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath) || createIfMissing) { // Ensure the target folder exists - if (!fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(targetNpmrcFolder)) { - fs__WEBPACK_IMPORTED_MODULE_0__.mkdirSync(targetNpmrcFolder, { recursive: true }); + if (!node_fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(targetNpmrcFolder)) { + node_fs__WEBPACK_IMPORTED_MODULE_0__.mkdirSync(targetNpmrcFolder, { recursive: true }); } return _copyAndTrimNpmrcFile({ sourceNpmrcPath, @@ -213,10 +226,10 @@ function syncNpmrc(options) { ...options }); } - else if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(targetNpmrcPath)) { + else if (node_fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(targetNpmrcPath)) { // If the source .npmrc doesn't exist and there is one in the target, delete the one in the target logger.info(`Deleting ${targetNpmrcPath}`); // Verbose - fs__WEBPACK_IMPORTED_MODULE_0__.unlinkSync(targetNpmrcPath); + node_fs__WEBPACK_IMPORTED_MODULE_0__.unlinkSync(targetNpmrcPath); } } catch (e) { @@ -226,7 +239,7 @@ function syncNpmrc(options) { function isVariableSetInNpmrcFile(sourceNpmrcFolder, variableKey, supportEnvVarFallbackSyntax) { const sourceNpmrcPath = `${sourceNpmrcFolder}/.npmrc`; //if .npmrc file does not exist, return false directly - if (!fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath)) { + if (!node_fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath)) { return false; } const trimmedNpmrcFile = _trimNpmrcFile({ sourceNpmrcPath, supportEnvVarFallbackSyntax }); @@ -235,6 +248,26 @@ function isVariableSetInNpmrcFile(sourceNpmrcFolder, variableKey, supportEnvVarF } //# sourceMappingURL=npmrcUtilities.js.map +/***/ }), + +/***/ 848161: +/*!**************************!*\ + !*** external "node:os" ***! + \**************************/ +/***/ ((module) => { + +module.exports = require("node:os"); + +/***/ }), + +/***/ 973024: +/*!**************************!*\ + !*** external "node:fs" ***! + \**************************/ +/***/ ((module) => { + +module.exports = require("node:fs"); + /***/ }) /******/ }); @@ -319,15 +352,16 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ installAndRun: () => (/* binding */ installAndRun), /* harmony export */ runWithErrorAndStatusCode: () => (/* binding */ runWithErrorAndStatusCode) /* harmony export */ }); -/* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! child_process */ 535317); -/* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(child_process__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! fs */ 179896); -/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__); -/* harmony import */ var os__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! os */ 370857); -/* harmony import */ var os__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(os__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! path */ 16928); -/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__); +/* harmony import */ var node_child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! node:child_process */ 731421); +/* harmony import */ var node_child_process__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(node_child_process__WEBPACK_IMPORTED_MODULE_0__); +/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! node:fs */ 973024); +/* harmony import */ var node_fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(node_fs__WEBPACK_IMPORTED_MODULE_1__); +/* harmony import */ var node_os__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! node:os */ 848161); +/* harmony import */ var node_os__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(node_os__WEBPACK_IMPORTED_MODULE_2__); +/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! node:path */ 176760); +/* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(node_path__WEBPACK_IMPORTED_MODULE_3__); /* harmony import */ var _utilities_npmrcUtilities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utilities/npmrcUtilities */ 832286); +/* harmony import */ var _utilities_executionUtilities__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utilities/executionUtilities */ 90178); // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. /* eslint-disable no-console */ @@ -336,6 +370,7 @@ __webpack_require__.r(__webpack_exports__); + const RUSH_JSON_FILENAME = 'rush.json'; const RUSH_TEMP_FOLDER_ENV_VARIABLE_NAME = 'RUSH_TEMP_FOLDER'; const INSTALL_RUN_LOCKFILE_PATH_VARIABLE = 'INSTALL_RUN_LOCKFILE_PATH'; @@ -374,34 +409,34 @@ let _npmPath = undefined; function getNpmPath() { if (!_npmPath) { try { - if (_isWindows()) { + if (_utilities_executionUtilities__WEBPACK_IMPORTED_MODULE_5__.IS_WINDOWS) { // We're on Windows - const whereOutput = child_process__WEBPACK_IMPORTED_MODULE_0__.execSync('where npm', { stdio: [] }).toString(); - const lines = whereOutput.split(os__WEBPACK_IMPORTED_MODULE_2__.EOL).filter((line) => !!line); + const whereOutput = node_child_process__WEBPACK_IMPORTED_MODULE_0__.execSync('where npm', { stdio: [] }).toString(); + const lines = whereOutput.split(node_os__WEBPACK_IMPORTED_MODULE_2__.EOL).filter((line) => !!line); // take the last result, we are looking for a .cmd command // see https://github.com/microsoft/rushstack/issues/759 _npmPath = lines[lines.length - 1]; } else { // We aren't on Windows - assume we're on *NIX or Darwin - _npmPath = child_process__WEBPACK_IMPORTED_MODULE_0__.execSync('command -v npm', { stdio: [] }).toString(); + _npmPath = node_child_process__WEBPACK_IMPORTED_MODULE_0__.execSync('command -v npm', { stdio: [] }).toString(); } } catch (e) { throw new Error(`Unable to determine the path to the NPM tool: ${e}`); } _npmPath = _npmPath.trim(); - if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(_npmPath)) { + if (!node_fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(_npmPath)) { throw new Error('The NPM executable does not exist'); } } return _npmPath; } function _ensureFolder(folderPath) { - if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(folderPath)) { - const parentDir = path__WEBPACK_IMPORTED_MODULE_3__.dirname(folderPath); + if (!node_fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(folderPath)) { + const parentDir = node_path__WEBPACK_IMPORTED_MODULE_3__.dirname(folderPath); _ensureFolder(parentDir); - fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync(folderPath); + node_fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync(folderPath); } } /** @@ -415,14 +450,14 @@ function _ensureAndJoinPath(baseFolder, ...pathSegments) { try { for (let pathSegment of pathSegments) { pathSegment = pathSegment.replace(/[\\\/]/g, '+'); - joinedPath = path__WEBPACK_IMPORTED_MODULE_3__.join(joinedPath, pathSegment); - if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(joinedPath)) { - fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync(joinedPath); + joinedPath = node_path__WEBPACK_IMPORTED_MODULE_3__.join(joinedPath, pathSegment); + if (!node_fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(joinedPath)) { + node_fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync(joinedPath); } } } catch (e) { - throw new Error(`Error building local installation folder (${path__WEBPACK_IMPORTED_MODULE_3__.join(baseFolder, ...pathSegments)}): ${e}`); + throw new Error(`Error building local installation folder (${node_path__WEBPACK_IMPORTED_MODULE_3__.join(baseFolder, ...pathSegments)}): ${e}`); } return joinedPath; } @@ -469,14 +504,13 @@ function _resolvePackageVersion(logger, rushCommonFolder, { name, version }) { // version resolves to try { const rushTempFolder = _getRushTempFolder(rushCommonFolder); - const sourceNpmrcFolder = path__WEBPACK_IMPORTED_MODULE_3__.join(rushCommonFolder, 'config', 'rush'); + const sourceNpmrcFolder = node_path__WEBPACK_IMPORTED_MODULE_3__.join(rushCommonFolder, 'config', 'rush'); (0,_utilities_npmrcUtilities__WEBPACK_IMPORTED_MODULE_4__.syncNpmrc)({ sourceNpmrcFolder, targetNpmrcFolder: rushTempFolder, logger, supportEnvVarFallbackSyntax: false }); - const npmPath = getNpmPath(); // This returns something that looks like: // ``` // [ @@ -494,16 +528,11 @@ function _resolvePackageVersion(logger, rushCommonFolder, { name, version }) { // ``` // // if only a single version matches. - const spawnSyncOptions = { + const npmVersionSpawnResult = _runNpmConfirmSuccess(['view', `${name}@${version}`, 'version', '--no-update-notifier', '--json'], { cwd: rushTempFolder, stdio: [], - shell: _isWindows() - }; - const platformNpmPath = _getPlatformPath(npmPath); - const npmVersionSpawnResult = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformNpmPath, ['view', `${name}@${version}`, 'version', '--no-update-notifier', '--json'], spawnSyncOptions); - if (npmVersionSpawnResult.status !== 0) { - throw new Error(`"npm view" returned error code ${npmVersionSpawnResult.status}`); - } + env: process.env + }, 'npm view'); const npmViewVersionOutput = npmVersionSpawnResult.stdout.toString(); const parsedVersionOutput = JSON.parse(npmViewVersionOutput); const versions = Array.isArray(parsedVersionOutput) @@ -535,15 +564,15 @@ function findRushJsonFolder() { let basePath = __dirname; let tempPath = __dirname; do { - const testRushJsonPath = path__WEBPACK_IMPORTED_MODULE_3__.join(basePath, RUSH_JSON_FILENAME); - if (fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(testRushJsonPath)) { + const testRushJsonPath = node_path__WEBPACK_IMPORTED_MODULE_3__.join(basePath, RUSH_JSON_FILENAME); + if (node_fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(testRushJsonPath)) { _rushJsonFolder = basePath; break; } else { basePath = tempPath; } - } while (basePath !== (tempPath = path__WEBPACK_IMPORTED_MODULE_3__.dirname(basePath))); // Exit the loop when we hit the disk root + } while (basePath !== (tempPath = node_path__WEBPACK_IMPORTED_MODULE_3__.dirname(basePath))); // Exit the loop when we hit the disk root if (!_rushJsonFolder) { throw new Error(`Unable to find ${RUSH_JSON_FILENAME}.`); } @@ -555,11 +584,11 @@ function findRushJsonFolder() { */ function _isPackageAlreadyInstalled(packageInstallFolder) { try { - const flagFilePath = path__WEBPACK_IMPORTED_MODULE_3__.join(packageInstallFolder, INSTALLED_FLAG_FILENAME); - if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(flagFilePath)) { + const flagFilePath = node_path__WEBPACK_IMPORTED_MODULE_3__.join(packageInstallFolder, INSTALLED_FLAG_FILENAME); + if (!node_fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(flagFilePath)) { return false; } - const fileContents = fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync(flagFilePath).toString(); + const fileContents = node_fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync(flagFilePath).toString(); return fileContents.trim() === process.version; } catch (e) { @@ -571,7 +600,7 @@ function _isPackageAlreadyInstalled(packageInstallFolder) { */ function _deleteFile(file) { try { - fs__WEBPACK_IMPORTED_MODULE_1__.unlinkSync(file); + node_fs__WEBPACK_IMPORTED_MODULE_1__.unlinkSync(file); } catch (err) { if (err.code !== 'ENOENT' && err.code !== 'ENOTDIR') { @@ -587,19 +616,19 @@ function _deleteFile(file) { */ function _cleanInstallFolder(rushTempFolder, packageInstallFolder, lockFilePath) { try { - const flagFile = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, INSTALLED_FLAG_FILENAME); + const flagFile = node_path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, INSTALLED_FLAG_FILENAME); _deleteFile(flagFile); - const packageLockFile = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, 'package-lock.json'); + const packageLockFile = node_path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, 'package-lock.json'); if (lockFilePath) { - fs__WEBPACK_IMPORTED_MODULE_1__.copyFileSync(lockFilePath, packageLockFile); + node_fs__WEBPACK_IMPORTED_MODULE_1__.copyFileSync(lockFilePath, packageLockFile); } else { // Not running `npm ci`, so need to cleanup _deleteFile(packageLockFile); - const nodeModulesFolder = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME); - if (fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(nodeModulesFolder)) { + const nodeModulesFolder = node_path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME); + if (node_fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(nodeModulesFolder)) { const rushRecyclerFolder = _ensureAndJoinPath(rushTempFolder, 'rush-recycler'); - fs__WEBPACK_IMPORTED_MODULE_1__.renameSync(nodeModulesFolder, path__WEBPACK_IMPORTED_MODULE_3__.join(rushRecyclerFolder, `install-run-${Date.now().toString()}`)); + node_fs__WEBPACK_IMPORTED_MODULE_1__.renameSync(nodeModulesFolder, node_path__WEBPACK_IMPORTED_MODULE_3__.join(rushRecyclerFolder, `install-run-${Date.now().toString()}`)); } } } @@ -619,8 +648,8 @@ function _createPackageJson(packageInstallFolder, name, version) { repository: "DON'T WARN", license: 'MIT' }; - const packageJsonPath = path__WEBPACK_IMPORTED_MODULE_3__.join(packageInstallFolder, PACKAGE_JSON_FILENAME); - fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync(packageJsonPath, JSON.stringify(packageJsonContents, undefined, 2)); + const packageJsonPath = node_path__WEBPACK_IMPORTED_MODULE_3__.join(packageInstallFolder, PACKAGE_JSON_FILENAME); + node_fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync(packageJsonPath, JSON.stringify(packageJsonContents, undefined, 2)); } catch (e) { throw new Error(`Unable to create package.json: ${e}`); @@ -629,20 +658,14 @@ function _createPackageJson(packageInstallFolder, name, version) { /** * Run "npm install" in the package install folder. */ -function _installPackage(logger, packageInstallFolder, name, version, command) { +function _installPackage(logger, packageInstallFolder, name, version, npmCommand) { try { logger.info(`Installing ${name}...`); - const npmPath = getNpmPath(); - const platformNpmPath = _getPlatformPath(npmPath); - const result = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformNpmPath, [command], { + _runNpmConfirmSuccess([npmCommand], { stdio: 'inherit', cwd: packageInstallFolder, - env: process.env, - shell: _isWindows() - }); - if (result.status !== 0) { - throw new Error(`"npm ${command}" encountered an error`); - } + env: process.env + }, `npm ${npmCommand}`); logger.info(`Successfully installed ${name}@${version}`); } catch (e) { @@ -653,40 +676,71 @@ function _installPackage(logger, packageInstallFolder, name, version, command) { * Get the ".bin" path for the package. */ function _getBinPath(packageInstallFolder, binName) { - const binFolderPath = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin'); - const resolvedBinName = _isWindows() ? `${binName}.cmd` : binName; - return path__WEBPACK_IMPORTED_MODULE_3__.resolve(binFolderPath, resolvedBinName); + const binFolderPath = node_path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin'); + const resolvedBinName = _utilities_executionUtilities__WEBPACK_IMPORTED_MODULE_5__.IS_WINDOWS ? `${binName}.cmd` : binName; + return node_path__WEBPACK_IMPORTED_MODULE_3__.resolve(binFolderPath, resolvedBinName); } -/** - * Returns a cross-platform path - windows must enclose any path containing spaces within double quotes. - */ -function _getPlatformPath(platformPath) { - return _isWindows() && platformPath.includes(' ') ? `"${platformPath}"` : platformPath; -} -function _isWindows() { - return os__WEBPACK_IMPORTED_MODULE_2__.platform() === 'win32'; +function _buildShellCommand(command, args) { + const escapedCommand = (0,_utilities_executionUtilities__WEBPACK_IMPORTED_MODULE_5__.escapeArgumentIfNeeded)(command); + const escapedArgs = args.map((arg) => (0,_utilities_executionUtilities__WEBPACK_IMPORTED_MODULE_5__.escapeArgumentIfNeeded)(arg)); + return [escapedCommand, ...escapedArgs].join(' '); } /** * Write a flag file to the package's install directory, signifying that the install was successful. */ function _writeFlagFile(packageInstallFolder) { try { - const flagFilePath = path__WEBPACK_IMPORTED_MODULE_3__.join(packageInstallFolder, INSTALLED_FLAG_FILENAME); - fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync(flagFilePath, process.version); + const flagFilePath = node_path__WEBPACK_IMPORTED_MODULE_3__.join(packageInstallFolder, INSTALLED_FLAG_FILENAME); + node_fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync(flagFilePath, process.version); } catch (e) { throw new Error(`Unable to create installed.flag file in ${packageInstallFolder}`); } } +/** + * Run npm under the platform's shell and throw if it didn't succeed. + */ +function _runNpmConfirmSuccess(args, options, commandNameForLogging) { + const command = getNpmPath(); + let result; + if (_utilities_executionUtilities__WEBPACK_IMPORTED_MODULE_5__.IS_WINDOWS) { + result = node_child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(_buildShellCommand(command, args), { + ...options, + shell: true, + windowsVerbatimArguments: false + }); + } + else { + result = node_child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(command, args, options); + } + if (result.status !== 0) { + if (!result.status) { + // Is status null or undefined? + if (result.error) { + throw new Error(`"${commandNameForLogging}" failed: ${result.error.message.toString()}`); + } + else if (result.signal) { + throw new Error(`"${commandNameForLogging}" was terminated by signal: ${result.signal}`); + } + else { + throw new Error(`"${commandNameForLogging}" failed for an unknown reason`); + } + } + else { + throw new Error(`"${commandNameForLogging}" returned error code ${result.status}`); + } + } + return result; +} function installAndRun(logger, packageName, packageVersion, packageBinName, packageBinArgs, lockFilePath = process.env[INSTALL_RUN_LOCKFILE_PATH_VARIABLE]) { const rushJsonFolder = findRushJsonFolder(); - const rushCommonFolder = path__WEBPACK_IMPORTED_MODULE_3__.join(rushJsonFolder, 'common'); + const rushCommonFolder = node_path__WEBPACK_IMPORTED_MODULE_3__.join(rushJsonFolder, 'common'); const rushTempFolder = _getRushTempFolder(rushCommonFolder); const packageInstallFolder = _ensureAndJoinPath(rushTempFolder, 'install-run', `${packageName}@${packageVersion}`); if (!_isPackageAlreadyInstalled(packageInstallFolder)) { // The package isn't already installed _cleanInstallFolder(rushTempFolder, packageInstallFolder, lockFilePath); - const sourceNpmrcFolder = path__WEBPACK_IMPORTED_MODULE_3__.join(rushCommonFolder, 'config', 'rush'); + const sourceNpmrcFolder = node_path__WEBPACK_IMPORTED_MODULE_3__.join(rushCommonFolder, 'config', 'rush'); (0,_utilities_npmrcUtilities__WEBPACK_IMPORTED_MODULE_4__.syncNpmrc)({ sourceNpmrcFolder, targetNpmrcFolder: packageInstallFolder, @@ -694,31 +748,38 @@ function installAndRun(logger, packageName, packageVersion, packageBinName, pack supportEnvVarFallbackSyntax: false }); _createPackageJson(packageInstallFolder, packageName, packageVersion); - const command = lockFilePath ? 'ci' : 'install'; - _installPackage(logger, packageInstallFolder, packageName, packageVersion, command); + const installCommand = lockFilePath ? 'ci' : 'install'; + _installPackage(logger, packageInstallFolder, packageName, packageVersion, installCommand); _writeFlagFile(packageInstallFolder); } const statusMessage = `Invoking "${packageBinName} ${packageBinArgs.join(' ')}"`; const statusMessageLine = new Array(statusMessage.length + 1).join('-'); logger.info('\n' + statusMessage + '\n' + statusMessageLine + '\n'); const binPath = _getBinPath(packageInstallFolder, packageBinName); - const binFolderPath = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin'); + const binFolderPath = node_path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin'); // Windows environment variables are case-insensitive. Instead of using SpawnSyncOptions.env, we need to // assign via the process.env proxy to ensure that we append to the right PATH key. const originalEnvPath = process.env.PATH || ''; let result; try { - // `npm` bin stubs on Windows are `.cmd` files - // Node.js will not directly invoke a `.cmd` file unless `shell` is set to `true` - const platformBinPath = _getPlatformPath(binPath); - process.env.PATH = [binFolderPath, originalEnvPath].join(path__WEBPACK_IMPORTED_MODULE_3__.delimiter); - result = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformBinPath, packageBinArgs, { + process.env.PATH = [binFolderPath, originalEnvPath].join(node_path__WEBPACK_IMPORTED_MODULE_3__.delimiter); + const spawnOptions = { stdio: 'inherit', - windowsVerbatimArguments: false, - shell: _isWindows(), cwd: process.cwd(), env: process.env - }); + }; + if (_utilities_executionUtilities__WEBPACK_IMPORTED_MODULE_5__.IS_WINDOWS) { + result = node_child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(_buildShellCommand(binPath, packageBinArgs), { + ...spawnOptions, + windowsVerbatimArguments: false, + // `npm` bin stubs on Windows are `.cmd` files + // Node.js will not directly invoke a `.cmd` file unless `shell` is set to `true` + shell: true + }); + } + else { + result = node_child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(binPath, packageBinArgs, spawnOptions); + } } finally { process.env.PATH = originalEnvPath; @@ -743,9 +804,10 @@ function runWithErrorAndStatusCode(logger, fn) { function _run() { const [nodePath /* Ex: /bin/node */, scriptPath /* /repo/common/scripts/install-run-rush.js */, rawPackageSpecifier /* qrcode@^1.2.0 */, packageBinName /* qrcode */, ...packageBinArgs /* [-f, myproject/lib] */] = process.argv; if (!nodePath) { - throw new Error('Unexpected exception: could not detect node path'); + throw new Error('Could not detect node path'); } - if (path__WEBPACK_IMPORTED_MODULE_3__.basename(scriptPath).toLowerCase() !== 'install-run.js') { + const scriptFileName = node_path__WEBPACK_IMPORTED_MODULE_3__.basename(scriptPath).toLowerCase(); + if (scriptFileName !== 'install-run.js' && scriptFileName !== 'install-run') { // If install-run.js wasn't directly invoked, don't execute the rest of this function. Return control // to the script that (presumably) imported this file return; diff --git a/examples/AISKU/package.json b/examples/AISKU/package.json index 9c0ecc079..3e651c902 100644 --- a/examples/AISKU/package.json +++ b/examples/AISKU/package.json @@ -54,6 +54,6 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-web": "3.3.11", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" } } diff --git a/examples/cfgSync/package.json b/examples/cfgSync/package.json index 1cc8bb9ad..c3b11959d 100644 --- a/examples/cfgSync/package.json +++ b/examples/cfgSync/package.json @@ -66,6 +66,6 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-web": "3.3.11", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" } } diff --git a/examples/dependency/package.json b/examples/dependency/package.json index ea7986dec..44438aefc 100644 --- a/examples/dependency/package.json +++ b/examples/dependency/package.json @@ -55,6 +55,6 @@ "@microsoft/applicationinsights-web": "3.3.11", "@microsoft/applicationinsights-dependencies-js": "3.3.11", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" } } diff --git a/examples/shared-worker/package.json b/examples/shared-worker/package.json index 2d8386a83..3f835b04c 100644 --- a/examples/shared-worker/package.json +++ b/examples/shared-worker/package.json @@ -65,6 +65,6 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-web": "3.3.11", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" } } diff --git a/examples/startSpan/package.json b/examples/startSpan/package.json index 857a6d695..0b21776c1 100644 --- a/examples/startSpan/package.json +++ b/examples/startSpan/package.json @@ -57,6 +57,6 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-web": "3.3.11", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" } } \ No newline at end of file diff --git a/extensions/applicationinsights-analytics-js/package.json b/extensions/applicationinsights-analytics-js/package.json index 74a8ba512..85552db69 100644 --- a/extensions/applicationinsights-analytics-js/package.json +++ b/extensions/applicationinsights-analytics-js/package.json @@ -62,7 +62,7 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" }, "license": "MIT" } diff --git a/extensions/applicationinsights-cfgsync-js/package.json b/extensions/applicationinsights-cfgsync-js/package.json index 3b7c1b5f8..dec4a65a7 100644 --- a/extensions/applicationinsights-cfgsync-js/package.json +++ b/extensions/applicationinsights-cfgsync-js/package.json @@ -58,8 +58,8 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "license": "MIT" } diff --git a/extensions/applicationinsights-clickanalytics-js/package.json b/extensions/applicationinsights-clickanalytics-js/package.json index d102eba81..6bcad9f61 100644 --- a/extensions/applicationinsights-clickanalytics-js/package.json +++ b/extensions/applicationinsights-clickanalytics-js/package.json @@ -53,7 +53,7 @@ "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/applicationinsights-properties-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" }, "repository": { "type": "git", diff --git a/extensions/applicationinsights-debugplugin-js/package.json b/extensions/applicationinsights-debugplugin-js/package.json index 23c28e883..4d455352e 100644 --- a/extensions/applicationinsights-debugplugin-js/package.json +++ b/extensions/applicationinsights-debugplugin-js/package.json @@ -54,7 +54,7 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/applicationinsights-shims": "3.0.1", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" }, "license": "MIT" } diff --git a/extensions/applicationinsights-dependencies-js/package.json b/extensions/applicationinsights-dependencies-js/package.json index b779cbfd7..ec228aca7 100644 --- a/extensions/applicationinsights-dependencies-js/package.json +++ b/extensions/applicationinsights-dependencies-js/package.json @@ -58,8 +58,8 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "license": "MIT" } diff --git a/extensions/applicationinsights-osplugin-js/package.json b/extensions/applicationinsights-osplugin-js/package.json index 8395bd10e..8a096a360 100644 --- a/extensions/applicationinsights-osplugin-js/package.json +++ b/extensions/applicationinsights-osplugin-js/package.json @@ -32,8 +32,8 @@ "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "devDependencies": { "@microsoft/ai-test-framework": "0.0.1", diff --git a/extensions/applicationinsights-perfmarkmeasure-js/package.json b/extensions/applicationinsights-perfmarkmeasure-js/package.json index d1b2b252e..ef2789c0a 100644 --- a/extensions/applicationinsights-perfmarkmeasure-js/package.json +++ b/extensions/applicationinsights-perfmarkmeasure-js/package.json @@ -57,7 +57,7 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" }, "license": "MIT" } diff --git a/extensions/applicationinsights-properties-js/package.json b/extensions/applicationinsights-properties-js/package.json index 5d99cf531..b8187efb0 100644 --- a/extensions/applicationinsights-properties-js/package.json +++ b/extensions/applicationinsights-properties-js/package.json @@ -59,7 +59,7 @@ "@microsoft/dynamicproto-js": "^2.0.3", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" }, "license": "MIT" } diff --git a/package.json b/package.json index 54d712a06..38048b3d4 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme", "devDependencies": { - "@microsoft/rush": "5.153.1", + "@microsoft/rush": "5.166.0", "@nevware21/grunt-eslint-ts": "^0.2.2", "@nevware21/grunt-ts-plugin": "^0.4.3", "@rollup/plugin-commonjs": "^24.0.0", diff --git a/rush.json b/rush.json index f59978e29..340db740f 100644 --- a/rush.json +++ b/rush.json @@ -1,7 +1,7 @@ { "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json", "npmVersion": "9.9.3", - "rushVersion": "5.153.1", + "rushVersion": "5.166.0", "projectFolderMaxDepth": 4, "projects": [ { diff --git a/shared/1ds-core-js/package.json b/shared/1ds-core-js/package.json index 9be02e2a5..cd1b60fee 100644 --- a/shared/1ds-core-js/package.json +++ b/shared/1ds-core-js/package.json @@ -39,8 +39,8 @@ "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" }, "devDependencies": { "@types/qunit": "^2.19.3", @@ -49,7 +49,7 @@ "@microsoft/applicationinsights-rollup-plugin-uglify3-js": "1.0.0", "@microsoft/applicationinsights-rollup-es5": "1.0.2", "@microsoft/api-extractor": "^7.40.0", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", "grunt": "^1.5.3", "grunt-cli": "^1.4.3", "globby": "^11.0.0", diff --git a/shared/AppInsightsCommon/package.json b/shared/AppInsightsCommon/package.json index 47f6bba5f..eebc93d87 100644 --- a/shared/AppInsightsCommon/package.json +++ b/shared/AppInsightsCommon/package.json @@ -56,7 +56,7 @@ "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" }, "license": "MIT" } diff --git a/shared/AppInsightsCore/package.json b/shared/AppInsightsCore/package.json index 4caa06060..bbb1ad671 100644 --- a/shared/AppInsightsCore/package.json +++ b/shared/AppInsightsCore/package.json @@ -69,7 +69,7 @@ "dependencies": { "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", - "@nevware21/ts-async": ">= 0.5.4 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x" } } diff --git a/tools/chrome-debug-extension/package.json b/tools/chrome-debug-extension/package.json index afc31fe79..27478b609 100644 --- a/tools/chrome-debug-extension/package.json +++ b/tools/chrome-debug-extension/package.json @@ -46,8 +46,8 @@ "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/dynamicproto-js": "^2.0.3", - "@nevware21/ts-async": ">= 0.5.4 < 2.x", - "@nevware21/ts-utils": ">= 0.11.8 < 2.x", + "@nevware21/ts-async": ">= 0.5.5 < 2.x", + "@nevware21/ts-utils": ">= 0.12.6 < 2.x", "file-saver": "^2.0.0", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/tools/shims/package.json b/tools/shims/package.json index f7fc0b0cf..c03fb37e0 100644 --- a/tools/shims/package.json +++ b/tools/shims/package.json @@ -54,6 +54,6 @@ "typescript": "^4.9.3" }, "dependencies": { - "@nevware21/ts-utils": ">= 0.11.8 < 2.x" + "@nevware21/ts-utils": ">= 0.12.6 < 2.x" } }