From 62971540530c3fc8d64534503db6eef8f78875bc Mon Sep 17 00:00:00 2001 From: John Kreitlow <863023+radium-v@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:53:41 -0800 Subject: [PATCH 1/6] add tslib to nohoist list --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4fb8c0d9153..da6fdb58c72 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,8 @@ "**/@types/node", "**/chai", "**/html-minifier-terser", - "**/react-syntax-highlighter" + "**/react-syntax-highlighter", + "**/tslib" ] }, "engines": { From a4fb2d7a664d0fb039bf0b605d58fd03453d9d93 Mon Sep 17 00:00:00 2001 From: John Kreitlow <863023+radium-v@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:54:03 -0800 Subject: [PATCH 2/6] add missing tslib transient dependency --- packages/utilities/fast-react-wrapper/package.json | 3 ++- packages/web-components/fast-router/package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/utilities/fast-react-wrapper/package.json b/packages/utilities/fast-react-wrapper/package.json index 6a1c95dde30..f55d81365ef 100644 --- a/packages/utilities/fast-react-wrapper/package.json +++ b/packages/utilities/fast-react-wrapper/package.json @@ -83,7 +83,8 @@ "webpack-cli": "^4.9.2" }, "dependencies": { - "@microsoft/fast-element": "^2.0.0-beta.26" + "@microsoft/fast-element": "^2.0.0-beta.26", + "tslib": "^2.4.0" }, "peerDependencies": { "react": ">=16.9.0" diff --git a/packages/web-components/fast-router/package.json b/packages/web-components/fast-router/package.json index 0c3b74a5394..22f70903891 100644 --- a/packages/web-components/fast-router/package.json +++ b/packages/web-components/fast-router/package.json @@ -80,6 +80,7 @@ "webpack-cli": "^4.9.2" }, "dependencies": { - "@microsoft/fast-element": "^2.0.0-beta.26" + "@microsoft/fast-element": "^2.0.0-beta.26", + "tslib": "2.5.0" } } From 7833638c676cbb97871aa9ae561f441c1b392a74 Mon Sep 17 00:00:00 2001 From: John Kreitlow <863023+radium-v@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:54:29 -0800 Subject: [PATCH 3/6] lock tslib to 2.5.0 in fast-ssr --- packages/web-components/fast-ssr/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web-components/fast-ssr/package.json b/packages/web-components/fast-ssr/package.json index ebd5ceff7a8..231bd48fb73 100644 --- a/packages/web-components/fast-ssr/package.json +++ b/packages/web-components/fast-ssr/package.json @@ -54,7 +54,7 @@ }, "dependencies": { "parse5": "^6.0.1", - "tslib": "^2.4.0" + "tslib": "2.5.0" }, "peerDependencies": { "@microsoft/fast-element": "^2.0.0-beta.26" From 0f81eff563a22872eaee9116530d6570e5e005e6 Mon Sep 17 00:00:00 2001 From: John Kreitlow <863023+radium-v@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:58:12 -0800 Subject: [PATCH 4/6] resolve lockfile --- yarn.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yarn.lock b/yarn.lock index 29cbad9627b..03b51fbb0a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20308,6 +20308,11 @@ tslib@2.3.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +tslib@2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== + tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" From 62c3c65eda96b8f97921ec199549b73692ddcd32 Mon Sep 17 00:00:00 2001 From: John Kreitlow <863023+radium-v@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:00:27 -0800 Subject: [PATCH 5/6] deduplicate and resolve lockfile --- yarn.lock | 49 ++++--------------------------------------------- 1 file changed, 4 insertions(+), 45 deletions(-) diff --git a/yarn.lock b/yarn.lock index 03b51fbb0a4..cec4df79f0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1784,14 +1784,7 @@ dependencies: jest-get-type "^29.2.0" -"@jest/schemas@^29.0.0": - version "29.0.0" - resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a" - integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA== - dependencies: - "@sinclair/typebox" "^0.24.1" - -"@jest/schemas@^29.4.3": +"@jest/schemas@^29.0.0", "@jest/schemas@^29.4.3": version "29.4.3" resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788" integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg== @@ -1840,19 +1833,7 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@jest/types@^29.2.1": - version "29.2.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.2.1.tgz#ec9c683094d4eb754e41e2119d8bdaef01cf6da0" - integrity sha512-O/QNDQODLnINEPAI0cl9U6zUIDXEWXt6IC1o2N2QENuos7hlGUIthlKyV4p6ki3TvXFX071blj8HUhgLGquPjw== - dependencies: - "@jest/schemas" "^29.0.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - -"@jest/types@^29.5.0": +"@jest/types@^29.2.1", "@jest/types@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog== @@ -3637,11 +3618,6 @@ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== -"@sinclair/typebox@^0.24.1": - version "0.24.50" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.50.tgz#35ee4db4ab8f3a8ff56490c51f92445d2776451e" - integrity sha512-k8ETQOOQDg5FtK7y9KJWpsGLik+QlPmIi8zzl/dGUgshV2QitprkFlCR/AemjWOTyKn9UwSSGRTzLVotvgCjYQ== - "@sinclair/typebox@^0.25.16": version "0.25.24" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718" @@ -13177,19 +13153,7 @@ jest-util@^26.6.2: is-ci "^2.0.0" micromatch "^4.0.2" -jest-util@^29.2.1: - version "29.2.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.2.1.tgz#f26872ba0dc8cbefaba32c34f98935f6cf5fc747" - integrity sha512-P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g== - dependencies: - "@jest/types" "^29.2.1" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-util@^29.5.0: +jest-util@^29.2.1, jest-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ== @@ -20308,7 +20272,7 @@ tslib@2.3.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -tslib@2.5.0: +tslib@2.5.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== @@ -20318,11 +20282,6 @@ tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - tsscmp@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb" From da3280833aff40ef082c0009b29859b7ea076ee0 Mon Sep 17 00:00:00 2001 From: John Kreitlow <863023+radium-v@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:01:15 -0800 Subject: [PATCH 6/6] Change files --- ...react-wrapper-88507d5c-06f7-4c04-a04f-315990da14a1.json | 7 +++++++ ...t-fast-router-0afc4ee1-81d2-4b64-9018-b1926d65a6e2.json | 7 +++++++ ...soft-fast-ssr-cfd47157-e42b-476d-aeb7-cc3e01d7f782.json | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 change/@microsoft-fast-react-wrapper-88507d5c-06f7-4c04-a04f-315990da14a1.json create mode 100644 change/@microsoft-fast-router-0afc4ee1-81d2-4b64-9018-b1926d65a6e2.json create mode 100644 change/@microsoft-fast-ssr-cfd47157-e42b-476d-aeb7-cc3e01d7f782.json diff --git a/change/@microsoft-fast-react-wrapper-88507d5c-06f7-4c04-a04f-315990da14a1.json b/change/@microsoft-fast-react-wrapper-88507d5c-06f7-4c04-a04f-315990da14a1.json new file mode 100644 index 00000000000..a8b7d82c9f8 --- /dev/null +++ b/change/@microsoft-fast-react-wrapper-88507d5c-06f7-4c04-a04f-315990da14a1.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "add missing tslib transient dependency", + "packageName": "@microsoft/fast-react-wrapper", + "email": "863023+radium-v@users.noreply.github.com", + "dependentChangeType": "none" +} diff --git a/change/@microsoft-fast-router-0afc4ee1-81d2-4b64-9018-b1926d65a6e2.json b/change/@microsoft-fast-router-0afc4ee1-81d2-4b64-9018-b1926d65a6e2.json new file mode 100644 index 00000000000..4f4ac3954a1 --- /dev/null +++ b/change/@microsoft-fast-router-0afc4ee1-81d2-4b64-9018-b1926d65a6e2.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "add missing tslib transient dependency", + "packageName": "@microsoft/fast-router", + "email": "863023+radium-v@users.noreply.github.com", + "dependentChangeType": "none" +} diff --git a/change/@microsoft-fast-ssr-cfd47157-e42b-476d-aeb7-cc3e01d7f782.json b/change/@microsoft-fast-ssr-cfd47157-e42b-476d-aeb7-cc3e01d7f782.json new file mode 100644 index 00000000000..256934942b2 --- /dev/null +++ b/change/@microsoft-fast-ssr-cfd47157-e42b-476d-aeb7-cc3e01d7f782.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "lock tslib to 2.5.0", + "packageName": "@microsoft/fast-ssr", + "email": "863023+radium-v@users.noreply.github.com", + "dependentChangeType": "none" +}