fix: compile .svelte.xxx.js/ts modules in Svelte 5

dummdidumm · dummdidumm · commit 562db6a1c5a4 · 2024-06-06T10:55:33.000+02:00
sveltejs/svelte#11536
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # svelte-loader changelog
 
+## 3.2.2
+
+* Svelte 5: Also compile `.svelte.xxx.js/ts` files
+
 ## 3.2.1
 
 * Handle sourcemaps being falsy
diff --git a/index.js b/index.js
@@ -63,6 +63,8 @@ function getMajor() {
 	return Number(svelte.VERSION.split('.')[0]);
 }
 
+const svelte_module_regex = /\.svelte(\.[^.]+)*\.(js|ts)$/
+
 module.exports = function(source, map) {
 	this.cacheable();
 
@@ -85,7 +87,7 @@ module.exports = function(source, map) {
 	};
 	const handleWarning = warning => this.emitWarning(new Error(warning));
 
-	if (getMajor() >= 5 && (this.resourcePath.endsWith('.svelte.js') || this.resourcePath.endsWith('.svelte.ts'))) {
+	if (getMajor() >= 5 && svelte_module_regex.test(this.resourcePath)) {
 		try {
 			const { js, warnings } = svelte.compileModule(
 				source,
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte-loader",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "author": "Nico Rehwaldt <git_nikku@nixis.de>",
   "description": "A webpack loader for svelte",
   "license": "MIT",
diff --git a/test/fixtures/file.svelte.foo.ts b/test/fixtures/file.svelte.foo.ts
@@ -0,0 +1,2 @@
+// @ts-nocheck
+export const count = $state({ value: 0 }); // eslint-disable-line no-undef
diff --git a/test/loader.spec.js b/test/loader.spec.js
@@ -465,7 +465,7 @@ describe('loader', () => {
 		if (!isSvelte5Plus) return;
 
 		it(
-			'should compile .svelte.js/ts',
+			'should compile .svelte.js',
 			testLoader(
 				'test/fixtures/file.svelte.js',
 				function(err, code, map) {
@@ -476,6 +476,19 @@ describe('loader', () => {
 				{}
 			)
 		);
+
+		it(
+			'should compile .svelte.foo.ts',
+			testLoader(
+				'test/fixtures/file.svelte.foo.ts',
+				function(err, code, map) {
+					expect(err).not.to.exist;
+
+					expect(code).not.to.contain('$state');
+				},
+				{}
+			)
+		);
 	});
 });
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "svelte-loader",`
`3`		`- "version": "3.2.1",`
	`3`	`+ "version": "3.2.2",`
`4`	`4`	`"author": "Nico Rehwaldt <git_nikku@nixis.de>",`
`5`	`5`	`"description": "A webpack loader for svelte",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// @ts-nocheck`
	`2`	`+export const count = $state({ value: 0 }); // eslint-disable-line no-undef`