Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/svelte.dev/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const config: UserConfig = {
}
},
optimizeDeps: {
exclude: ['@sveltejs/site-kit', '@sveltejs/repl', '@rollup/browser', 'typestript']
exclude: ['@sveltejs/site-kit', '@sveltejs/repl', '@rollup/browser']
},
ssr: {
noExternal: ['@sveltejs/site-kit', '@sveltejs/repl'],
Expand Down
4 changes: 1 addition & 3 deletions packages/repl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
"@sveltejs/package": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "4.0.0",
"@types/estree": "^1.0.5",
"magic-string": "^0.30.11",
"prettier": "^3.3.2",
"prettier-plugin-svelte": "^3.3.2",
"publint": "^0.2.12",
Expand Down Expand Up @@ -103,7 +102,6 @@
"svelte": "5.23.0",
"tailwindcss": "^4.0.15",
"tarparser": "^0.0.4",
"zimmerframe": "^1.1.2",
"typestript": "workspace:*"
"zimmerframe": "^1.1.2"
}
}
4 changes: 0 additions & 4 deletions packages/repl/src/lib/Workspace.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -589,10 +589,6 @@ export class Workspace {
extensions.push(javascript());
break;

case 'ts':
extensions.push(javascript({ typescript: true }));
break;

case 'html':
extensions.push(html());
break;
Expand Down
14 changes: 6 additions & 8 deletions packages/repl/src/lib/workers/bundler/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { walk } from 'zimmerframe';
import '../patch_window';
import { rollup } from '@rollup/browser';
import { DEV } from 'esm-env';
import strip_types from './plugins/typescript-strip-types';
import commonjs from './plugins/commonjs';
import glsl from './plugins/glsl';
import json from './plugins/json';
Expand Down Expand Up @@ -185,7 +184,7 @@ async function get_bundle(
if (importer.startsWith(VIRTUAL)) {
const url = new URL(importee, importer);

for (const suffix of ['', '.js', '.ts', '.json']) {
for (const suffix of ['', '.js', '.json']) {
const with_suffix = `${url.pathname.slice(1)}${suffix}`;
const file = virtual.get(with_suffix);

Expand Down Expand Up @@ -281,15 +280,15 @@ async function get_bundle(
const message = `bundling ${id.replace(VIRTUAL + '/', '').replace(NPM + '/', '')}`;
self.postMessage({ type: 'status', message });

if (!/\.(svelte|js|ts)$/.test(id)) return null;
if (!/\.(svelte|js)$/.test(id)) return null;

const filename = id.split('/').pop()!;
const name = id.split('/').pop()?.split('.')[0];

let result: CompileResult;

if (id.endsWith('.svelte')) {
const compilerOptions: any = {
filename,
filename: name + '.svelte',
generate: Number(svelte.VERSION.split('.')[0]) >= 5 ? 'client' : 'dom',
dev: true
};
Expand Down Expand Up @@ -343,9 +342,9 @@ async function get_bundle(
$$_styles.push($$__style);
`.replace(/\t/g, '');
}
} else if (/\.svelte\.(js|ts)$/.test(id)) {
} else if (id.endsWith('.svelte.js')) {
const compilerOptions: any = {
filename,
filename: name + '.js',
generate: 'client',
dev: true
};
Expand Down Expand Up @@ -388,7 +387,6 @@ async function get_bundle(
input: './__entry.js',
cache: previous?.key === key && previous.cache,
plugins: [
strip_types,
repl_plugin,
commonjs,
json,
Expand Down

This file was deleted.

8 changes: 3 additions & 5 deletions packages/repl/src/lib/workers/compiler/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import '@sveltejs/site-kit/polyfills';
import type { CompileResult } from 'svelte/compiler';
import type { ExposedCompilerOptions, File } from '../../Workspace.svelte';
import { stripTypes } from 'typestript';
import { load_svelte } from '../npm';

// hack for magic-string and Svelte 4 compiler
Expand All @@ -22,7 +21,7 @@ addEventListener('message', async (event) => {

const { can_use_experimental_async, svelte } = (cache[version] ??= await load_svelte(version));

if (!file.name.endsWith('.svelte') && !file.name.includes('.svelte.') && !svelte.compileModule) {
if (!file.name.endsWith('.svelte') && !svelte.compileModule) {
// .svelte.js file compiled with Svelte 3/4 compiler
postMessage({
id,
Expand All @@ -38,7 +37,7 @@ addEventListener('message', async (event) => {

let migration = null;

if (file.name.endsWith('.svelte') && svelte.migrate) {
if (svelte.migrate) {
try {
migration = svelte.migrate(file.contents, { filename: file.name });
} catch (e) {
Expand Down Expand Up @@ -81,8 +80,7 @@ addEventListener('message', async (event) => {
compilerOptions.experimental = { async: true };
}

const code = file.name.endsWith('.ts') ? stripTypes(file.contents).toString() : file.contents;
result = svelte.compileModule(code, compilerOptions);
result = svelte.compileModule(file.contents, compilerOptions);
}

postMessage({
Expand Down
1 change: 0 additions & 1 deletion packages/typestript/.gitignore

This file was deleted.

28 changes: 0 additions & 28 deletions packages/typestript/package.json

This file was deleted.

84 changes: 0 additions & 84 deletions packages/typestript/src/index.js

This file was deleted.

16 changes: 0 additions & 16 deletions packages/typestript/tsconfig.json

This file was deleted.

34 changes: 0 additions & 34 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.