Update magic-string and adjust types.

The type of `sourcesContent` changed to allow for `null` elements, and rollup needs to be adjusted to that as well.
rollup · Feb 13, 2023 · 28a68ec · 28a68ec
1 parent 45d5d53
commit 28a68ec
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 14 deletions.
diff --git a/build-plugins/add-cli-entry.ts b/build-plugins/add-cli-entry.ts
@@ -16,6 +16,7 @@ export default function addCliEntry(): Plugin {
 			});
 		},
 		name: 'add-cli-entry',
+		//@ts-expect-error sourcesContent was changed to allow for null elements in recent versions of magic-string.
 		renderChunk(code, chunkInfo) {
 			if (chunkInfo.fileName === CLI_CHUNK) {
 				const magicString = new MagicString(code);

diff --git a/build-plugins/conditional-fsevents-import.ts b/build-plugins/conditional-fsevents-import.ts
@@ -13,6 +13,7 @@ export default function conditionalFsEventsImport(): Plugin {
 			}
 		},
 		name: 'conditional-fs-events-import',
+		//@ts-expect-error sourcesContent was changed to allow for null elements in recent versions of magic-string.
 		transform(code, id) {
 			if (id.endsWith('fsevents-handler.js')) {
 				transformed = true;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -116,7 +116,7 @@
     "is-reference": "^3.0.1",
     "lint-staged": "^13.1.0",
     "locate-character": "^2.0.5",
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.29.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "pinia": "^2.0.29",

diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -52,7 +52,7 @@ export interface ExistingDecodedSourceMap {
 	names: string[];
 	sourceRoot?: string;
 	sources: string[];
-	sourcesContent?: string[];
+	sourcesContent?: (string | null)[];
 	version: number;
 }
 
@@ -62,7 +62,7 @@ export interface ExistingRawSourceMap {
 	names: string[];
 	sourceRoot?: string;
 	sources: string[];
-	sourcesContent?: string[];
+	sourcesContent?: (string | null)[];
 	version: number;
 }
 
@@ -79,7 +79,7 @@ export interface SourceMap {
 	mappings: string;
 	names: string[];
 	sources: string[];
-	sourcesContent: string[];
+	sourcesContent: (string | null)[];
 	version: number;
 	toString(): string;
 	toUrl(): string;

diff --git a/src/utils/collapseSourcemaps.ts b/src/utils/collapseSourcemaps.ts
@@ -10,11 +10,11 @@ import { error, errorConflictingSourcemapSources, errorSourcemapBroken } from '.
 import { basename, dirname, relative, resolve } from './path';
 
 class Source {
-	readonly content: string;
+	readonly content: string | null;
 	readonly filename: string;
 	isOriginal = true;
 
-	constructor(filename: string, content: string) {
+	constructor(filename: string, content: string | null) {
 		this.filename = filename;
 		this.content = content;
 	}
@@ -48,7 +48,7 @@ class Link {
 	traceMappings() {
 		const sources: string[] = [];
 		const sourceIndexMap = new Map<string, number>();
-		const sourcesContent: string[] = [];
+		const sourcesContent: (string | null)[] = [];
 		const names: string[] = [];
 		const nameIndexMap = new Map<string, number>();