From fbb1977210837fbad0a4b72cd8a83acdc96424d4 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Tue, 27 Sep 2022 17:16:03 -0700 Subject: [PATCH 1/2] Make @microsoft/load-themed-styles a peerDependency of @microsoft/loader-load-themed-styles. --- .../load-themed-styles-peerdep_2022-09-28-00-15.json | 10 ++++++++++ webpack/loader-load-themed-styles/package.json | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 common/changes/@microsoft/loader-load-themed-styles/load-themed-styles-peerdep_2022-09-28-00-15.json diff --git a/common/changes/@microsoft/loader-load-themed-styles/load-themed-styles-peerdep_2022-09-28-00-15.json b/common/changes/@microsoft/loader-load-themed-styles/load-themed-styles-peerdep_2022-09-28-00-15.json new file mode 100644 index 00000000000..83f7caf3115 --- /dev/null +++ b/common/changes/@microsoft/loader-load-themed-styles/load-themed-styles-peerdep_2022-09-28-00-15.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/loader-load-themed-styles", + "comment": "Make @microsoft/load-themed-styles a peer dependency.", + "type": "major" + } + ], + "packageName": "@microsoft/loader-load-themed-styles" +} \ No newline at end of file diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json index 54fe619aa49..651fa7e4f62 100644 --- a/webpack/loader-load-themed-styles/package.json +++ b/webpack/loader-load-themed-styles/package.json @@ -21,16 +21,17 @@ } }, "peerDependencies": { - "@types/webpack": "^4" + "@types/webpack": "^4", + "@microsoft/load-themed-styles": "^1 || ^2" }, "dependencies": { - "@microsoft/load-themed-styles": "workspace:*", "loader-utils": "~1.1.0" }, "devDependencies": { + "@microsoft/load-themed-styles": "workspace:*", "@rushstack/eslint-config": "workspace:*", - "@rushstack/heft": "workspace:*", "@rushstack/heft-node-rig": "workspace:*", + "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", "@types/loader-utils": "1.1.3", "@types/node": "12.20.24", From c26d5caf0b83a4a9602105a48cbf3185a13096a9 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Tue, 27 Sep 2022 17:45:37 -0700 Subject: [PATCH 2/2] Rush update. --- common/config/rush/pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index b4bca7613bf..1efd35618e9 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -2303,9 +2303,9 @@ importers: '@types/webpack': 4.41.32 loader-utils: ~1.1.0 dependencies: - '@microsoft/load-themed-styles': link:../../libraries/load-themed-styles loader-utils: 1.1.0 devDependencies: + '@microsoft/load-themed-styles': link:../../libraries/load-themed-styles '@rushstack/eslint-config': link:../../eslint/eslint-config '@rushstack/heft': link:../../apps/heft '@rushstack/heft-node-rig': link:../../rigs/heft-node-rig