Skip to content

docs(en): merge webpack.js.org/master into webpack.js.org/cn @ 2b1aaf87 #1624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jul 24, 2022
Merged

docs(en): merge webpack.js.org/master into webpack.js.org/cn @ 2b1aaf87 #1624

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
39b8e7e
build(deps-dev): bump @babel/preset-env from 7.18.6 to 7.18.9 (#6281)
dependabot[bot] Jul 19, 2022
ea671a6
build(deps-dev): bump eslint from 8.19.0 to 8.20.0 (#6285)
dependabot[bot] Jul 19, 2022
b06f41f
build(deps-dev): bump node-fetch from 3.2.8 to 3.2.9 (#6284)
dependabot[bot] Jul 19, 2022
f0b8411
build(deps-dev): bump @babel/core from 7.18.6 to 7.18.9 (#6282)
dependabot[bot] Jul 19, 2022
c66cdf4
docs(guides): refine code-splitting code snippets (#6279)
Matin297 Jul 19, 2022
5312c80
build(deps-dev): bump @babel/eslint-parser from 7.18.2 to 7.18.9 (#6283)
dependabot[bot] Jul 19, 2022
8d2b2f7
build(deps): bump terser from 4.8.0 to 4.8.1 (#6289)
dependabot[bot] Jul 20, 2022
e331873
build(deps-dev): bump @svgr/webpack from 6.2.1 to 6.3.0 (#6287)
dependabot[bot] Jul 20, 2022
fb01f4b
build(deps-dev): bump cypress from 10.3.0 to 10.3.1 (#6288)
dependabot[bot] Jul 20, 2022
8171405
build(deps-dev): bump markdownlint-cli (#6290)
chenxsan Jul 20, 2022
376a3e9
ci: try webpack cache (#6269)
snitin315 Jul 21, 2022
a5b2c2b
build(deps): bump react-spring from 9.5.0 to 9.5.1 (#6291)
dependabot[bot] Jul 22, 2022
c87d377
docs(plugins): fix stale content (#6292)
chenxsan Jul 22, 2022
2b1aaf8
build(deps-dev): bump @svgr/webpack from 6.3.0 to 6.3.1 (#6293)
dependabot[bot] Jul 23, 2022
0a32005
docs(en): merging all conflicts
docschina-bot Jul 23, 2022
d32b8f2
docs(en): fix conflicts
jacob-lcs Jul 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
docs(en): fix conflicts
  • Loading branch information
@jacob-lcs
jacob-lcs committed Jul 24, 2022
commit d32b8f207a14fc50a9c310c60d36bccc4924f13f
47 changes: 0 additions & 47 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6300,7 +6300,6 @@ glob-to-regexp@^0.4.1:
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==

<<<<<<< HEAD
glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
version "7.1.7"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
Expand All @@ -6313,21 +6312,6 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@~7.2.0:
=======
glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
>>>>>>> 2b1aaf87f83d67c075fcbcfe3bdd76f0d3dc5d9f
version "7.2.0"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
minimatch "^3.0.4"
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@~8.0.3:
version "8.0.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
Expand Down Expand Up @@ -8467,7 +8451,6 @@ [email protected]:
dependencies:
tmpl "1.0.5"

<<<<<<< HEAD
map-like@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/map-like/-/map-like-2.0.0.tgz#94496d49ad333c0dc3234b27adbbd1e8535953b4"
Expand All @@ -8478,19 +8461,6 @@ markdown-escapes@^1.0.0:
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==

[email protected]:
version "12.3.2"
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
dependencies:
argparse "^2.0.1"
entities "~2.1.0"
linkify-it "^3.0.1"
mdurl "^1.0.1"
uc.micro "^1.0.5"

=======
>>>>>>> 2b1aaf87f83d67c075fcbcfe3bdd76f0d3dc5d9f
[email protected]:
version "13.0.1"
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
Expand Down Expand Up @@ -8537,14 +8507,6 @@ markdownlint@^0.26.0, markdownlint@~0.26.0:
dependencies:
markdown-it "13.0.1"

<<<<<<< HEAD
markdownlint@~0.25.1:
version "0.25.1"
resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.25.1.tgz#df04536607ebeeda5ccd5e4f38138823ed623788"
integrity sha512-AG7UkLzNa1fxiOv5B+owPsPhtM4D6DoODhsJgiaNg1xowXovrYgOnLqAgOOFQpWOlHFVQUzjMY5ypNNTeov92g==
dependencies:
markdown-it "12.3.2"

md5@^2.3.0:
version "2.3.0"
resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
Expand All @@ -8554,8 +8516,6 @@ md5@^2.3.0:
crypt "0.0.2"
is-buffer "~1.1.6"

=======
>>>>>>> 2b1aaf87f83d67c075fcbcfe3bdd76f0d3dc5d9f
mdast-squeeze-paragraphs@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97"
Expand Down Expand Up @@ -12537,17 +12497,10 @@ terser-webpack-plugin@^5.1.3:
source-map "^0.6.1"
terser "^5.7.0"

<<<<<<< HEAD
terser@^4.0.0, terser@^4.6.3:
version "4.8.0"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
=======
terser@^4.0.0:
version "4.8.1"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
>>>>>>> 2b1aaf87f83d67c075fcbcfe3bdd76f0d3dc5d9f
dependencies:
commander "^2.20.0"
source-map "~0.6.1"
Expand Down