feat: Compile .svelte.js/ts files when using Svelte 5

dummdidumm · dummdidumm · commit 8621cb28f873 · 2024-03-11T21:02:11.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # svelte-loader changelog
 
+## 3.2.0
+
+* Compile `.svelte.js/ts` files when using Svelte 5
+
 ## 3.1.9
 
 * Handle `emitCSS` to `css` option transformation correctly for Svelte 4
diff --git a/index.js b/index.js
@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs');
 const { getOptions } = require('loader-utils');
 const { buildMakeHot } = require('./lib/make-hot.js');
-const { compile, preprocess, VERSION } = require('svelte/compiler');
+const svelte = require('svelte/compiler');
 
 function posixify(file) {
 	return file.replace(/[/\\]/g, '/');
@@ -55,6 +55,10 @@ try {
 
 let warned = false;
 
+function getMajor() {
+	return Number(svelte.VERSION.split('.')[0])
+}
+
 module.exports = function(source, map) {
 	this.cacheable();
 
@@ -70,13 +74,37 @@ module.exports = function(source, map) {
 
 	const isServer = this.target === 'node' || (options.compilerOptions && options.compilerOptions.generate == 'ssr');
 	const isProduction = this.minimize || process.env.NODE_ENV === 'production';
-
 	const compileOptions = {
 		filename: this.resourcePath,
-		css: VERSION[0] === '3' ? !options.emitCss : (options.emitCss ? 'external' : 'injected'),
+		css: getMajor() === 3 ? !options.emitCss : (options.emitCss ? 'external' : 'injected'),
 		...options.compilerOptions
 	};
-	if (VERSION[0] === '3') {
+	const handleWarning = warning => this.emitWarning(new Error(warning));
+
+	if (getMajor() >= 5 && (this.resourcePath.endsWith('.svelte.js') || this.resourcePath.endsWith('.svelte.ts'))) {
+		try {
+			const { js, warnings } = svelte.compileModule(
+				source,
+				{ filename: this.resourcePath, dev: compileOptions.dev, generate: compileOptions.generate }
+			);
+
+			warnings.forEach(
+				options.onwarn
+					? warning => options.onwarn(warning, handleWarning)
+					: handleWarning
+			);
+
+			callback(null, js.code, js.map);
+		} catch (err) {
+			// wrap error to provide correct
+			// context when logging to console
+			callback(new Error(`${err.name}: ${err.toString()}`));
+		}
+
+		return;
+	}
+
+	if (getMajor() === 3) {
 		compileOptions.format = (options.compilerOptions && options.compilerOptions.format) || 'esm';
 	} else {
 		if (options.compilerOptions && options.compilerOptions.format && !warned) {
@@ -86,12 +114,10 @@ module.exports = function(source, map) {
 		}
 	}
 
-	const handleWarning = warning => this.emitWarning(new Error(warning));
-
 	options.preprocess = options.preprocess || {};
 	options.preprocess.filename = compileOptions.filename;
 
-	preprocess(source, options.preprocess).then(processed => {
+	svelte.preprocess(source, options.preprocess).then(processed => {
 		if (processed.dependencies && this.addDependency) {
 			for (let dependency of processed.dependencies) {
 				this.addDependency(dependency);
@@ -100,7 +126,7 @@ module.exports = function(source, map) {
 
 		if (processed.map) compileOptions.sourcemap = processed.map;
 
-		const compiled = compile(processed.toString(), compileOptions);
+		const compiled = svelte.compile(processed.toString(), compileOptions);
 		let { js, css, warnings } = compiled;
 
 		if (!js.map.sourcesContent) {
@@ -121,7 +147,7 @@ module.exports = function(source, map) {
 			js.code = makeHot(id, js.code, hotOptions, compiled, source, compileOptions);
 		}
 
-		if (options.emitCss && css.code) {
+		if (options.emitCss && css && css.code) {
 			const resource = posixify(compileOptions.filename);
 			const cssPath = `${resource}.${index++}.css`;
 			css.code += '\n/*# sourceMappingURL=' + css.map.toUrl() + '*/';
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "svelte": "^3.0.0"
   },
   "peerDependencies": {
-    "svelte": "^3.0.0 || ^4.0.0-next.0"
+    "svelte": "^3.0.0 || ^4.0.0-next.0 || ^5.0.0-next.1"
   },
   "repository": {
     "type": "git",
diff --git a/test/fixtures/file.svelte.js b/test/fixtures/file.svelte.js
@@ -0,0 +1 @@
+export const count = $state({ value: 0 });
diff --git a/test/loader.spec.js b/test/loader.spec.js
@@ -355,6 +355,22 @@ describe('loader', () => {
 			);
 		});
 	});
+
+	// needs Svelte 5
+	describe.skip('Svelte 5', () => {
+		it(
+			'should compile .svelte.js/ts',
+			testLoader(
+				'test/fixtures/file.svelte.js',
+				function(err, code, map) {
+					expect(err).not.to.exist;
+
+					expect(code).not.to.contain('$state');
+				},
+				{}
+			)
+		);
+	});
 });
 
 function readFile(path) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export const count = $state({ value: 0 });`