From cd5876d93444dd7842da17846bfdb716e4b0ff44 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 16 May 2024 18:25:09 +0200 Subject: [PATCH 1/3] chore: migrate to monosize 0.6 --- monosize.config.mjs | 9 +++++++++ package.json | 6 +++--- yarn.lock | 28 ++++++++++++++-------------- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/monosize.config.mjs b/monosize.config.mjs index c3c320dad59afd..2923a0a8ac14ab 100644 --- a/monosize.config.mjs +++ b/monosize.config.mjs @@ -1,4 +1,6 @@ // @ts-check +import fs from 'node:fs'; +import path from 'node:path'; import webpackBundler from 'monosize-bundler-webpack'; import createAzureStorage from 'monosize-storage-azure'; @@ -11,6 +13,13 @@ const config = { bundler: webpackBundler(config => { return config; }), + reportResolvers: { + packageName: async packageRoot => { + const packageJson = await fs.promises.readFile(path.join(packageRoot, 'package.json'), 'utf-8'); + const json = JSON.parse(packageJson); + return json.name.replace('@fluentui/', ''); + }, + }, }; export default config; diff --git a/package.json b/package.json index da06f26d436778..58934d8240c538 100644 --- a/package.json +++ b/package.json @@ -271,9 +271,9 @@ "lodash": "4.17.21", "markdown-table": "2.0.0", "memfs": "3.2.2", - "monosize": "0.5.0", - "monosize-storage-azure": "0.0.10", - "monosize-bundler-webpack": "0.1.0", + "monosize": "0.6.0", + "monosize-storage-azure": "0.0.12", + "monosize-bundler-webpack": "0.1.2", "node-plop": "0.25.0", "nx": "17.3.2", "p-queue": "6.6.2", diff --git a/yarn.lock b/yarn.lock index 8a83933498e5fc..877a591f9cd97f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17524,33 +17524,33 @@ monaco-editor@0.33.0: resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.33.0.tgz#842e244f3750a2482f8a29c676b5684e75ff34af" integrity sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw== -monosize-bundler-webpack@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/monosize-bundler-webpack/-/monosize-bundler-webpack-0.1.0.tgz#f70e04453397a9fe1959bc9bd302e76a5871fbf1" - integrity sha512-iZvgekCCQEcTVWYdLSPwotmHL5oO9cSr9dgDuCYafhfZKwNfFKxfFRraSUffNQlYBc2eH2ZiU1hhcauA30fbnA== +monosize-bundler-webpack@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/monosize-bundler-webpack/-/monosize-bundler-webpack-0.1.2.tgz#b49897678ebc1cbeabc178de992c75672208219a" + integrity sha512-2OzDknhkeuxElrNgDfQoQRSQ7aJ/4wu/gJUm9xtKKhi3MHdd57Wtv7BjILN+alL9hkG+YipCSf95M6WmP9Ovrg== dependencies: - monosize "^0.5.0" + monosize "^0.6.0" picocolors "^1.0.0" terser "^5.16.0" terser-webpack-plugin "^5.3.1" tslib "^2.4.1" webpack "^5.76.0" -monosize-storage-azure@0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/monosize-storage-azure/-/monosize-storage-azure-0.0.10.tgz#e90390af2c9709f35cdfe51a0218f8effd1c824c" - integrity sha512-asvaHsx4TSmdyh1rvxm6uWa91Suml9Vorfpc0YUGUsOj7KXOg3vxObxrTvKPiBSSWEbQ/Nb1XXJCzt4s8CaX1w== +monosize-storage-azure@0.0.12: + version "0.0.12" + resolved "https://registry.yarnpkg.com/monosize-storage-azure/-/monosize-storage-azure-0.0.12.tgz#1612ab109b90aea8347f2536d2f1df49c68142c6" + integrity sha512-NsHLEx2qTbd4amYR+vsbtx5+61HFmTzHrCdpi5U493D/3DQ8DY0f6VxUb+bUz4p9hTg4XMfxUpAcbgJwJTiv9Q== dependencies: "@azure/data-tables" "^13.0.0" - monosize "^0.5.0" + monosize "^0.6.0" node-fetch "^3.3.0" picocolors "^1.0.0" tslib "^2.4.1" -monosize@0.5.0, monosize@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/monosize/-/monosize-0.5.0.tgz#06de5a1f77338877a336627418b5b45458718498" - integrity sha512-+1Z3UyGP/t65Hft9wcDIlgGNuH7xB3ExKjxZ97qaGz//ujLPE2/SkeQcF4LxegBFjQnU4vm9g1pnb4Acc8b4Rg== +monosize@0.6.0, monosize@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/monosize/-/monosize-0.6.0.tgz#d42e33c1c2165dc223db0e1981f54ef45af4fdb9" + integrity sha512-bAh080zQqt80cUDFgYyIW0mPiFiJdTxLzlWhznG8VJgTaAMEOPRQ0xEuDF2RPFmoc9IQO3sv8QZ/fzTK2z0Uig== dependencies: acorn "^8.11.3" ci-info "^3.7.0" From 4235e99a18b5ea71a7e5445ccb049aa144fb8c90 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Fri, 17 May 2024 10:44:09 +0200 Subject: [PATCH 2/3] fixup! chore: migrate to monosize 0.6 --- package.json | 6 +++--- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 58934d8240c538..a717494fb3fbf7 100644 --- a/package.json +++ b/package.json @@ -271,9 +271,9 @@ "lodash": "4.17.21", "markdown-table": "2.0.0", "memfs": "3.2.2", - "monosize": "0.6.0", - "monosize-storage-azure": "0.0.12", - "monosize-bundler-webpack": "0.1.2", + "monosize": "0.6.1", + "monosize-storage-azure": "0.0.13", + "monosize-bundler-webpack": "0.1.3", "node-plop": "0.25.0", "nx": "17.3.2", "p-queue": "6.6.2", diff --git a/yarn.lock b/yarn.lock index 877a591f9cd97f..53440612a30243 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17524,33 +17524,33 @@ monaco-editor@0.33.0: resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.33.0.tgz#842e244f3750a2482f8a29c676b5684e75ff34af" integrity sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw== -monosize-bundler-webpack@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/monosize-bundler-webpack/-/monosize-bundler-webpack-0.1.2.tgz#b49897678ebc1cbeabc178de992c75672208219a" - integrity sha512-2OzDknhkeuxElrNgDfQoQRSQ7aJ/4wu/gJUm9xtKKhi3MHdd57Wtv7BjILN+alL9hkG+YipCSf95M6WmP9Ovrg== +monosize-bundler-webpack@0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/monosize-bundler-webpack/-/monosize-bundler-webpack-0.1.3.tgz#941612471321e1e2258d2eecf23af249bd006f22" + integrity sha512-Qsi4X03Q3zNt5QDFn8uUOzqCyLLIJkYnxAmRDqH6nbgVKgTXfvnv/kbzmb/UQGf20Vf75u4EuiNiV76fwIP8bg== dependencies: - monosize "^0.6.0" + monosize "^0.6.1" picocolors "^1.0.0" terser "^5.16.0" terser-webpack-plugin "^5.3.1" tslib "^2.4.1" webpack "^5.76.0" -monosize-storage-azure@0.0.12: - version "0.0.12" - resolved "https://registry.yarnpkg.com/monosize-storage-azure/-/monosize-storage-azure-0.0.12.tgz#1612ab109b90aea8347f2536d2f1df49c68142c6" - integrity sha512-NsHLEx2qTbd4amYR+vsbtx5+61HFmTzHrCdpi5U493D/3DQ8DY0f6VxUb+bUz4p9hTg4XMfxUpAcbgJwJTiv9Q== +monosize-storage-azure@0.0.13: + version "0.0.13" + resolved "https://registry.yarnpkg.com/monosize-storage-azure/-/monosize-storage-azure-0.0.13.tgz#cc4a3b99b00ed26a1bea800134896c1c3b5019d9" + integrity sha512-+dR63f1lllUtSHYRGpr5Pr2kLlgDv0dijKdvgMlQrkY63xzmnFy79fFB3kdd97mfRcW1W0rR6ORZ+Og7gRJLYA== dependencies: "@azure/data-tables" "^13.0.0" - monosize "^0.6.0" + monosize "^0.6.1" node-fetch "^3.3.0" picocolors "^1.0.0" tslib "^2.4.1" -monosize@0.6.0, monosize@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/monosize/-/monosize-0.6.0.tgz#d42e33c1c2165dc223db0e1981f54ef45af4fdb9" - integrity sha512-bAh080zQqt80cUDFgYyIW0mPiFiJdTxLzlWhznG8VJgTaAMEOPRQ0xEuDF2RPFmoc9IQO3sv8QZ/fzTK2z0Uig== +monosize@0.6.1, monosize@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/monosize/-/monosize-0.6.1.tgz#2920fa84c8689003d38a50b6696a94d5fce8a87f" + integrity sha512-6PqepsaQMxx3kPAoUyuZ1wmjWrh2mPq6NE/PClatnytvYhkGU7ET6+5BJ1HnJFuVLn7b0nqRBECPyiBT6RD0tA== dependencies: acorn "^8.11.3" ci-info "^3.7.0" From cc751da5744a244e0d31085d39b6fee9026f8eea Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Mon, 20 May 2024 11:22:03 +0200 Subject: [PATCH 3/3] fixup! fixup! chore: migrate to monosize 0.6 --- package.json | 8 ++++---- yarn.lock | 43 +++++++++++++++---------------------------- 2 files changed, 19 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index a717494fb3fbf7..6d11a934ad013b 100644 --- a/package.json +++ b/package.json @@ -271,9 +271,9 @@ "lodash": "4.17.21", "markdown-table": "2.0.0", "memfs": "3.2.2", - "monosize": "0.6.1", - "monosize-storage-azure": "0.0.13", - "monosize-bundler-webpack": "0.1.3", + "monosize": "0.6.2", + "monosize-storage-azure": "0.0.14", + "monosize-bundler-webpack": "0.1.4", "node-plop": "0.25.0", "nx": "17.3.2", "p-queue": "6.6.2", @@ -343,7 +343,7 @@ "webpack-dev-server": "4.15.1", "webpack-hot-middleware": "2.26.1", "webpack-merge": "5.10.0", - "workspace-tools": "0.29.1", + "workspace-tools": "0.27.0", "yargs": "13.3.2", "yargs-parser": "13.1.2", "yargs-unparser": "2.0.0" diff --git a/yarn.lock b/yarn.lock index 53440612a30243..c43a5c3bc63a7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17524,33 +17524,33 @@ monaco-editor@0.33.0: resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.33.0.tgz#842e244f3750a2482f8a29c676b5684e75ff34af" integrity sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw== -monosize-bundler-webpack@0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/monosize-bundler-webpack/-/monosize-bundler-webpack-0.1.3.tgz#941612471321e1e2258d2eecf23af249bd006f22" - integrity sha512-Qsi4X03Q3zNt5QDFn8uUOzqCyLLIJkYnxAmRDqH6nbgVKgTXfvnv/kbzmb/UQGf20Vf75u4EuiNiV76fwIP8bg== +monosize-bundler-webpack@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/monosize-bundler-webpack/-/monosize-bundler-webpack-0.1.4.tgz#c9f730c7237c26153b45f40c04940de0af3e1f4c" + integrity sha512-lYQ2Cg+J4KH7SjHnMRPKSg6CUASQ3BMiLVB5jhSvS79Rz3LmEsy0VFrbasjHFG05VErI9j/JvpLLxS+zHyS2kQ== dependencies: - monosize "^0.6.1" + monosize "^0.6.2" picocolors "^1.0.0" terser "^5.16.0" terser-webpack-plugin "^5.3.1" tslib "^2.4.1" webpack "^5.76.0" -monosize-storage-azure@0.0.13: - version "0.0.13" - resolved "https://registry.yarnpkg.com/monosize-storage-azure/-/monosize-storage-azure-0.0.13.tgz#cc4a3b99b00ed26a1bea800134896c1c3b5019d9" - integrity sha512-+dR63f1lllUtSHYRGpr5Pr2kLlgDv0dijKdvgMlQrkY63xzmnFy79fFB3kdd97mfRcW1W0rR6ORZ+Og7gRJLYA== +monosize-storage-azure@0.0.14: + version "0.0.14" + resolved "https://registry.yarnpkg.com/monosize-storage-azure/-/monosize-storage-azure-0.0.14.tgz#f3b5810f885063f0d7fa86ca17625ce22546433f" + integrity sha512-hFaIo1ZoB4ZIlbRyPJ4CeXDEwGF/FVaG6j1rlgWuwilYavYAm9q/y0GprAFp6uRN8kQxi8WS6OiZCna/YIYHJA== dependencies: "@azure/data-tables" "^13.0.0" - monosize "^0.6.1" + monosize "^0.6.2" node-fetch "^3.3.0" picocolors "^1.0.0" tslib "^2.4.1" -monosize@0.6.1, monosize@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/monosize/-/monosize-0.6.1.tgz#2920fa84c8689003d38a50b6696a94d5fce8a87f" - integrity sha512-6PqepsaQMxx3kPAoUyuZ1wmjWrh2mPq6NE/PClatnytvYhkGU7ET6+5BJ1HnJFuVLn7b0nqRBECPyiBT6RD0tA== +monosize@0.6.2, monosize@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/monosize/-/monosize-0.6.2.tgz#0b192dd9ac12ab5833c65cdb4ca4e1c05cfaddb1" + integrity sha512-bTP2FnY0/G527uUmZ7GF5Gz7awSSVTPn7laHd6higpjZMv7f7IGtWgoNuhtaj/E92ZL1S3zm8+cb4TUgHxJdNQ== dependencies: acorn "^8.11.3" ci-info "^3.7.0" @@ -17561,7 +17561,6 @@ monosize@0.6.1, monosize@^0.6.1: picocolors "^1.0.0" pretty-bytes "^6.0.0" tslib "^2.4.1" - workspace-tools "^0.29.1" yargs "^17.6.2" moo-color@^1.0.2: @@ -24450,19 +24449,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -workspace-tools@0.29.1, workspace-tools@^0.29.1: - version "0.29.1" - resolved "https://registry.yarnpkg.com/workspace-tools/-/workspace-tools-0.29.1.tgz#ff38f7484961cd87a342a8fd14eacd31d1645f56" - integrity sha512-BVPROxNszGmyaUD2ErLWP4BpCiIkG1P//CnziOvHd27o1TeBm+7T1HKlYu89T4XGAjgPL/NP+tZ4j6aBvG/p/A== - dependencies: - "@yarnpkg/lockfile" "^1.1.0" - git-url-parse "^13.0.0" - globby "^11.0.0" - jju "^1.4.0" - js-yaml "^4.1.0" - micromatch "^4.0.0" - -workspace-tools@^0.27.0: +workspace-tools@0.27.0, workspace-tools@^0.27.0: version "0.27.0" resolved "https://registry.yarnpkg.com/workspace-tools/-/workspace-tools-0.27.0.tgz#11e8f1ec2cb4c80d1cefcf92da2d0154dc001aa8" integrity sha512-5mtE5Vy0Se4brAUJXKfXNtaS9jcUcH+IGF4LNU1xJr4bW1o5bK2gV0pykodB+n6V84nRtaD/4I/9w98aujm7LA==