From 46cbeb14442eae98197c0ac29fe13e98338a88fa Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Mon, 14 Feb 2022 17:07:26 -0800 Subject: [PATCH 1/2] Do not import helpers in load-themed-styles. --- common/config/rush/pnpm-lock.yaml | 59 +--------------------- common/config/rush/repo-state.json | 2 +- libraries/load-themed-styles/package.json | 3 -- libraries/load-themed-styles/tsconfig.json | 1 + 4 files changed, 3 insertions(+), 62 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index f6b789f97c8..2273908e4d6 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1598,9 +1598,6 @@ importers: '@rushstack/heft-web-rig': workspace:* '@types/heft-jest': 1.0.1 '@types/webpack-env': 1.13.0 - tslib: ~2.3.1 - dependencies: - tslib: 2.3.1 devDependencies: '@rushstack/eslint-config': link:../../eslint/eslint-config '@rushstack/heft': link:../../apps/heft @@ -4245,16 +4242,6 @@ packages: transitivePeerDependencies: - supports-color - /@jest/types/25.5.0: - resolution: {integrity: sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==} - engines: {node: '>= 8.3'} - dependencies: - '@types/istanbul-lib-coverage': 2.0.4 - '@types/istanbul-reports': 1.1.2 - '@types/yargs': 15.0.14 - chalk: 3.0.0 - dev: true - /@jest/types/26.6.2: resolution: {integrity: sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==} engines: {node: '>= 10.14.2'} @@ -6231,7 +6218,7 @@ packages: /@types/heft-jest/1.0.1: resolution: {integrity: sha512-cF2iEUpvGh2WgLowHVAdjI05xuDo+GwCA8hGV3Q5PBl8apjd6BTcpPFQ2uPlfUM7BLpgur2xpYo8VeBXopMI4A==} dependencies: - '@types/jest': 25.2.1 + '@types/jest': 27.4.0 dev: true /@types/html-minifier-terser/5.1.2: @@ -6264,25 +6251,11 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 - /@types/istanbul-reports/1.1.2: - resolution: {integrity: sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==} - dependencies: - '@types/istanbul-lib-coverage': 2.0.4 - '@types/istanbul-lib-report': 3.0.0 - dev: true - /@types/istanbul-reports/3.0.1: resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==} dependencies: '@types/istanbul-lib-report': 3.0.0 - /@types/jest/25.2.1: - resolution: {integrity: sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA==} - dependencies: - jest-diff: 25.5.0 - pretty-format: 25.5.0 - dev: true - /@types/jest/27.4.0: resolution: {integrity: sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==} dependencies: @@ -9269,11 +9242,6 @@ packages: wrappy: 1.0.2 dev: false - /diff-sequences/25.2.6: - resolution: {integrity: sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==} - engines: {node: '>= 8.3'} - dev: true - /diff-sequences/27.5.1: resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -12239,16 +12207,6 @@ packages: - utf-8-validate dev: true - /jest-diff/25.5.0: - resolution: {integrity: sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==} - engines: {node: '>= 8.3'} - dependencies: - chalk: 3.0.0 - diff-sequences: 25.2.6 - jest-get-type: 25.2.6 - pretty-format: 25.5.0 - dev: true - /jest-diff/27.5.1: resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -12331,11 +12289,6 @@ packages: jest-mock: 27.5.1 jest-util: 27.5.1 - /jest-get-type/25.2.6: - resolution: {integrity: sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==} - engines: {node: '>= 8.3'} - dev: true - /jest-get-type/27.5.1: resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -14978,16 +14931,6 @@ packages: lodash: 4.17.21 renderkid: 3.0.0 - /pretty-format/25.5.0: - resolution: {integrity: sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==} - engines: {node: '>= 8.3'} - dependencies: - '@jest/types': 25.5.0 - ansi-regex: 5.0.1 - ansi-styles: 4.3.0 - react-is: 16.13.1 - dev: true - /pretty-format/27.5.1: resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json index d0d929b7e70..2864db077cb 100644 --- a/common/config/rush/repo-state.json +++ b/common/config/rush/repo-state.json @@ -1,5 +1,5 @@ // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush. { - "pnpmShrinkwrapHash": "a55d514dff735353e02d4c6b65b36a6c44622b4f", + "pnpmShrinkwrapHash": "0fd4655f564eef2e72711986d0e95e8ca543085f", "preferredVersionsHash": "d2a5d015a5e5f4861bc36581c3c08cb789ed7fab" } diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json index e0fa59442ce..bf061be1dbe 100644 --- a/libraries/load-themed-styles/package.json +++ b/libraries/load-themed-styles/package.json @@ -22,8 +22,5 @@ "@rushstack/heft-web-rig": "workspace:*", "@types/heft-jest": "1.0.1", "@types/webpack-env": "1.13.0" - }, - "dependencies": { - "tslib": "~2.3.1" } } diff --git a/libraries/load-themed-styles/tsconfig.json b/libraries/load-themed-styles/tsconfig.json index ce340ab4d63..66f94105b62 100644 --- a/libraries/load-themed-styles/tsconfig.json +++ b/libraries/load-themed-styles/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "./node_modules/@rushstack/heft-web-rig/profiles/library/tsconfig-base.json", "compilerOptions": { + "importHelpers": false, "module": "commonjs", "types": ["heft-jest", "webpack-env"] } From c0b1eb6c75462605b342bea3ffff50baebd89972 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Mon, 14 Feb 2022 17:13:40 -0800 Subject: [PATCH 2/2] Rush change. --- .../load-themed-styles-no-tslib_2022-02-15-01-13.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@microsoft/load-themed-styles/load-themed-styles-no-tslib_2022-02-15-01-13.json diff --git a/common/changes/@microsoft/load-themed-styles/load-themed-styles-no-tslib_2022-02-15-01-13.json b/common/changes/@microsoft/load-themed-styles/load-themed-styles-no-tslib_2022-02-15-01-13.json new file mode 100644 index 00000000000..a9fe6e80976 --- /dev/null +++ b/common/changes/@microsoft/load-themed-styles/load-themed-styles-no-tslib_2022-02-15-01-13.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/load-themed-styles", + "comment": "Do not import TS helpers.", + "type": "patch" + } + ], + "packageName": "@microsoft/load-themed-styles" +} \ No newline at end of file