From cc993e767e9ae0449d267d0beebac13c92dcb002 Mon Sep 17 00:00:00 2001 From: Ben Scott <227292+BPScott@users.noreply.github.com> Date: Tue, 21 May 2024 21:24:51 -0700 Subject: [PATCH 1/3] Resolve import.meta.{filename,dirname} in files imported from config (#5520) Use correct import.meta.{filename,dirname} in relative imports from transpiled config files --- cli/run/loadConfigFile.ts | 8 +++++++- test/cli/samples/config-import-meta/_config.js | 2 +- test/cli/samples/config-import-meta/plugin/plugin.js | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cli/run/loadConfigFile.ts b/cli/run/loadConfigFile.ts index d01c1980e..33e3297d7 100644 --- a/cli/run/loadConfigFile.ts +++ b/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)}'}`; } } } diff --git a/test/cli/samples/config-import-meta/_config.js b/test/cli/samples/config-import-meta/_config.js index e5a746b07..49681ab38 100644 --- a/test/cli/samples/config-import-meta/_config.js +++ b/test/cli/samples/config-import-meta/_config.js @@ -1,4 +1,4 @@ module.exports = defineTest({ - description: 'uses correct import.meta.url in config files', + description: 'uses correct import.meta.{url,filename,dirname} in config files', command: 'rollup -c --bundleConfigAsCjs' }); diff --git a/test/cli/samples/config-import-meta/plugin/plugin.js b/test/cli/samples/config-import-meta/plugin/plugin.js index c6d15f8db..29f042c94 100644 --- a/test/cli/samples/config-import-meta/plugin/plugin.js +++ b/test/cli/samples/config-import-meta/plugin/plugin.js @@ -9,6 +9,8 @@ const fileName = `test.txt`; function validateImportMeta(importMeta) { assert.strictEqual(importMeta.url, import.meta.url); + assert.strictEqual(importMeta.filename, import.meta.filename); + assert.strictEqual(importMeta.dirname, import.meta.dirname); } validateImportMeta(import.meta); From 13d8c990f1022222f6faeee03750b28d2811cb76 Mon Sep 17 00:00:00 2001 From: Bart Date: Wed, 22 May 2024 13:31:04 +0900 Subject: [PATCH 2/3] docs: correct base32 to base36 in documentation (#5521) --- docs/configuration-options/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration-options/index.md b/docs/configuration-options/index.md index f106d8811..5742644d6 100755 --- a/docs/configuration-options/index.md +++ b/docs/configuration-options/index.md @@ -910,7 +910,7 @@ exports.foo = foo; | | | | -------: | :------------------------------ | -| Type: | `"base64" \| "base32" \| "hex"` | +| Type: | `"base64" \| "base36" \| "hex"` | | CLI: | `--hashCharacters ` | | Default: | `"base64"` | From bb6f069ea3623b0297ef3895f2dcb98a2ca5ef58 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 22 May 2024 06:52:20 +0200 Subject: [PATCH 3/3] 4.18.0 --- CHANGELOG.md | 21 +++++++++++++++++++++ browser/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88942dad7..53ce699b2 100644 --- a/CHANGELOG.md +++ b/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_ diff --git a/browser/package.json b/browser/package.json index ddd69bac5..8cbc1ab1b 100644 --- a/browser/package.json +++ b/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", diff --git a/package-lock.json b/package-lock.json index d4d080112..db9455ec3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup", - "version": "4.17.2", + "version": "4.18.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rollup", - "version": "4.17.2", + "version": "4.18.0", "license": "MIT", "dependencies": { "@types/estree": "1.0.5" diff --git a/package.json b/package.json index a091a2440..b38442031 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "4.17.2", + "version": "4.18.0", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js",