diff --git a/docs/05-plugin-development.md b/docs/05-plugin-development.md
index 0abc711e461..c5ba87e775e 100644
--- a/docs/05-plugin-development.md
+++ b/docs/05-plugin-development.md
@@ -201,7 +201,7 @@ In case a dynamic import is not passed a string as argument, this hook gets acce
 Note that the return value of this hook will not be passed to `resolveId` afterwards; if you need access to the static resolution algorithm, you can use [`this.resolve(source, importer)`](guide/en/#thisresolvesource-string-importer-string-options-skipself-boolean--promiseid-string-external-boolean--null) on the plugin context.
 
 #### `resolveFileUrl`
-Type: `({assetReferenceId: string | null, chunkId: string, chunkReferenceId: string | null, fileName: string, format: string, moduleId: string, relativePath: string}) => string | null`<br>
+Type: `({chunkId: string, fileName: string, format: string, moduleId: string, referenceId: string, relativePath: string}) => string | null`<br>
 Kind: `sync, first`
 
 Allows to customize how Rollup resolves URLs of files that were emitted by plugins via `this.emitAsset` or `this.emitChunk`. By default, Rollup will generate code for `import.meta.ROLLUP_ASSET_URL_assetReferenceId` and `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId` that should correctly generate absolute URLs of emitted files independent of the output format and the host system where the code is deployed.
@@ -327,38 +327,50 @@ Adds additional files to be monitored in watch mode so that changes to these fil
 
 In general, it is recommended to use `this.addWatchfile` from within the hook that depends on the watched file.
 
-#### `this.emitAsset(assetName: string, source: string) => string`
+#### `this.emitFile(emittedFile: EmittedChunk | EmittedAsset) => string`
 
-Emits a custom file that is included in the build output, returning an `assetReferenceId` that can be used to reference the emitted file. You can defer setting the source if you provide it later via [`this.setAssetSource(assetReferenceId, source)`](guide/en/#thissetassetsourceassetreferenceid-string-source-string--buffer--void). A string or Buffer source must be set for each asset through either method or an error will be thrown on generate completion.
+Emits a new file that is included in the build output and returns a `referenceId` that can be used in various places to reference the emitted file. `emittedFile` can have one of two forms:
 
-Emitted assets will follow the [`output.assetFileNames`](guide/en/#outputassetfilenames) naming scheme. You can reference the URL of the file in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_ASSET_URL_assetReferenceId`. See [Asset URLs](guide/en/#asset-urls) for more details and an example.
-
-The generated code that replaces `import.meta.ROLLUP_ASSET_URL_assetReferenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the asset has been finalized during `generate`, you can also use [`this.getAssetFileName(assetReferenceId)`](guide/en/#thisgetassetfilenameassetreferenceid-string--string) to determine the file name.
+```
+// EmittedChunk
+{
+  type: 'chunk',
+  id: string,
+  name?: string,
+  fileName?: string
+}
 
-#### `this.emitChunk(moduleId: string, options?: {name?: string}) => string`
+// EmittedAsset
+{
+  type: 'asset',
+  source?: string | Buffer,
+  name?: string,
+  fileName?: string
+}
+```
 
-Emits a new chunk with the given module as entry point. This will not result in duplicate modules in the graph, instead if necessary, existing chunks will be split. It returns a `chunkReferenceId` that can be used to later access the generated file name of the chunk.
+In both cases, either a `name` or a `fileName` can be supplied. If a `fileName` is provided, it will be used unmodified as the name of the generated file, throwing an error if this causes a conflict. Otherwise if a `name` is supplied, this will be used as substitution for `[name]` in the corresponding [`output.chunkFileNames`](guide/en/#outputchunkfilenames) or [`output.assetFileNames`](guide/en/#outputassetfilenames) pattern, possibly adding a unique number to the end of the file name to avoid conflicts. If neither a `name` nor `fileName` is supplied, a default name will be used.
+                          
+You can reference the URL of an emitted file in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_FILE_URL_referenceId`. See [File URLs](guide/en/#file-urls) for more details and an example.
+                          
+The generated code that replaces `import.meta.ROLLUP_FILE_URL_referenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. You can also use [`this.getFileName(referenceId)`](guide/en/#thisgetfilenamereferenceid-string--string) to determine the file name as soon as it is available
 
-Emitted chunks will follow the [`output.chunkFileNames`](guide/en/#outputchunkfilenames), [`output.entryFileNames`](guide/en/#outputentryfilenames) naming scheme. If a `name` is provided, this will be used for the `[name]` file name placeholder, otherwise the name will be derived from the file name. If a `name` is provided, this name must not conflict with any other entry point names unless the entry points reference the same entry module. You can reference the URL of the emitted chunk in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId`.
+If the `type` is *`chunk`*, then this emits a new chunk with the given module id as entry point. This will not result in duplicate modules in the graph, instead if necessary, existing chunks will be split or a facade chunk with reexports will be created. Chunks with a specified `fileName` will always generate separate chunks while other emitted chunks may be deduplicated with existing chunks even if the `name` does not match. If such a chunk is not deduplicated, the [`output.chunkFileNames`](guide/en/#outputchunkfilenames) name pattern will be used.
 
-The generated code that replaces `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the chunk has been rendered during `generate`, you can also use [`this.getChunkFileName(chunkReferenceId)`](guide/en/#thisgetchunkfilenamechunkreferenceid-string--string) to determine the file name.
+If the `type` is *`asset`*, then this emits an arbitrary new file with the given `source` as content. It is possible to defer setting the `source` via [`this.setAssetSource(assetReferenceId, source)`](guide/en/#thissetassetsourceassetreferenceid-string-source-string--buffer--void) to a later time to be able to reference a file during the build phase while setting the source separately for each output during the generate phase. Assets with a specified `fileName` will always generate separate files while other emitted assets may be deduplicated with existing assets if they have the same source even if the `name` does not match. If such an asset is not deduplicated, the [`output.assetFileNames`](guide/en/#outputassetfilenames) name pattern will be used.
 
 #### `this.error(error: string | Error, position?: number | { column: number; line: number }) => never`
 
 Structurally equivalent to `this.warn`, except that it will also abort the bundling process.
 
-#### `this.getAssetFileName(assetReferenceId: string) => string`
-
-Get the file name of an asset, according to the `assetFileNames` output option pattern. The file name will be relative to `outputOptions.dir`.
-
-#### `this.getChunkFileName(chunkReferenceId: string) => string`
-
-Get the file name of an emitted chunk. The file name will be relative to `outputOptions.dir`.
-
 #### `this.getCombinedSourcemap() => SourceMap`
 
 Get the combined source maps of all previous plugins. This context function can only be used in [`transform`](guide/en/#transform) plugin hook.
 
+#### `this.getFileName(referenceId: string) => string`
+
+Get the file name of a chunk or asset that has been emitted via [`this.emitFile`](guide/en/#thisemitfileemittedfile-emittedchunk--emittedasset--string) . The file name will be relative to `outputOptions.dir`.
+
 #### `this.getModuleInfo(moduleId: string) => ModuleInfo`
 
 Returns additional information about the module in question in the form
@@ -422,13 +434,29 @@ The `position` argument is a character index where the warning was raised. If pr
 
 ☢️ These context utility functions have been deprecated and may be removed in a future Rollup version.
 
-- `this.isExternal(id: string, importer: string, isResolved: boolean): boolean` - _**Use [`this.resolve`](guide/en/#thisresolvesource-string-importer-string-options-skipself-boolean--promiseid-string-external-boolean--null)**_ - Determine if a given module ID is external when imported by `importer`. When `isResolved` is false, Rollup will try to resolve the id before testing if it is external.
+- `this.emitAsset(assetName: string, source: string) => string` - _**Use [`this.emitFile`](guide/en/#thisemitfileemittedfile-emittedchunk--emittedasset--string)**_ - Emits a custom file that is included in the build output, returning an `assetReferenceId` that can be used to reference the emitted file. You can defer setting the source if you provide it later via [`this.setAssetSource(assetReferenceId, source)`](guide/en/#thissetassetsourceassetreferenceid-string-source-string--buffer--void). A string or Buffer source must be set for each asset through either method or an error will be thrown on generate completion.
+  
+  Emitted assets will follow the [`output.assetFileNames`](guide/en/#outputassetfilenames) naming scheme. You can reference the URL of the file in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_ASSET_URL_assetReferenceId`.
+  
+  The generated code that replaces `import.meta.ROLLUP_ASSET_URL_assetReferenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the asset has been finalized during `generate`, you can also use [`this.getFileName(assetReferenceId)`](guide/en/#thisgetfilenamereferenceid-string--string) to determine the file name.
+
+- `this.emitChunk(moduleId: string, options?: {name?: string}) => string` - _**Use [`this.emitFile`](guide/en/#thisemitfileemittedfile-emittedchunk--emittedasset--string)**_ - Emits a new chunk with the given module as entry point. This will not result in duplicate modules in the graph, instead if necessary, existing chunks will be split. It returns a `chunkReferenceId` that can be used to later access the generated file name of the chunk.
+  
+  Emitted chunks will follow the [`output.chunkFileNames`](guide/en/#outputchunkfilenames), [`output.entryFileNames`](guide/en/#outputentryfilenames) naming scheme. If a `name` is provided, this will be used for the `[name]` file name placeholder, otherwise the name will be derived from the file name. If a `name` is provided, this name must not conflict with any other entry point names unless the entry points reference the same entry module. You can reference the URL of the emitted chunk in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId`.
+  
+  The generated code that replaces `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the chunk has been rendered during `generate`, you can also use [`this.getFileName(chunkReferenceId)`](guide/en/#thisgetfilenamereferenceid-string--string) to determine the file name.
+
+- `this.getAssetFileName(assetReferenceId: string) => string` - _**Use [`this.getFileName`](guide/en/#thisgetfilenamereferenceid-string--string)**_ - Get the file name of an asset, according to the `assetFileNames` output option pattern. The file name will be relative to `outputOptions.dir`.
+
+- `this.getChunkFileName(chunkReferenceId: string) => string` - _**Use [`this.getFileName`](guide/en/#thisgetfilenamereferenceid-string--string)**_ - Get the file name of an emitted chunk. The file name will be relative to `outputOptions.dir`.
+
+- `this.isExternal(id: string, importer: string, isResolved: boolean) => boolean` - _**Use [`this.resolve`](guide/en/#thisresolvesource-string-importer-string-options-skipself-boolean--promiseid-string-external-boolean--null)**_ - Determine if a given module ID is external when imported by `importer`. When `isResolved` is false, Rollup will try to resolve the id before testing if it is external.
 
 - `this.resolveId(source: string, importer: string) => Promise<string | null>` - _**Use [`this.resolve`](guide/en/#thisresolvesource-string-importer-string-options-skipself-boolean--promiseid-string-external-boolean--null)**_ - Resolve imports to module ids (i.e. file names) using the same plugins that Rollup uses. Returns `null` if an id cannot be resolved.
 
-### Asset URLs
+### File URLs
 
-To reference an asset URL reference from within JS code, use the `import.meta.ROLLUP_ASSET_URL_assetReferenceId` replacement. This will generate code that depends on the output format and generates a URL that points to the emitted file in the target environment. Note that all formats except CommonJS and UMD assume that they run in a browser environment where `URL` and `document` are available.
+To reference a file URL reference from within JS code, use the `import.meta.ROLLUP_FILE_URL_referenceId` replacement. This will generate code that depends on the output format and generates a URL that points to the emitted file in the target environment. Note that all formats except CommonJS and UMD assume that they run in a browser environment where `URL` and `document` are available.
 
 The following example will detect imports of `.svg` files, emit the imported files as assets, and return their URLs to be used e.g. as the `src` attribute of an `img` tag:
 
@@ -443,26 +471,28 @@ export default function svgResolverPlugin () {
     },
     load(id) {
       if (id.endsWith('.svg')) {
-      	const assetReferenceId = this.emitAsset(
-          path.basename(id),
-          fs.readFileSync(id)
-        );
-        return `export default import.meta.ROLLUP_ASSET_URL_${assetReferenceId};`;
+      	const referenceId = this.emitFile({
+          type: 'asset',
+          name: path.basename(id),
+          source: fs.readFileSync(id)
+        });
+        return `export default import.meta.ROLLUP_FILE_URL_${referenceId};`;
       }
     }
   });
 }
+```
+
+Usage:
 
-// usage
+```js
 import logo from '../images/logo.svg';
 const image = document.createElement('img');
 image.src = logo;
 document.body.appendChild(image);
 ```
 
-### Chunk URLs
-
-Similar to assets, emitted chunks can be referenced from within JS code via the `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId` replacement.
+Similar to assets, emitted chunks can be referenced from within JS code via `import.meta.ROLLUP_FILE_URL_referenceId` as well. 
 
 The following example will detect imports prefixed with `register-paint-worklet:` and generate the necessary code and separate chunk to generate a CSS paint worklet. Note that this will only work in modern browsers and will only work if the output format is set to `esm`.
 
@@ -473,20 +503,21 @@ export default function paintWorkletPlugin () {
   return ({
     load(id) {
       if (id.startsWith(REGISTER_WORKLET)) {
-        return `CSS.paintWorklet.addModule(import.meta.ROLLUP_CHUNK_URL_${this.emitChunk(
-          id.slice(REGISTER_WORKLET.length)
-        )});`;
+        return `CSS.paintWorklet.addModule(import.meta.ROLLUP_FILE_URL_${this.emitFile({
+          type: 'chunk',
+          id: id.slice(REGISTER_WORKLET.length)
+        })});`;
       }
     },
     resolveId(source, importer) {
       // We remove the prefix, resolve everything to absolute ids and add the prefix again
       // This makes sure that you can use relative imports to define worklets
-      if (source.startsWith(REGISTER_WORKLET)) {
-        return this.resolveId(source.slice(REGISTER_WORKLET.length), importer).then(
-          id => REGISTER_WORKLET + id
-        );
-      }
-      return null;
+	  if (source.startsWith(REGISTER_WORKLET)) {
+	    return this.resolve(source.slice(REGISTER_WORKLET.length), importer).then(
+	      resolvedId => REGISTER_WORKLET + resolvedId.id
+	    );
+	  }
+	  return null;
     }
   });
 }
@@ -503,17 +534,17 @@ document.body.innerHTML += `<h1 style="background-image: paint(vertical-lines);"
 // worklet.js
 import { color, size } from './config.js';
 registerPaint(
-	'vertical-lines',
-	class {
-		paint(ctx, geom) {
-			for (let x = 0; x < geom.width / size; x++) {
-				ctx.beginPath();
-				ctx.fillStyle = color;
-				ctx.rect(x * size, 0, 2, geom.height);
-				ctx.fill();
-			}
-		}
-	}
+  'vertical-lines',
+  class {
+    paint(ctx, geom) {
+      for (let x = 0; x < geom.width / size; x++) {
+        ctx.beginPath();
+        ctx.fillStyle = color;
+        ctx.rect(x * size, 0, 2, geom.height);
+        ctx.fill();
+      }
+    }
+  }
 );
 
 // config.js
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/_config.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js
new file mode 100644
index 00000000000..c7f12af1025
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js
@@ -0,0 +1,10 @@
+define(['exports', '../generated-chunk'], function (exports, dep) { 'use strict';
+
+	const id = 'startBuild';
+	console.log(id, dep.value);
+
+	exports.id = id;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-chunk.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/generated-chunk.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-chunk.js
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js
new file mode 100644
index 00000000000..5ab113347f0
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js
@@ -0,0 +1,7 @@
+define(['./generated-chunk', './custom/build-start-chunk'], function (dep, buildStart) { 'use strict';
+
+	console.log(buildStart.id);
+
+	console.log('main', dep.value);
+
+});
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js
new file mode 100644
index 00000000000..c619394654a
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js
@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var dep = require('../generated-chunk.js');
+
+const id = 'startBuild';
+console.log(id, dep.value);
+
+exports.id = id;
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-chunk.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/generated-chunk.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-chunk.js
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js
similarity index 50%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js
index c199d16a106..33c4c2c445e 100644
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js
@@ -1,5 +1,8 @@
 'use strict';
 
 var dep = require('./generated-chunk.js');
+var buildStart = require('./custom/build-start-chunk.js');
+
+console.log(buildStart.id);
 
 console.log('main', dep.value);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js
new file mode 100644
index 00000000000..8125f265dc7
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js
@@ -0,0 +1,6 @@
+import { v as value } from '../generated-chunk.js';
+
+const id = 'startBuild';
+console.log(id, value);
+
+export { id };
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-chunk.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/generated-chunk.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-chunk.js
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js
similarity index 53%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js
index 9ccd67b1a67..c07ac33243f 100644
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js
@@ -1,3 +1,6 @@
 import { v as value } from './generated-chunk.js';
+import { id } from './custom/build-start-chunk.js';
+
+console.log(id);
 
 console.log('main', value);
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js
similarity index 50%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js
index f366fbd644f..e740725842c 100644
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js
@@ -1,4 +1,4 @@
-System.register(['../generated-chunk.js'], function () {
+System.register(['../generated-chunk.js'], function (exports) {
 	'use strict';
 	var value;
 	return {
@@ -7,7 +7,8 @@ System.register(['../generated-chunk.js'], function () {
 		}],
 		execute: function () {
 
-			console.log('startBuild', value);
+			const id = exports('id', 'startBuild');
+			console.log(id, value);
 
 		}
 	};
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-chunk.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/generated-chunk.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-chunk.js
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js
new file mode 100644
index 00000000000..d95239821e0
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js
@@ -0,0 +1,18 @@
+System.register(['./generated-chunk.js', './custom/build-start-chunk.js'], function () {
+	'use strict';
+	var value, id;
+	return {
+		setters: [function (module) {
+			value = module.v;
+		}, function (module) {
+			id = module.id;
+		}],
+		execute: function () {
+
+			console.log(id);
+
+			console.log('main', value);
+
+		}
+	};
+});
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/buildStart.js
new file mode 100644
index 00000000000..6325b61de44
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/buildStart.js
@@ -0,0 +1,3 @@
+import value from './dep.js';
+export const id = 'startBuild';
+console.log(id, value);
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/dep.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/dep.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/dep.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/dep.js
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/dep2.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/dep2.js
new file mode 100644
index 00000000000..4eeb9622ee7
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/dep2.js
@@ -0,0 +1,3 @@
+import { id } from './buildStart.js';
+
+console.log(id);
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/main.js
similarity index 74%
rename from test/chunking-form/samples/emit-file/emit-named-chunk/main.js
rename to test/chunking-form/samples/emit-file/emit-chunk-filename/main.js
index 4a9b3a3f405..3b6fe4061ad 100644
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/main.js
@@ -1,3 +1,3 @@
 import value from './dep.js';
-
+import './dep2.js';
 console.log('main', value);
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js
deleted file mode 100644
index eb910f88982..00000000000
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define(['../generated-chunk'], function (dep) { 'use strict';
-
-	console.log('startBuild', dep.value);
-
-});
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js
deleted file mode 100644
index 2fe39264b7d..00000000000
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define(['./generated-chunk'], function (dep) { 'use strict';
-
-	console.log('main', dep.value);
-
-});
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js
deleted file mode 100644
index 95376156df4..00000000000
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-var dep = require('../generated-chunk.js');
-
-console.log('startBuild', dep.value);
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js
deleted file mode 100644
index 015c2211ce2..00000000000
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { v as value } from '../generated-chunk.js';
-
-console.log('startBuild', value);
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js
deleted file mode 100644
index 8a46bd2bdb1..00000000000
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js
+++ /dev/null
@@ -1,14 +0,0 @@
-System.register(['./generated-chunk.js'], function () {
-	'use strict';
-	var value;
-	return {
-		setters: [function (module) {
-			value = module.v;
-		}],
-		execute: function () {
-
-			console.log('main', value);
-
-		}
-	};
-});
diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js b/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js
deleted file mode 100644
index f9b1b414da5..00000000000
--- a/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import value from './dep.js';
-
-console.log('startBuild', value);