From 21149959e39f05890479f6c1c685f95fcafd0e68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 09:07:58 +0530 Subject: [PATCH 1/3] build(deps-dev): bump @parcel/css from 1.11.2 to 1.12.0 (#6277) Bumps [@parcel/css](https://github.com/parcel-bundler/parcel-css) from 1.11.2 to 1.12.0. - [Release notes](https://github.com/parcel-bundler/parcel-css/releases) - [Commits](https://github.com/parcel-bundler/parcel-css/commits/v1.12.0) --- updated-dependencies: - dependency-name: "@parcel/css" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 2237afe81bc5..54e457d31a40 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@mdx-js/loader": "^2.0.0-next.9", "@octokit/auth-action": "^2.0.0", "@octokit/rest": "^19.0.3", - "@parcel/css": "^1.11.2", + "@parcel/css": "^1.12.0", "@pmmmwh/react-refresh-webpack-plugin": "next", "@svgr/webpack": "^6.2.1", "autoprefixer": "^10.4.7", diff --git a/yarn.lock b/yarn.lock index d11eaf1a5ed8..a6ad80ba0b7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2090,61 +2090,61 @@ dependencies: "@octokit/openapi-types" "^12.7.0" -"@parcel/css-darwin-arm64@1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.11.2.tgz#71b17d3de519ce25bc48ee29d7f8f89305e66f26" - integrity sha512-Bn8mTn+P1xawC42uXgcbGUXSY3WDLDNpK0TAN/JnJgTuSKPk8OI7G+on+LxRzg9+WC3NS5P0aUi56+JlulsuhA== - -"@parcel/css-darwin-x64@1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@parcel/css-darwin-x64/-/css-darwin-x64-1.11.2.tgz#869f516d8dc64c5dea3a8fe5d0d13006e36d1858" - integrity sha512-dlIC7s6yCr30bz9v/Hsi2cNuJMX/INdKsGOQe06tikETFg5kIXqvui4w3OzPy5GpYrEcTGuWl4fIsb4/7OCOOA== - -"@parcel/css-linux-arm-gnueabihf@1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.11.2.tgz#627bfb1ab8c43b56a5aefa37e9694d85e6878ce9" - integrity sha512-e4Rv8Qnnd38Czd7z8pVpvOZYcJedfxquIsZsxXiK8FrNEEEW5SXAjeSNeTfk8moruib1qvL3/5tzw0yZfsvCaA== - -"@parcel/css-linux-arm64-gnu@1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.11.2.tgz#edf27ffd7dc0794bd2a095baab27e6ed9e3e34c0" - integrity sha512-7BT1IbvCPcigAn6cziLdjQVbpcBs/AhLQRWyRVbtF6jJexZ+hqudpDSZddF5GDrW3RsSMh3cbcVS6jP07cZWRQ== - -"@parcel/css-linux-arm64-musl@1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.11.2.tgz#756c2100bb097299fd9884b5eb815279bf592d17" - integrity sha512-xCQd+N0z9+L1Wjq6GxcNtGHG2IH0TK0Zq1tC75dKOKy/b1vTrE1fdgFk9EYQALlxT71CNjqIpMcapGAu0um8mA== - -"@parcel/css-linux-x64-gnu@1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.11.2.tgz#334fa21ae402ea65bb9c0732dc340e19b5cffd2d" - integrity sha512-jsEiGpXHC+I/lEcvP9rAel9+EGiHZkdA4uFLLLrxCBtAGb87TMx9hErEjn102XE0VP1zG2mg4f3yx64SUrxEyQ== - -"@parcel/css-linux-x64-musl@1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.11.2.tgz#e24c4d54c55cc9978df1c689a267a52aa260b920" - integrity sha512-NX8VEkgEeqlL4aNoMoxnVJwc7ILNMTxZhFbkx0vhT3z2yP2jVX2mXVrHNu1e1vkeC57wwMYyjd8PQ/tl8bWMEQ== - -"@parcel/css-win32-x64-msvc@1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.11.2.tgz#55fbb94f2feb173a4e0212efbc96e3290457aeac" - integrity sha512-z+ABZGu7CRcZu0jM89zAAbu/JAHkcBwY2NGe64ZwjwAttYmIB8EyXhBCn+vju6jXXMdyQhFA2OwHVFVlMHRWMQ== - -"@parcel/css@^1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@parcel/css/-/css-1.11.2.tgz#534f78cab8dcd89a42611e0aedc4336f5c36bdcc" - integrity sha512-thV6ZOpGbhX/fsAuSi9pKgb4F5sC/nU9JJpmSJkIDwQFNgSk4sLpDslEfdEZ2EhNMOLecTzukCgfQImV6Mivpg== +"@parcel/css-darwin-arm64@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.12.0.tgz#da45f6fa4ff14212454ef5d5bddcde4f811dba97" + integrity sha512-zq2vdvIJNFetPFima2D/oytAlxlWP9Qy6WSri+l3TOMnxrvObqfMv71kmbwOFUApnaxmTMqdd/GQN6DvIL+gOQ== + +"@parcel/css-darwin-x64@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@parcel/css-darwin-x64/-/css-darwin-x64-1.12.0.tgz#faf9d4d6dcbb50bc7e42164f6e84f3c98eae9e0e" + integrity sha512-N3bvj68peUquzh/6mA50+EgnddjxFjil5sfDSfvvOEQoTQB0e0T/Q2J7O9RqRLcK5mKHJ/27ByQAhoEZZ8AT6g== + +"@parcel/css-linux-arm-gnueabihf@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.12.0.tgz#feabd1ec7ab672c5050fd22b1c7f416bbff71c10" + integrity sha512-Y2SQmYhUZllHFvv5BYRiZSFGoMOyLqhRcvRNrR6cgzIPBBUTLYgCTP1EKAXXaGqLZCjwPig/d1ZBvKI+cA75IA== + +"@parcel/css-linux-arm64-gnu@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.12.0.tgz#4344ef37b6d0d4353556d4bfb7382e1872d39d45" + integrity sha512-FDaqmvB6Iuv64oen3XzKfimnlXARUZ+rkxu9ivgv69Iwp1OQKLUxwCRxMrhotg8sryONhyg/tHWft7G0t4S14w== + +"@parcel/css-linux-arm64-musl@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.12.0.tgz#30acdd4ba371fe9c6029330076e0a607e5ec1e2d" + integrity sha512-PxkjtWk5B5DA8dkBJqd59NSr55RnDkVwVRqH5nCXux7gWPdp9v+LRrRJBpSQgLJaiatFiY+CXZNlFRnBqrqFTQ== + +"@parcel/css-linux-x64-gnu@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.12.0.tgz#5fdea4d83f1a07ec781e97fcc3b7b2d0dd124e29" + integrity sha512-zxD1bS4BF79F+4DV7+kccAs6gNrcilzTOCJ3GvxrNjh1OJtXUVi7Ls0r+pVwuhF7kzOi0AUYvnwHBeybxoIhuA== + +"@parcel/css-linux-x64-musl@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.12.0.tgz#bf887102e26a644706d2d38d8e7c31e9b368b691" + integrity sha512-oTHzmpTEkew/aoW4jyQ/sR+XJh+3Xl7J9dnJo4/FVvRjRSHdr/V8LEPx61Iv2Edx123WzrpNqpvUC1X6Q3M4fw== + +"@parcel/css-win32-x64-msvc@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.12.0.tgz#546aba05942020b71dacb3d435695290a65b8a46" + integrity sha512-FWlyrTezxfSvYdf9qX8XSbDimeF0+N8xyP2fIEMf1YFejxH6NJ5N4LSPfysBf4qqOVR0DYYTa+UHtZxN/g2B6A== + +"@parcel/css@^1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@parcel/css/-/css-1.12.0.tgz#15bd1588eaac7eed996bc45d7b3a5d36c2c87b97" + integrity sha512-iDpbNOp5l6L7ZIX+rqutkdqvI01BBhUSJGXfDJFD5UfnG8VmDyQ2PYtVB+5+kJH4CICOI6oiO4JCi1O/fNpkJA== dependencies: detect-libc "^1.0.3" optionalDependencies: - "@parcel/css-darwin-arm64" "1.11.2" - "@parcel/css-darwin-x64" "1.11.2" - "@parcel/css-linux-arm-gnueabihf" "1.11.2" - "@parcel/css-linux-arm64-gnu" "1.11.2" - "@parcel/css-linux-arm64-musl" "1.11.2" - "@parcel/css-linux-x64-gnu" "1.11.2" - "@parcel/css-linux-x64-musl" "1.11.2" - "@parcel/css-win32-x64-msvc" "1.11.2" + "@parcel/css-darwin-arm64" "1.12.0" + "@parcel/css-darwin-x64" "1.12.0" + "@parcel/css-linux-arm-gnueabihf" "1.12.0" + "@parcel/css-linux-arm64-gnu" "1.12.0" + "@parcel/css-linux-arm64-musl" "1.12.0" + "@parcel/css-linux-x64-gnu" "1.12.0" + "@parcel/css-linux-x64-musl" "1.12.0" + "@parcel/css-win32-x64-msvc" "1.12.0" "@pkgr/utils@^2.1.0": version "2.2.0" From 98a6bd0a7a9dca226bb68bfc45a53c19ac98ac37 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Sat, 16 Jul 2022 08:12:25 +0530 Subject: [PATCH 2/3] docs(configuration): add `resolve.extensionAlias` (#6278) * docs(configuration): add `resolve.extensionAlias` * chore: sort --- src/content/configuration/resolve.mdx | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/content/configuration/resolve.mdx b/src/content/configuration/resolve.mdx index 5b4bb39569ab..a24d895b2025 100644 --- a/src/content/configuration/resolve.mdx +++ b/src/content/configuration/resolve.mdx @@ -227,6 +227,26 @@ module.exports = { }; ``` +### resolve.extensionAlias + +`object` + +An object which maps extension to extension aliases. + +**webpack.config.js** + +```js +module.exports = { + //... + resolve: { + extensionAlias: { + '.js': ['.ts', '.js'], + '.mjs': ['.mts', '.mjs'], + }, + }, +}; +``` + ### resolve.extensions `[string] = ['.js', '.json', '.wasm']` From 9deb79570f3cd27cf7df08d63753fbb1ebfcffa3 Mon Sep 17 00:00:00 2001 From: Jacob Date: Sun, 17 Jul 2022 05:02:42 +0000 Subject: [PATCH 3/3] docs(en): fix conflicts --- src/content/configuration/resolve.mdx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/content/configuration/resolve.mdx b/src/content/configuration/resolve.mdx index ee25444a3641..7d4e55ddd88f 100644 --- a/src/content/configuration/resolve.mdx +++ b/src/content/configuration/resolve.mdx @@ -233,14 +233,11 @@ module.exports = { }; ``` -<<<<<<< HEAD -### resolve.extensions $#resolveextensions$ -======= ### resolve.extensionAlias `object` -An object which maps extension to extension aliases. +一个将拓展名与拓展名别名映射的对象。 **webpack.config.js** @@ -257,7 +254,6 @@ module.exports = { ``` ### resolve.extensions ->>>>>>> 98a6bd0a7a9dca226bb68bfc45a53c19ac98ac37 `[string] = ['.js', '.json', '.wasm']`