Fix tests

rollup · Nov 5, 2022 · 29ae273 · 29ae273
1 parent 383dbc9
commit 29ae273
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 11 deletions.
diff --git a/src/utils/chunkAssignment.ts b/src/utils/chunkAssignment.ts
@@ -2,6 +2,7 @@ import ExternalModule from '../ExternalModule';
 import Module from '../Module';
 import { getOrCreate } from './getOrCreate';
 import relativeId from './relativeId';
+import { timeEnd, timeStart } from './timers';
 
 type DependentModuleMap = Map<Module, Set<Module>>;
 type ChunkDefinitions = { alias: string | null; modules: Module[] }[];
@@ -203,6 +204,7 @@ function getOptimizedChunks(
 	chunkModulesBySignature: { [chunkSignature: string]: Module[] },
 	minChunkSize: number
 ) {
+	timeStart('optimize chunks', 3);
 	const { chunksToBeMerged, unmergeableChunks } = getMergeableChunks(
 		chunkModulesBySignature,
 		minChunkSize
@@ -240,6 +242,7 @@ function getOptimizedChunks(
 			unmergeableChunks.push(sourceChunk);
 		}
 	}
+	timeEnd('optimize chunks', 3);
 	return unmergeableChunks;
 }
 

diff --git a/test/chunking-form/samples/minChunkSize/best-merge-target/_config.js b/test/chunking-form/samples/minChunkSize/best-merge-target/_config.js
@@ -1,5 +1,4 @@
 module.exports = {
-	solo: true,
 	description: 'uses the merge target that is closest',
 	options: {
 		input: [

diff --git a/test/chunking-form/samples/minChunkSize/merge-chunk-into-distant-shared/_config.js b/test/chunking-form/samples/minChunkSize/merge-chunk-into-distant-shared/_config.js
@@ -1,5 +1,4 @@
 module.exports = {
-	solo: true,
 	description:
 		'merges small chunks into shared chunks that are loaded by a non-close super-set of entry points',
 	options: {

diff --git a/test/chunking-form/samples/minChunkSize/merge-chunk-into-shared/_config.js b/test/chunking-form/samples/minChunkSize/merge-chunk-into-shared/_config.js
@@ -1,5 +1,4 @@
 module.exports = {
-	solo: true,
 	description:
 		'merges small chunks into shared chunks that are loaded by a super-set of entry points',
 	options: {

diff --git a/test/chunking-form/samples/minChunkSize/merge-three-small-chunks-a/_config.js b/test/chunking-form/samples/minChunkSize/merge-three-small-chunks-a/_config.js
@@ -1,5 +1,4 @@
 module.exports = {
-	solo: true,
 	description: 'merges small chunks into other small chunks first before merging into a big chunk',
 	options: {
 		input: ['main1.js', 'main2.js', 'main3.js', 'main4.js', 'main5.js'],

diff --git a/test/chunking-form/samples/minChunkSize/merge-three-small-chunks-b/_config.js b/test/chunking-form/samples/minChunkSize/merge-three-small-chunks-b/_config.js
@@ -1,5 +1,4 @@
 module.exports = {
-	solo: true,
 	description: 'merges small chunks into other small chunks first before merging into a big chunk',
 	options: {
 		input: ['main1.js', 'main2.js', 'main3.js', 'main4.js', 'main5.js'],

diff --git a/test/chunking-form/samples/minChunkSize/merge-two-small-chunks-a/_config.js b/test/chunking-form/samples/minChunkSize/merge-two-small-chunks-a/_config.js
@@ -1,5 +1,4 @@
 module.exports = {
-	solo: true,
 	description: 'merges small chunks into other small chunks first before merging into a big chunk',
 	options: {
 		input: ['main1.js', 'main2.js', 'main3.js', 'main4.js'],

diff --git a/test/chunking-form/samples/minChunkSize/merge-two-small-chunks-b/_config.js b/test/chunking-form/samples/minChunkSize/merge-two-small-chunks-b/_config.js
@@ -1,5 +1,4 @@
 module.exports = {
-	solo: true,
 	description: 'merges small chunks into other small chunks first before merging into a big chunk',
 	options: {
 		input: ['main1.js', 'main2.js', 'main3.js', 'main4.js'],

diff --git a/test/chunking-form/samples/minChunkSize/merge-unrelated/_config.js b/test/chunking-form/samples/minChunkSize/merge-unrelated/_config.js
@@ -1,5 +1,4 @@
 module.exports = {
-	solo: true,
 	description: 'merges unrelated small chunks if there is no better alternative',
 	options: {
 		input: ['main1.js', 'main2.js', 'main3.js'],

diff --git a/test/chunking-form/samples/minChunkSize/no-merge-side-effects/_config.js b/test/chunking-form/samples/minChunkSize/no-merge-side-effects/_config.js
@@ -1,5 +1,4 @@
 module.exports = {
-	solo: true,
 	description: 'does not merge small chunks that have side effects',
 	options: {
 		input: ['main1.js', 'main2.js', 'main3.js'],

diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js
@@ -27,6 +27,7 @@ module.exports = {
 					dynamicImportInCjs: true,
 					entryFileNames: '[name].js',
 					esModule: 'if-default-prop',
+					experimentalMinChunkSize: 0,
 					exports: 'auto',
 					extend: false,
 					externalImportAssertions: true,

diff --git a/test/misc/optionList.js b/test/misc/optionList.js