From 325aa5748f9c5dd0aa39e3aa2aa30270401654ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 08:09:20 +0800 Subject: [PATCH 1/7] build(deps-dev): bump @parcel/css from 1.10.0 to 1.10.1 (#6220) Bumps [@parcel/css](https://github.com/parcel-bundler/parcel-css) from 1.10.0 to 1.10.1. - [Release notes](https://github.com/parcel-bundler/parcel-css/releases) - [Commits](https://github.com/parcel-bundler/parcel-css/compare/v1.10.0...v1.10.1) --- updated-dependencies: - dependency-name: "@parcel/css" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 88 ++++++++++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 911d7ea0f827..4ba8f0b8c12c 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@mdx-js/loader": "^2.0.0-next.9", "@octokit/auth-action": "^1.3.3", "@octokit/rest": "^18.12.0", - "@parcel/css": "^1.10.0", + "@parcel/css": "^1.10.1", "@pmmmwh/react-refresh-webpack-plugin": "next", "@svgr/webpack": "^6.2.1", "autoprefixer": "^10.4.7", diff --git a/yarn.lock b/yarn.lock index 91b77f710c79..5fa641e6b50c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2134,61 +2134,61 @@ dependencies: "@octokit/openapi-types" "^11.1.0" -"@parcel/css-darwin-arm64@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.10.0.tgz#9301fa03f064c16d6a9c23f301566b5943f410bb" - integrity sha512-WMAbjUyCBrXwv3OofNk90K+G0DqZgCFRtKCg+udLXLZCiCe6yrI87ye9SC6KAVwqWp5WT27TPZTrqWJ032e3FA== +"@parcel/css-darwin-arm64@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.10.1.tgz#47476d6162ff49d3d38af4dd6001c85097ff64de" + integrity sha512-0ukr4/hSrM24ef8bcZ5b/o8iJrPVAxXOKCPGpmKFd+R/31SYjvFfMJzS2XAYUy0W0FunMW2fte3iTPNMDigyww== -"@parcel/css-darwin-x64@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@parcel/css-darwin-x64/-/css-darwin-x64-1.10.0.tgz#99740212bd1522dafb2c46bebb73603447a262fc" - integrity sha512-p1JJVHOOxrhcSQMq9qlrU88Sl+VJGu8HXBpWDHRzh8aOIkqsiRx1qx9Vl3zGX7Sxnjv/xlPUknLKia8Zy1369A== +"@parcel/css-darwin-x64@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@parcel/css-darwin-x64/-/css-darwin-x64-1.10.1.tgz#1d41a511fa8f2ee62e507ca2f96d0bfdfc33db38" + integrity sha512-PFMPptY+OswU68XgBO2RlL6JckeWz/a36r7ys6LMPrNonIOWGce155lwnylBK1Pnx1DRQAN8jWaolo+OkD9RRQ== -"@parcel/css-linux-arm-gnueabihf@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.10.0.tgz#ef961e0c41ef70dc8c58401ccce527bbbbda96f3" - integrity sha512-cUvDN+nNEdoEzZLhOqPAcjICIyEGcFCc0+zJhGKdnA9MC010aeun9ggtToFazIHzMmoF4qyxCY5IyHja8iVkmA== +"@parcel/css-linux-arm-gnueabihf@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.10.1.tgz#acfb4fd584cbc542f9e51dc03431446de8187548" + integrity sha512-QICiX10CDudilEV+DUBKbbJb7ckSuj2hyI3NyzphRqkxBE7t4Hb04x6RPKITEJwHgvqUQ3OUPWyvtalVAi36Ww== -"@parcel/css-linux-arm64-gnu@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.10.0.tgz#7229d05f1f9f76443eb4c9bc55a9e8887c0822dd" - integrity sha512-x8XEtJxgJlstAwbg1BLeYuXhUXEOxGg/BeBFPZr8Zk8dNQ1j1jR7LBk12IKgZrvr+Px1WOFY65lwabgCyFqxnQ== +"@parcel/css-linux-arm64-gnu@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.10.1.tgz#c96b096467ae11436ea60f30db9c7f268dbe5185" + integrity sha512-dHaQiBXlrDPdqE8O1qnlYqp1N9la1jgcYgIUCtm4NkNltzLVbbSFXyeG7OXeT6njP6ltMb4mmEFL18I2Wr3l3A== -"@parcel/css-linux-arm64-musl@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.10.0.tgz#d8efb7c09f53971db01ea180a5b63a1b908f1800" - integrity sha512-caBaOM+zhFYlaMB2GL327NeOkF5lbHte5XLrGByagLWanlnRRlFpapIXpuuGIGSF5uBHN2uAz/84ej5mNcdHwg== +"@parcel/css-linux-arm64-musl@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.10.1.tgz#df1cf3f823acef2f78c855580baac6bf446d6761" + integrity sha512-inBbDCGhJaZcNCb588wQz5tYpGbnz8W/g9aFOH6X3nSBNToknOHplBHjOMLOB7vBxAykNjbywaNtE5H9qoY0/A== -"@parcel/css-linux-x64-gnu@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.10.0.tgz#f0e47d1c362ed9b1604b31a1113549930154c959" - integrity sha512-9JZUMB1v+Zh95K2BJdoC20vZcObqF3mPA10gM51/a44f3rhRsv/EHjzLsSqxSYtC+L7wLvW9M3SNZ2KTo0J2/A== +"@parcel/css-linux-x64-gnu@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.10.1.tgz#321493811e9f06b3cfc3e394c7b3e1cdc1187b99" + integrity sha512-gBaHgMXom1lCGu/ummD1wqknxF9ZKFBUlxQ/0DtCdOtZlRBEKeWtoskK9tgH4YMnwTpMIagCwWB4UbP/9Yzz6A== -"@parcel/css-linux-x64-musl@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.10.0.tgz#f83cbfc5b6ee088e9b733b2445131e557934945e" - integrity sha512-U702L0HlZUN5Fxb6jbDetYeA7eOgLHkXo4vZ9/XHJyPy6jD+n+9HO8bEcLdSAadJcb4Ndcn89THyfwKiOHukVQ== +"@parcel/css-linux-x64-musl@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.10.1.tgz#6fa866b0512f6a48634491c0a1152c3ffa4aef84" + integrity sha512-arjLARo/3l0uwPf5qYxCkrS0FTE8n6JH/S1/7DitvhG22fsZdJTGPwe4MYLTIn4s3QXLOVVRrkPDZlUPM1yjFA== -"@parcel/css-win32-x64-msvc@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.10.0.tgz#d2418f657f32913ae685956f3517450fb50fb030" - integrity sha512-44GtojxQBRf8yTetsNdjYSa2KL4/UpSbEeaOYcO+PKBGHcCyQX2Lex5r1X2pXkpNxvu142+dSTLeXhBSFG4C0g== +"@parcel/css-win32-x64-msvc@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.10.1.tgz#299642511b3f203ac55c2f783a880a5718ab0787" + integrity sha512-f/jkhL2uOZCHJg3/IGcuieZ4TTwkxExLd7SWVuiqJZI2nwOy/gLHTZJz3yzu/D1aLOe0M9/glgzUKRtK0DrUNA== -"@parcel/css@^1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@parcel/css/-/css-1.10.0.tgz#a2a57e44ac86bc815b955eb605b74b8fc06ac770" - integrity sha512-YvlUqJ3kg/HxsVvq02bTCGruQKjwPEMWEqdyhgfR3aagt+1ibmafy3m8CGYHXvhaQeNYSkMvy1D9bcddFuYTUg== +"@parcel/css@^1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@parcel/css/-/css-1.10.1.tgz#6c5ab376d5f51f4ad16d3c388490c14a8da4b3c6" + integrity sha512-qnoQM4qH6ytYE3RK8PzMoI8dGPmJv/fNFkeC8Ku0A08GbG/ssir2TCQCarcKFVNgvtfDZ0AX3+vjSkYEAfzhJA== dependencies: detect-libc "^1.0.3" optionalDependencies: - "@parcel/css-darwin-arm64" "1.10.0" - "@parcel/css-darwin-x64" "1.10.0" - "@parcel/css-linux-arm-gnueabihf" "1.10.0" - "@parcel/css-linux-arm64-gnu" "1.10.0" - "@parcel/css-linux-arm64-musl" "1.10.0" - "@parcel/css-linux-x64-gnu" "1.10.0" - "@parcel/css-linux-x64-musl" "1.10.0" - "@parcel/css-win32-x64-msvc" "1.10.0" + "@parcel/css-darwin-arm64" "1.10.1" + "@parcel/css-darwin-x64" "1.10.1" + "@parcel/css-linux-arm-gnueabihf" "1.10.1" + "@parcel/css-linux-arm64-gnu" "1.10.1" + "@parcel/css-linux-arm64-musl" "1.10.1" + "@parcel/css-linux-x64-gnu" "1.10.1" + "@parcel/css-linux-x64-musl" "1.10.1" + "@parcel/css-win32-x64-msvc" "1.10.1" "@pmmmwh/react-refresh-webpack-plugin@next": version "0.5.7" From 37489bb30c5992fa718632a892dfa2c4e55bb684 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 08:17:29 +0800 Subject: [PATCH 2/7] build(deps-dev): bump mini-css-extract-plugin from 2.6.0 to 2.6.1 (#6221) Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases) - [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v2.6.0...v2.6.1) --- updated-dependencies: - dependency-name: mini-css-extract-plugin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4ba8f0b8c12c..8ec0c68280b2 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "markdownlint": "^0.25.1", "markdownlint-cli": "^0.31.1", "mdast-util-to-string": "^3.1.0", - "mini-css-extract-plugin": "^2.6.0", + "mini-css-extract-plugin": "^2.6.1", "mkdirp": "^1.0.4", "modularscale-sass": "^3.0.3", "node-fetch": "^3.2.6", diff --git a/yarn.lock b/yarn.lock index 5fa641e6b50c..3e78fd6bb0b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8655,10 +8655,10 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz#578aebc7fc14d32c0ad304c2c34f08af44673f5e" - integrity sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w== +mini-css-extract-plugin@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz#9a1251d15f2035c342d99a468ab9da7a0451b71e" + integrity sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg== dependencies: schema-utils "^4.0.0" From 4f2f0507acd988d3aadc7e297cccf5574bc6f146 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 08:26:09 +0800 Subject: [PATCH 3/7] build(deps-dev): bump prettier from 2.7.0 to 2.7.1 (#6222) Bumps [prettier](https://github.com/prettier/prettier) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.7.0...2.7.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8ec0c68280b2..c8011b6730fe 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "npm-run-all": "^4.1.1", "postcss": "^8.4.14", "postcss-loader": "^7.0.0", - "prettier": "^2.7.0", + "prettier": "^2.7.1", "react-refresh": "^0.14.0", "redirect-webpack-plugin": "^1.0.0", "remark": "^14.0.2", diff --git a/yarn.lock b/yarn.lock index 3e78fd6bb0b5..d4b6d6090c53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9753,10 +9753,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prettier@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.0.tgz#a4fdae07e5596c51c9857ea676cd41a0163879d6" - integrity sha512-nwoX4GMFgxoPC6diHvSwmK/4yU8FFH3V8XWtLQrbj4IBsK2pkYhG4kf/ljF/haaZ/aii+wNJqISrCDPgxGWDVQ== +prettier@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" + integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== pretty-bytes@^5.1.0, pretty-bytes@^5.2.0, pretty-bytes@^5.3.0, pretty-bytes@^5.4.1, pretty-bytes@^5.6.0: version "5.6.0" From 6bf957d02515850e35e05cb03265cf5f2a8ec194 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 08:41:26 +0800 Subject: [PATCH 4/7] build(deps-dev): bump lint-staged from 13.0.1 to 13.0.2 (#6223) Bumps [lint-staged](https://github.com/okonet/lint-staged) from 13.0.1 to 13.0.2. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Commits](https://github.com/okonet/lint-staged/compare/v13.0.1...v13.0.2) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c8011b6730fe..d570f4095c70 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "husky": "^8.0.1", "hyperlink": "^5.0.4", "jest": "^28.1.1", - "lint-staged": "^13.0.1", + "lint-staged": "^13.0.2", "lodash": "^4.17.21", "markdownlint": "^0.25.1", "markdownlint-cli": "^0.31.1", diff --git a/yarn.lock b/yarn.lock index d4b6d6090c53..03c9bdbd5f16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7662,10 +7662,10 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -lint-staged@^13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.0.1.tgz#899e78065ab29b88fdd922482411121664ef66be" - integrity sha512-Ykaf4QTi0a02BF7cnq7JIPGOJxH4TkNMWhSlJdH9wOekd0X+gog47Jfh/0L31DqZe5AiydLGC7LkPqpaNm+Kvg== +lint-staged@^13.0.2: + version "13.0.2" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.0.2.tgz#35a1c57130e9ad5b1dea784972a40777ba433dd5" + integrity sha512-qQLfLTh9z34eMzfEHENC+QBskZfxjomrf+snF3xJ4BzilORbD989NLqQ00ughsF/A+PT41e87+WsMFabf9++pQ== dependencies: cli-truncate "^3.1.0" colorette "^2.0.17" From db4c46bf329b85a81ac5c08009d74822ac42637b Mon Sep 17 00:00:00 2001 From: Etheryen <44708346+Etheryen@users.noreply.github.com> Date: Sun, 19 Jun 2022 06:03:40 +0200 Subject: [PATCH 5/7] docs(guides): remove trailing comma in package.json (#6227) --- src/content/guides/getting-started.mdx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/content/guides/getting-started.mdx b/src/content/guides/getting-started.mdx index 23a9dd42951c..5f0d559f1a1d 100644 --- a/src/content/guides/getting-started.mdx +++ b/src/content/guides/getting-started.mdx @@ -26,6 +26,7 @@ contributors: - anshumanv - d3lm - snitin315 + - Etheryen --- Webpack is used to compile JavaScript modules. Once [installed](/guides/installation), you can interact with webpack either from its [CLI](/api/cli) or [API](/api/node). If you're still new to webpack, please read through the [core concepts](/concepts) and [this comparison](/comparison) to learn why you might use it over the other tools that are out in the community. @@ -118,7 +119,7 @@ T> If you want to learn more about the inner workings of `package.json`, then we "license": "MIT", "devDependencies": { "webpack": "^5.38.1", - "webpack-cli": "^4.7.2", + "webpack-cli": "^4.7.2" } } ``` From 1fae7f858d0bc6a514754ec4adf3ade7bb679ed4 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Mon, 20 Jun 2022 05:24:54 +0530 Subject: [PATCH 6/7] docs(api): add `shutdown` compiler hook (#6226) --- src/content/api/compiler-hooks.mdx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/content/api/compiler-hooks.mdx b/src/content/api/compiler-hooks.mdx index 4c19eade802f..3f107f5f5a5c 100644 --- a/src/content/api/compiler-hooks.mdx +++ b/src/content/api/compiler-hooks.mdx @@ -284,6 +284,12 @@ Executed when a watching compilation has been invalidated. This hook is _not_ co Called when a watching compilation has stopped. +### shutdown + +`AsyncSeriesHook` + +Called when the compiler is closing. + ### infrastructureLog `SyncBailHook` From a248fc96c5031e935986c998c2c95f5586da01a3 Mon Sep 17 00:00:00 2001 From: Jacob Date: Tue, 21 Jun 2022 13:02:11 +0000 Subject: [PATCH 7/7] docs(en): fix conflicts --- src/content/api/compiler-hooks.mdx | 6 +----- src/content/guides/getting-started.mdx | 5 +---- yarn.lock | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/content/api/compiler-hooks.mdx b/src/content/api/compiler-hooks.mdx index 2aaa0952eed4..fc1cdd985d2b 100644 --- a/src/content/api/compiler-hooks.mdx +++ b/src/content/api/compiler-hooks.mdx @@ -288,17 +288,13 @@ This hook allows you to do a one more additional pass of the build. 在一个观察中的 compilation 停止时执行。 -<<<<<<< HEAD -### infrastructureLog $#infrastructurelog$ -======= ### shutdown `AsyncSeriesHook` -Called when the compiler is closing. +当编译器关闭时调用。 ### infrastructureLog ->>>>>>> 1fae7f858d0bc6a514754ec4adf3ade7bb679ed4 `SyncBailHook` diff --git a/src/content/guides/getting-started.mdx b/src/content/guides/getting-started.mdx index 117c014d4a61..cf8c628f0dcb 100644 --- a/src/content/guides/getting-started.mdx +++ b/src/content/guides/getting-started.mdx @@ -26,15 +26,12 @@ contributors: - anshumanv - d3lm - snitin315 -<<<<<<< HEAD + - Etheryen translators: - QC-L - jacob-lcs - conorzhong - dear-lizhihua -======= - - Etheryen ->>>>>>> 1fae7f858d0bc6a514754ec4adf3ade7bb679ed4 --- webpack 用于编译 JavaScript 模块。一旦完成 [安装](/guides/installation),你就可以通过 webpack [CLI](/api/cli) 或 [API](/api/node) 与其配合交互。如果你还不熟悉 webpack,请阅读 [核心概念](/concepts) 和 [对比](/comparison),了解为什么要使用 webpack,而不是社区中的其他工具。 diff --git a/yarn.lock b/yarn.lock index 1e223bd1b3c8..c117976446a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12505,7 +12505,7 @@ tmp@~0.2.1: dependencies: rimraf "^3.0.0" -tmpl@1.0.x: +tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==