Skip to content

Commit 8dcd69a

Browse files
committed
Merge remote-tracking branch 'upstream/main' into docs/instructions-to-generate-personal-tokens
2 parents f1ee387 + d803b54 commit 8dcd69a

25 files changed

Lines changed: 207 additions & 146 deletions

.github/CODE_OF_CONDUCT.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/FUNDING.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v5
1919

2020
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@v5
2222
with:
2323
node-version: ${{ matrix.node-version }}
2424
cache: yarn

.github/workflows/testing.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v5
2020

2121
- name: Use Node.js ${{ matrix.node-version }}
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@v5
2323
with:
2424
node-version: ${{ matrix.node-version }}
2525
cache: yarn
@@ -38,7 +38,7 @@ jobs:
3838
- uses: actions/checkout@v5
3939

4040
- name: Use Node.js ${{ matrix.node-version }}
41-
uses: actions/setup-node@v4
41+
uses: actions/setup-node@v5
4242
with:
4343
node-version: ${{ matrix.node-version }}
4444
cache: yarn
@@ -58,7 +58,7 @@ jobs:
5858
- uses: actions/checkout@v5
5959

6060
- name: Use Node.js ${{ matrix.node-version }}
61-
uses: actions/setup-node@v4
61+
uses: actions/setup-node@v5
6262
with:
6363
node-version: ${{ matrix.node-version }}
6464
cache: yarn
@@ -84,7 +84,7 @@ jobs:
8484
- uses: actions/checkout@v5
8585

8686
- name: Use Node.js ${{ matrix.node-version }}
87-
uses: actions/setup-node@v4
87+
uses: actions/setup-node@v5
8888
with:
8989
node-version: ${{ matrix.node-version }}
9090
cache: yarn

src/components/Footer/Footer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const Footer = () => (
3939
<Link className="footer__link" to="/branding/">
4040
Branding
4141
</Link>
42-
<Link className="footer__link" to="https://discord.com/invite/8WWf6F7p">
42+
<Link className="footer__link" to="https://discord.com/invite/5sxFZPdx2k">
4343
Discord
4444
</Link>
4545
<Link

src/content/api/loaders.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ addDependency(file: string)
224224
dependency(file: string) // shortcut
225225
```
226226

227-
Add an existing file as a dependency of the loader result in order to make them watchable. For example, [`sass-loader`](https://github.com/webpack-contrib/sass-loader), [`less-loader`](https://github.com/webpack-contrib/less-loader) uses this to recompile whenever any imported `css` file changes.
227+
Add an existing file as a dependency of the loader result in order to make them watchable. For example, [`sass-loader`](https://github.com/webpack/sass-loader), [`less-loader`](https://github.com/webpack/less-loader) uses this to recompile whenever any imported `css` file changes.
228228

229229
### this.addMissingDependency
230230

src/content/api/module-methods.mdx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ contributors:
1414
- jamesgeorge007
1515
- WofWca
1616
- snitin315
17+
- adriancuadrado
1718
related:
1819
- title: CommonJS Wikipedia
1920
url: https://en.wikipedia.org/wiki/CommonJS
@@ -97,7 +98,8 @@ W> This feature relies on [`Promise`](https://developer.mozilla.org/en-US/docs/W
9798

9899
It is not possible to use a fully dynamic import statement, such as `import(foo)`. Because `foo` could potentially be any path to any file in your system or project.
99100

100-
The `import()` must contain at least some information about where the module is located. Bundling can be limited to a specific directory or set of files so that when you are using a dynamic expression - every module that could potentially be requested on an `import()` call is included. For example, ``import(`./locale/${language}.json`)`` will cause every `.json` file in the `./locale` directory to be bundled into the new chunk. At run time, when the variable `language` has been computed, any file like `english.json` or `german.json` will be available for consumption.
101+
The `import()` must contain at least some information about where the module is located. Bundling can be limited to a specific directory or set of files so that when you are using a dynamic expression - every module that could potentially be requested on an `import()` call is included.
102+
For example, ``import(`./locale/${language}.json`)`` will only bundle all `.json` files in the `./locale` directory and subdirectories into the new chunk and exclude files with other file extensions. At run time, when the variable `language` has been computed, any file like `english.json` or `german.json` will be available for consumption.
101103

102104
```javascript
103105
// imagine we had a method to get language from cookies or other storage
@@ -111,7 +113,7 @@ T> Using the [`webpackInclude` and `webpackExclude`](/api/module-methods/#magic-
111113

112114
#### Magic Comments
113115

114-
Inline comments to make features work. By adding comments to the import, we can do things such as name our chunk or select different modes. For a full list of these magic comments see the code below followed by an explanation of what these comments do.
116+
By adding comments to the import, we can do things such as name our chunk or select different modes. For a full list of these magic comments see the code below followed by an explanation of what these comments do.
115117

116118
```js
117119
// Single target
@@ -137,6 +139,8 @@ import(
137139
import(/* webpackIgnore: true */ 'ignored-module.js');
138140
```
139141

142+
T> Single line comments (`//`) are also supported. JSDoc comments (`/** */`) are not.
143+
140144
##### webpackIgnore
141145

142146
**JavaScript Usage**

src/content/api/normalmodulefactory-hooks.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,4 @@ Possible default identifiers:
152152
5. `asset/source`
153153
6. `asset/resource`
154154
7. `asset/inline`
155+
8. `asset/bytes`

0 commit comments

Comments
 (0)