@sveltejs/vite-plugin-svelte 2.4.4 → 2.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "2.4.4",
+  "version": "2.4.6",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -34,13 +34,13 @@
   },
   "homepage": "https://github.com/sveltejs/vite-plugin-svelte#readme",
   "dependencies": {
+    "@sveltejs/vite-plugin-svelte-inspector": "^1.0.4",
     "debug": "^4.3.4",
     "deepmerge": "^4.3.1",
     "kleur": "^4.1.5",
-    "magic-string": "^0.30.2",
+    "magic-string": "^0.30.3",
     "svelte-hmr": "^0.15.3",
-    "vitefu": "^0.2.4",
-    "@sveltejs/vite-plugin-svelte-inspector": "^1.0.3"
+    "vitefu": "^0.2.4"
   },
   "peerDependencies": {
     "svelte": "^3.54.0 || ^4.0.0",
@@ -48,9 +48,9 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.8",
-    "esbuild": "^0.18.17",
-    "svelte": "^4.1.2",
-    "vite": "^4.4.8"
+    "esbuild": "^0.19.3",
+    "svelte": "^4.2.0",
+    "vite": "^4.4.9"
   },
   "scripts": {
     "check:publint": "publint --strict",

package/src/index.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'node:fs';
 import { version as viteVersion } from 'vite';
 
 import { svelteInspector } from '@sveltejs/vite-plugin-svelte-inspector';

package/src/types/compile.d.ts

@@ -19,7 +19,7 @@ export interface Compiled {
 	css: Code;
 	ast: any; // TODO type
 	warnings: any[]; // TODO type
-	vars: {
+	vars: Array<{
 		name: string;
 		export_name: string;
 		injected: boolean;
@@ -29,7 +29,7 @@ export interface Compiled {
 		referenced: boolean;
 		writable: boolean;
 		referenced_from_script: boolean;
-	}[];
+	}>;
 	stats: {
 		timings: {
 			total: number;

package/src/utils/dependencies.js

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import { findDepPkgJsonPath } from 'vitefu';
 
 /**
@@ -30,8 +30,9 @@ export async function resolveDependencyData(dep, parent) {
 const COMMON_DEPENDENCIES_WITHOUT_SVELTE_FIELD = [
 	'@lukeed/uuid',
 	'@playwright/test',
-	'@sveltejs/vite-plugin-svelte',
 	'@sveltejs/kit',
+	'@sveltejs/package',
+	'@sveltejs/vite-plugin-svelte',
 	'autoprefixer',
 	'cookie',
 	'dotenv',
@@ -43,6 +44,7 @@ const COMMON_DEPENDENCIES_WITHOUT_SVELTE_FIELD = [
 	'postcss',
 	'prettier',
 	'svelte',
+	'svelte2tsx',
 	'svelte-check',
 	'svelte-hmr',
 	'svelte-preprocess',

package/src/utils/esbuild.js

@@ -1,4 +1,4 @@
-import { readFileSync } from 'fs';
+import { readFileSync } from 'node:fs';
 import { compile, preprocess } from 'svelte/compiler';
 import { log } from './log.js';
 import { toESBuildError } from './error.js';
@@ -24,7 +24,7 @@ export function esbuildSveltePlugin(options) {
 			if (build.initialOptions.plugins?.some((v) => v.name === 'vite:dep-scan')) return;
 
 			const svelteExtensions = (options.extensions ?? ['.svelte']).map((ext) => ext.slice(1));
-			const svelteFilter = new RegExp(`\\.(` + svelteExtensions.join('|') + `)(\\?.*)?$`);
+			const svelteFilter = new RegExp('\\.(' + svelteExtensions.join('|') + ')(\\?.*)?$');
 			/** @type {import('../types/vite-plugin-svelte-stats.d.ts').StatCollection | undefined} */
 			let statsCollection;
 			build.onStart(() => {
@@ -106,5 +106,7 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
 	if (endStat) {
 		endStat();
 	}
-	return compiled.js.code + '//# sourceMappingURL=' + compiled.js.map.toUrl();
+	return compiled.js.map
+		? compiled.js.code + '//# sourceMappingURL=' + compiled.js.map.toUrl()
+		: compiled.js.code;
 }

package/src/utils/hash.js

@@ -1,4 +1,4 @@
-import * as crypto from 'crypto';
+import * as crypto from 'node:crypto';
 
 const hashes = Object.create(null);
 

package/src/utils/id.js

@@ -1,5 +1,5 @@
 import { createFilter, normalizePath } from 'vite';
-import * as fs from 'fs';
+import * as fs from 'node:fs';
 import { log } from './log.js';
 
 const VITE_FS_PREFIX = '/@fs/';
@@ -21,7 +21,7 @@ const TYPES_WITH_COMPILER_OPTIONS = ['style', 'script', 'all'];
  * @returns {{ filename: string, rawQuery: string }}
  */
 function splitId(id) {
-	const parts = id.split(`?`, 2);
+	const parts = id.split('?', 2);
 	const filename = parts[0];
 	const rawQuery = parts[1];
 	return { filename, rawQuery };

package/src/utils/load-raw.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'node:fs';
 import { toRollupError } from './error.js';
 import { log } from './log.js';
 
@@ -126,7 +126,7 @@ function toRawExports(object) {
 			.map(([key, value]) => `export const ${key}=${JSON.stringify(value)}`)
 			.join('\n') + '\n';
 	if (Object.prototype.hasOwnProperty.call(object, 'code')) {
-		exports += `export default code\n`;
+		exports += 'export default code\n';
 	}
 	return exports;
 }

package/src/utils/load-svelte-config.js

@@ -1,7 +1,7 @@
-import { createRequire } from 'module';
-import path from 'path';
-import fs from 'fs';
-import { pathToFileURL } from 'url';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import fs from 'node:fs';
+import { pathToFileURL } from 'node:url';
 import { log } from './log.js';
 
 // used to require cjs config in esm.

package/src/utils/log.js

@@ -204,7 +204,8 @@ function buildExtraWarnings(warnings, isBuild) {
 			extraWarnings.push({
 				...noScopableElementWarning,
 				code: 'vite-plugin-svelte-css-no-scopable-elements',
-				message: `No scopable elements found in template. If you're using global styles in the style tag, you should move it into an external stylesheet file and import it in JS. See https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/faq.md#where-should-i-put-my-global-styles.`
+				message:
+					"No scopable elements found in template. If you're using global styles in the style tag, you should move it into an external stylesheet file and import it in JS. See https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/faq.md#where-should-i-put-my-global-styles."
 			});
 		}
 	}

package/src/utils/optimizer.js

@@ -1,5 +1,5 @@
-import { promises as fs } from 'fs';
-import path from 'path';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
 
 // List of options that changes the prebundling result
 /** @type {(keyof import('../types/options.d.ts').ResolvedOptions)[]} */

package/src/utils/options.js

@@ -10,7 +10,7 @@ import {
 	VITE_RESOLVE_MAIN_FIELDS
 } from './constants.js';
 
-import path from 'path';
+import path from 'node:path';
 import { esbuildSveltePlugin, facadeEsbuildSveltePluginName } from './esbuild.js';
 import { addExtraPreprocessors } from './preprocess.js';
 import deepmerge from 'deepmerge';

package/src/utils/preprocess.js

@@ -1,6 +1,6 @@
 import MagicString from 'magic-string';
 import { log } from './log.js';
-import path from 'path';
+import path from 'node:path';
 
 /**
  * this appends a *{} rule to component styles to force the svelte compiler to add style classes to all nodes

package/src/utils/resolve.js

@@ -1,5 +1,5 @@
-import path from 'path';
-import { builtinModules } from 'module';
+import path from 'node:path';
+import { builtinModules } from 'node:module';
 import { resolveDependencyData, isCommonDepWithoutSvelteField } from './dependencies.js';
 import { normalizePath } from 'vite';
 

package/src/utils/sourcemaps.js

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 
 const IS_WINDOWS = process.platform === 'win32';
 

package/src/utils/vite-plugin-svelte-cache.js

@@ -1,5 +1,5 @@
-import { readFileSync } from 'fs';
-import { dirname } from 'path';
+import { readFileSync } from 'node:fs';
+import { dirname } from 'node:path';
 import { findClosestPkgJsonPath } from 'vitefu';
 import { normalizePath } from 'vite';
 

package/src/utils/vite-plugin-svelte-stats.js

@@ -1,5 +1,5 @@
 import { log } from './log.js';
-import { performance } from 'perf_hooks';
+import { performance } from 'node:perf_hooks';
 import { normalizePath } from 'vite';
 
 /** @type {import('../types/vite-plugin-svelte-stats.d.ts').CollectionOptions} */

package/src/utils/watch.js

@@ -1,7 +1,7 @@
-import fs from 'fs';
+import fs from 'node:fs';
 import { log } from './log.js';
 import { knownSvelteConfigNames } from './load-svelte-config.js';
-import path from 'path';
+import path from 'node:path';
 
 /**
  * @param {import('../types/options.d.ts').ResolvedOptions} options