From 13319e52f159688a8c0fa515fcbc6f076c1e2d04 Mon Sep 17 00:00:00 2001 From: Nev <54870357+MSNev@users.noreply.github.com> Date: Fri, 23 Aug 2024 14:13:39 -0700 Subject: [PATCH] [Main] Change tslib peerDependency from "*" to open range (#2397) - Changing from `*` as not all package managers handle this correctly - This is an interim "fix", as at some point we indend to remove this from peerDependency completely, however, that requires more testing than this change to ensure no-one would be broken. --- .gitignore | 1 + .../Tests/es6-module-type-check/package.json | 2 +- AISKU/package.json | 2 +- AISKULight/package.json | 2 +- .../package.json | 2 +- channels/offline-channel-js/package.json | 2 +- channels/tee-channel-js/package.json | 2 +- common/Tests/Framework/package.json | 2 +- common/config/rush/npm-shrinkwrap.json | 67 +++++++------------ examples/AISKU/package.json | 2 +- examples/cfgSync/package.json | 2 +- examples/dependency/package.json | 2 +- examples/shared-worker/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- shared/AppInsightsCommon/package.json | 2 +- shared/AppInsightsCore/package.json | 2 +- tools/rollup-es5/package.json | 2 +- tools/rollup-plugin-uglify3-js/package.json | 2 +- 24 files changed, 47 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index 1930a100..0a9f3bea 100644 --- a/.gitignore +++ b/.gitignore @@ -260,6 +260,7 @@ temp common/temp/** package-deps.json package-lock.json +rush-logs/ # test output aicore.tests.js* diff --git a/AISKU/Tests/es6-module-type-check/package.json b/AISKU/Tests/es6-module-type-check/package.json index f27e9c9d..e8de4d3f 100644 --- a/AISKU/Tests/es6-module-type-check/package.json +++ b/AISKU/Tests/es6-module-type-check/package.json @@ -29,7 +29,7 @@ "typescript": "^4.9.3" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/applicationinsights-common": "3.3.1", diff --git a/AISKU/package.json b/AISKU/package.json index 5787490f..47f7b4aa 100644 --- a/AISKU/package.json +++ b/AISKU/package.json @@ -59,7 +59,7 @@ "puppeteer": "19.2.0" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/AISKULight/package.json b/AISKULight/package.json index 6b672ca0..47964d6f 100644 --- a/AISKULight/package.json +++ b/AISKULight/package.json @@ -52,7 +52,7 @@ "tslib": "^2.0.0" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/channels/applicationinsights-channel-js/package.json b/channels/applicationinsights-channel-js/package.json index de483591..2b913cfa 100644 --- a/channels/applicationinsights-channel-js/package.json +++ b/channels/applicationinsights-channel-js/package.json @@ -48,7 +48,7 @@ "typedoc": "^0.26.6" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/channels/offline-channel-js/package.json b/channels/offline-channel-js/package.json index 04e6eab5..cac85dcf 100644 --- a/channels/offline-channel-js/package.json +++ b/channels/offline-channel-js/package.json @@ -34,7 +34,7 @@ "@nevware21/ts-async": ">= 0.5.2 < 2.x" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "devDependencies": { "@microsoft/ai-test-framework": "0.0.1", diff --git a/channels/tee-channel-js/package.json b/channels/tee-channel-js/package.json index f0913d9e..90c54e8f 100644 --- a/channels/tee-channel-js/package.json +++ b/channels/tee-channel-js/package.json @@ -49,7 +49,7 @@ "sinon": "^7.3.1" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/common/Tests/Framework/package.json b/common/Tests/Framework/package.json index d1a0a4ea..fd2c8ce3 100644 --- a/common/Tests/Framework/package.json +++ b/common/Tests/Framework/package.json @@ -48,7 +48,7 @@ "magic-string": "^0.25.7" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json index 9e13ee95..6c76300b 100644 --- a/common/config/rush/npm-shrinkwrap.json +++ b/common/config/rush/npm-shrinkwrap.json @@ -926,7 +926,7 @@ "node_modules/@rush-temp/applicationinsights-example-aisku": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-example-aisku.tgz", - "integrity": "sha512-Ihv/OykyXkoWQyou2LFK/bJnScsiilKTSHROElzkOB1JkY/aasVze1KkMCYCrscBDIxD7bs6JO8gOeFPhQHtYA==", + "integrity": "sha512-bgeFiFqCs92GlSFcxqxk8eRiz9wpUydaYd+lrn8/zv00BnZqry7ONhxPXxzCpkpqNHBThfShTpl8TT+K9ACFmg==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/ts-utils": ">= 0.11.3 < 2.x", @@ -937,7 +937,7 @@ "grunt-cli": "^1.4.3", "rollup": "^3.20.0", "rollup-plugin-cleanup": "^3.2.1", - "tslib": "*", + "tslib": ">= 1.0.0", "typescript": "^4.9.3" } }, @@ -970,7 +970,7 @@ "node_modules/@rush-temp/applicationinsights-example-dependencies": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-example-dependencies.tgz", - "integrity": "sha512-aMCuTFku3J4fFyMux3rzaPQwG2Er/YaCB0ynoBfJwCq/d9e/C/6nK7JNK5sYKvLNpx5KtpvMpPEAwh4ySyjLLw==", + "integrity": "sha512-QMfBgh+mJN+daVppg+Y8bciWj0H8GjPAoMAHlmElU6ljrBzyAxC6nGraawRBmAUA9sJb1Enoht8tI5wfacTgYw==", "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/ts-utils": ">= 0.11.3 < 2.x", @@ -981,7 +981,7 @@ "grunt-cli": "^1.4.3", "rollup": "^3.20.0", "rollup-plugin-cleanup": "^3.2.1", - "tslib": "*", + "tslib": ">= 1.0.0", "typescript": "^4.9.3" } }, @@ -1219,9 +1219,9 @@ "node_modules/@rush-temp/applicationinsights-test-module-type-check": { "version": "0.0.0", "resolved": "file:projects/applicationinsights-test-module-type-check.tgz", - "integrity": "sha512-I5++Ul9ahn6Te77Q54HO8trBfwCZEa2ZIU+knsAON3nRymO02JCEjU7/ohK0h2gCGEfmN21ETQuJYnl758JTwg==", + "integrity": "sha512-pCRNaf+6boYDVA27F+A/ynwgQ7jUOgqEA2Wi/xpWXgtxLc2ye9BXeHkZSTIG69ispNNHg0ES4XUx4J6eFO524Q==", "dependencies": { - "tslib": "*", + "tslib": ">= 1.0.0", "typescript": "^4.9.3" } }, @@ -3284,19 +3284,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -4481,9 +4468,9 @@ } }, "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -6054,9 +6041,9 @@ } }, "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "node_modules/tunnel": { "version": "0.0.6", @@ -7141,7 +7128,7 @@ }, "@rush-temp/applicationinsights-example-aisku": { "version": "file:projects\\applicationinsights-example-aisku.tgz", - "integrity": "sha512-Ihv/OykyXkoWQyou2LFK/bJnScsiilKTSHROElzkOB1JkY/aasVze1KkMCYCrscBDIxD7bs6JO8gOeFPhQHtYA==", + "integrity": "sha512-bgeFiFqCs92GlSFcxqxk8eRiz9wpUydaYd+lrn8/zv00BnZqry7ONhxPXxzCpkpqNHBThfShTpl8TT+K9ACFmg==", "requires": { "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/ts-utils": ">= 0.11.3 < 2.x", @@ -7152,7 +7139,7 @@ "grunt-cli": "^1.4.3", "rollup": "^3.20.0", "rollup-plugin-cleanup": "^3.2.1", - "tslib": "*", + "tslib": ">= 1.0.0", "typescript": "^4.9.3" } }, @@ -7183,7 +7170,7 @@ }, "@rush-temp/applicationinsights-example-dependencies": { "version": "file:projects\\applicationinsights-example-dependencies.tgz", - "integrity": "sha512-aMCuTFku3J4fFyMux3rzaPQwG2Er/YaCB0ynoBfJwCq/d9e/C/6nK7JNK5sYKvLNpx5KtpvMpPEAwh4ySyjLLw==", + "integrity": "sha512-QMfBgh+mJN+daVppg+Y8bciWj0H8GjPAoMAHlmElU6ljrBzyAxC6nGraawRBmAUA9sJb1Enoht8tI5wfacTgYw==", "requires": { "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/ts-utils": ">= 0.11.3 < 2.x", @@ -7194,7 +7181,7 @@ "grunt-cli": "^1.4.3", "rollup": "^3.20.0", "rollup-plugin-cleanup": "^3.2.1", - "tslib": "*", + "tslib": ">= 1.0.0", "typescript": "^4.9.3" } }, @@ -7421,9 +7408,9 @@ }, "@rush-temp/applicationinsights-test-module-type-check": { "version": "file:projects\\applicationinsights-test-module-type-check.tgz", - "integrity": "sha512-I5++Ul9ahn6Te77Q54HO8trBfwCZEa2ZIU+knsAON3nRymO02JCEjU7/ohK0h2gCGEfmN21ETQuJYnl758JTwg==", + "integrity": "sha512-pCRNaf+6boYDVA27F+A/ynwgQ7jUOgqEA2Wi/xpWXgtxLc2ye9BXeHkZSTIG69ispNNHg0ES4XUx4J6eFO524Q==", "requires": { - "tslib": "*", + "tslib": ">= 1.0.0", "typescript": "^4.9.3" } }, @@ -8968,12 +8955,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, - "fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "optional": true - }, "function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -9883,9 +9864,9 @@ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" }, "micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "requires": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -11030,9 +11011,9 @@ "requires": {} }, "tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel": { "version": "0.0.6", diff --git a/examples/AISKU/package.json b/examples/AISKU/package.json index 5de59142..f4051b2d 100644 --- a/examples/AISKU/package.json +++ b/examples/AISKU/package.json @@ -46,7 +46,7 @@ "typescript": "^4.9.3" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/applicationinsights-shims": "3.0.1", diff --git a/examples/cfgSync/package.json b/examples/cfgSync/package.json index 7dec9420..bbc2300c 100644 --- a/examples/cfgSync/package.json +++ b/examples/cfgSync/package.json @@ -58,7 +58,7 @@ "sinon": "^7.3.1" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/applicationinsights-shims": "3.0.1", diff --git a/examples/dependency/package.json b/examples/dependency/package.json index b48a8d69..58910f34 100644 --- a/examples/dependency/package.json +++ b/examples/dependency/package.json @@ -46,7 +46,7 @@ "typescript": "^4.9.3" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/applicationinsights-shims": "3.0.1", diff --git a/examples/shared-worker/package.json b/examples/shared-worker/package.json index c498d7c2..78a91941 100644 --- a/examples/shared-worker/package.json +++ b/examples/shared-worker/package.json @@ -58,7 +58,7 @@ "sinon": "^7.3.1" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/applicationinsights-shims": "3.0.1", diff --git a/extensions/applicationinsights-analytics-js/package.json b/extensions/applicationinsights-analytics-js/package.json index b6d25065..fa81b693 100644 --- a/extensions/applicationinsights-analytics-js/package.json +++ b/extensions/applicationinsights-analytics-js/package.json @@ -55,7 +55,7 @@ "sinon": "^7.3.1" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/extensions/applicationinsights-cfgsync-js/package.json b/extensions/applicationinsights-cfgsync-js/package.json index e4269e5c..d0222d9d 100644 --- a/extensions/applicationinsights-cfgsync-js/package.json +++ b/extensions/applicationinsights-cfgsync-js/package.json @@ -52,7 +52,7 @@ "sinon": "^7.3.1" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/extensions/applicationinsights-clickanalytics-js/package.json b/extensions/applicationinsights-clickanalytics-js/package.json index 45813317..3634182e 100644 --- a/extensions/applicationinsights-clickanalytics-js/package.json +++ b/extensions/applicationinsights-clickanalytics-js/package.json @@ -46,7 +46,7 @@ "@nevware21/grunt-eslint-ts": "^0.2.2" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/extensions/applicationinsights-debugplugin-js/package.json b/extensions/applicationinsights-debugplugin-js/package.json index 92d1a3e3..3fd323c1 100644 --- a/extensions/applicationinsights-debugplugin-js/package.json +++ b/extensions/applicationinsights-debugplugin-js/package.json @@ -48,7 +48,7 @@ "rollup": "^3.20.0" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/extensions/applicationinsights-dependencies-js/package.json b/extensions/applicationinsights-dependencies-js/package.json index b175bf42..101d274f 100644 --- a/extensions/applicationinsights-dependencies-js/package.json +++ b/extensions/applicationinsights-dependencies-js/package.json @@ -52,7 +52,7 @@ "sinon": "^7.3.1" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/extensions/applicationinsights-perfmarkmeasure-js/package.json b/extensions/applicationinsights-perfmarkmeasure-js/package.json index 69eae816..25542422 100644 --- a/extensions/applicationinsights-perfmarkmeasure-js/package.json +++ b/extensions/applicationinsights-perfmarkmeasure-js/package.json @@ -50,7 +50,7 @@ "rollup": "^3.20.0" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/extensions/applicationinsights-properties-js/package.json b/extensions/applicationinsights-properties-js/package.json index 7a4b8872..cb22283c 100644 --- a/extensions/applicationinsights-properties-js/package.json +++ b/extensions/applicationinsights-properties-js/package.json @@ -53,7 +53,7 @@ "sinon": "^7.3.1" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/dynamicproto-js": "^2.0.3", diff --git a/shared/AppInsightsCommon/package.json b/shared/AppInsightsCommon/package.json index db3793f3..05cd6e04 100644 --- a/shared/AppInsightsCommon/package.json +++ b/shared/AppInsightsCommon/package.json @@ -51,7 +51,7 @@ "sinon": "^7.3.1" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/applicationinsights-shims": "3.0.1", diff --git a/shared/AppInsightsCore/package.json b/shared/AppInsightsCore/package.json index ed1f0ca9..83554af9 100644 --- a/shared/AppInsightsCore/package.json +++ b/shared/AppInsightsCore/package.json @@ -64,7 +64,7 @@ "sinon": "^7.3.1" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "@microsoft/applicationinsights-shims": "3.0.1", diff --git a/tools/rollup-es5/package.json b/tools/rollup-es5/package.json index 3f15093f..5d59cd83 100644 --- a/tools/rollup-es5/package.json +++ b/tools/rollup-es5/package.json @@ -54,7 +54,7 @@ "chromium": "^3.0.2" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { } diff --git a/tools/rollup-plugin-uglify3-js/package.json b/tools/rollup-plugin-uglify3-js/package.json index 533c7686..863e283c 100644 --- a/tools/rollup-plugin-uglify3-js/package.json +++ b/tools/rollup-plugin-uglify3-js/package.json @@ -40,7 +40,7 @@ "tslib": "^2.0.0" }, "peerDependencies": { - "tslib": "*" + "tslib": ">= 1.0.0" }, "dependencies": { "uglify-js": "3.16.0"