docs(en): merging all conflicts

ARCHITECTURE.md

@@ -4,7 +4,7 @@
 
 - The [`rollup`](https://www.npmjs.com/package/rollup) npm package contains both Rollup's Node.js JavaScript interface and the command-line-interface (CLI).
 - There is a separate browser build available as [`@rollup/browser`](https://www.npmjs.com/package/@rollup/browser). It exposes the same JavaScript interface as the Node.js build but does not include the CLI and also requires writing a plugin to encapsulate file reading. Instead of native code dependencies, this build has a bundled WASM artifact included that can be loaded in the browser. This is what the [Rollup REPL](https://rollupjs.org/repl) uses.
-- For every supported platform-architecture combination, there is a separate pacakge containing the native code. These are not listed in the committed `package.json` file but are added dynamically during publishing as `optionalDependencies`. The `README.md` and `package.json` files for those dependencies can be found in the [`npm`](npm) folder. The corresponding binaries are built and published from [GitHub Actions](.github/workflows/build-and-tests.yml) whenever a new release version tag is pushed. The actual loading of the native code is handled by [`native.js`](native.js) which is copied into the output folder during build. So to add a new platform-architecture combination, you need to
+- For every supported platform-architecture combination, there is a separate package containing the native code. These are not listed in the committed `package.json` file but are added dynamically during publishing as `optionalDependencies`. The `README.md` and `package.json` files for those dependencies can be found in the [`npm`](npm) folder. The corresponding binaries are built and published from [GitHub Actions](.github/workflows/build-and-tests.yml) whenever a new release version tag is pushed. The actual loading of the native code is handled by [`native.js`](native.js) which is copied into the output folder during build. So to add a new platform-architecture combination, you need to
   - add a new package in the `npm` folder
   - update the `native.js` file
   - add the corresponding triple to the [`package.json`](package.json) file as napi-rs depends on this
@@ -24,7 +24,7 @@
   - The entry point for the Node.js build is [`node-entry.ts`](src/node-entry.ts) while the browser build uses [`browser-entry.ts`](src/browser-entry.ts). Those are mostly identical except that the browser build does not expose the watch mode interface.
 - The CLI is a wrapper around the JavaScript interface.
   - It resides in the [`cli` folder](cli) with the entry point [cli.ts](cli/cli.ts).
-  - The logic to read configuration files resides in [locaConfigFile.ts](cli/run/loadConfigFile.ts) and is exposed as a separate export via `import { loadConfigFile } from "rollup/loadConfigFile"`.
+  - The logic to read configuration files resides in [loadConfigFile.ts](cli/run/loadConfigFile.ts) and is exposed as a separate export via `import { loadConfigFile } from "rollup/loadConfigFile"`.
   - Only the CLI is able to handle arrays of configurations. Those are handled sequentially in [`run/index.ts`](cli/run/index.ts).
   - The CLI handles several CLI-only options that are specific to the Node.js environment like setting environment variables or handling std-in, see [Command line flags](docs/command-line-interface/index.md#command-line-flags).
 
@@ -42,7 +42,7 @@ The Rust entrypoints are [`bindings_napi/src/lib.rs`](rust/bindings_napi/src/lib
 
 Building an output has two phases
 
-- The "build" phase builds a module graph form the input files and decides, which code should be included in the output
+- The "build" phase builds a module graph from the input files and decides, which code should be included in the output
   - It is triggered by calling the `rollup(inputOptions)` function exported by the JavaScript interface
   - It returns a "bundle" object that has `generate` and `write` methods
 - The "generate" phase generates the output files from the bundle by calling `.generate(outputOptions)` or `.write(outputOptions)`
@@ -96,14 +96,14 @@ To understand this phase from a plugin perspective, have a look at [Build Hooks]
 
 To understand this phase from a plugin perspective, have a look at [Output Generation Hooks](https://rollupjs.org/plugin-development/#output-generation-hooks), which again contains a graph to show in which order these hooks are executed. In detail `Bundle.generate` performs the following steps
 
-- Assign modules to chunks via [`chunkAssigment.ts`](src/utils/chunkAssignment.ts)
+- Assign modules to chunks via [`chunkAssignment.ts`](src/utils/chunkAssignment.ts)
 - Determine the exports for each chunk by tracing the included inter-module dependencies
 - Render the chunks, which is orchestrated by the [`renderChunks`](src/utils/renderChunks.ts) helper
   - Render the chunks with placeholders for chunk hashes by calling `Chunk.render()`
     - Determine how dynamic imports and `import.meta` references should be resolved and store this on the corresponding AST nodes.
     - Determine the final deconflicted variable names and store those on the AST nodes as well in [`deconflictChunk.ts`](src/utils/deconflictChunk.ts)
     - Render each module by calling the `.render` methods of their AST nodes. This is also where tree-shaken nodes are removed from the output.
-    - Render the format specific wrapper with imports and exports for this chunk by calling the corresponding [finalizer](src/finalisers).
+    - Render the format specific wrapper with imports and exports for this chunk by calling the corresponding [finaliser](src/finalisers).
   - Transform the rendered chunks via the [`renderChunk`](https://rollupjs.org/plugin-development/#renderchunk) plugin hook
   - Determine the final chunk hashes based on the actual rendered content and the chunk dependency graph and replace the placeholders
 

CHANGELOG.md

@@ -1,5 +1,26 @@
 # rollup changelog
 
+## 4.18.0
+
+_2024-05-22_
+
+### Features
+
+- Resolve import.meta.filename and .dirname in transpiled plugins (#5520)
+
+### Pull Requests
+
+- [#5504](https://github.com/rollup/rollup/pull/5504): Auto generate node index (@lukastaegert)
+- [#5507](https://github.com/rollup/rollup/pull/5507): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
+- [#5508](https://github.com/rollup/rollup/pull/5508): chore(deps): lock file maintenance (@renovate[bot])
+- [#5510](https://github.com/rollup/rollup/pull/5510): Split up converter.rs into AST nodes (@lukastaegert)
+- [#5512](https://github.com/rollup/rollup/pull/5512): chore(deps): update dependency builtin-modules to v4 (@renovate[bot], @lukastaegert)
+- [#5514](https://github.com/rollup/rollup/pull/5514): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
+- [#5518](https://github.com/rollup/rollup/pull/5518): chore(deps): update dependency eslint-plugin-unicorn to v53 (@renovate[bot], @lukastaegert)
+- [#5519](https://github.com/rollup/rollup/pull/5519): chore(deps): lock file maintenance minor/patch updates (@renovate[bot], @lukastaegert)
+- [#5520](https://github.com/rollup/rollup/pull/5520): Resolve import.meta.{filename,dirname} in files imported from config (@BPScott)
+- [#5521](https://github.com/rollup/rollup/pull/5521): docs: correct base32 to base36 in documentation (@highcastlee)
+
 ## 4.17.2
 
 _2024-04-30_

CONTRIBUTING.md

@@ -61,6 +61,10 @@ After applying this setting, you may need to reset your local branch to ensure t
 git reset --hard
 ```
 
+### Installing dependencies
+
+Running `npm install` will install the necessary dependencies. If it fails, it might be because the Rust toolchain is not yet set up for WebAssembly, see above.
+
 ### How to run one test on your local machine
 
 With `npm run test` you can run all tests together.

LICENSE.md

@@ -122,7 +122,7 @@ Repository: micromatch/braces
 
 > The MIT License (MIT)
 > 
-> Copyright (c) 2014-2018, Jon Schlinkert.
+> Copyright (c) 2014-present, Jon Schlinkert.
 > 
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal

browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "4.17.2",
+  "version": "4.18.0",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",

cli/run/loadConfigFile.ts

@@ -118,8 +118,14 @@ async function loadTranspiledConfigFile(
 					if (property === 'url') {
 						return `'${pathToFileURL(moduleId).href}'`;
 					}
+					if (property == 'filename') {
+						return `'${moduleId}'`;
+					}
+					if (property == 'dirname') {
+						return `'${path.dirname(moduleId)}'`;
+					}
 					if (property == null) {
-						return `{url:'${pathToFileURL(moduleId).href}'}`;
+						return `{url:'${pathToFileURL(moduleId).href}', filename: '${moduleId}', dirname: '${path.dirname(moduleId)}'}`;
 					}
 				}
 			}

docs/configuration-options/index.md

@@ -908,11 +908,19 @@ exports.foo = foo;
 
 ### output.hashCharacters
 
+<<<<<<< HEAD
 |        |                                 |
 | -----: | :------------------------------ |
 | 类型： | `"base64" \| "base32" \| "hex"` |
 |  CLI： | `--hashCharacters <name>`       |
 | 默认： | `"base64"`                      |
+=======
+|          |                                 |
+| -------: | :------------------------------ |
+|    Type: | `"base64" \| "base36" \| "hex"` |
+|     CLI: | `--hashCharacters <name>`       |
+| Default: | `"base64"`                      |
+>>>>>>> 1a7da5ac529d543ad8fffd1cdfbf9a80040a1176
 
 这个选项决定了 Rollup 在生成文件哈希时可以使用的字符集。