i: 1
diff --git a/test/runtime/samples/spread-component/_config.js b/test/runtime/samples/spread-component/_config.js
index 537860f72c..6e0da44578 100644
--- a/test/runtime/samples/spread-component/_config.js
+++ b/test/runtime/samples/spread-component/_config.js
@@ -1,11 +1,13 @@
export default {
- props: {
- props: {
- foo: 'lol',
- baz: 40 + 2,
- qux: `this is a ${'piece of'} string`,
- quux: 'core'
- }
+ get props() {
+ return {
+ props: {
+ foo: 'lol',
+ baz: 40 + 2,
+ qux: `this is a ${'piece of'} string`,
+ quux: 'core'
+ }
+ };
},
html: `
diff --git a/test/runtime/samples/spread-each-component/_config.js b/test/runtime/samples/spread-each-component/_config.js
index 8a484699d0..7090a0038e 100644
--- a/test/runtime/samples/spread-each-component/_config.js
+++ b/test/runtime/samples/spread-each-component/_config.js
@@ -4,11 +4,13 @@ export default {
`,
- props: {
- things: [
- { a: 1, b: 2 },
- { a: 3, b: 4 }
- ]
+ get props() {
+ return {
+ things: [
+ { a: 1, b: 2 },
+ { a: 3, b: 4 }
+ ]
+ };
},
test({ assert, component, target }) {
diff --git a/test/runtime/samples/spread-each-element/_config.js b/test/runtime/samples/spread-each-element/_config.js
index ccc7a58114..da851efebb 100644
--- a/test/runtime/samples/spread-each-element/_config.js
+++ b/test/runtime/samples/spread-each-element/_config.js
@@ -4,11 +4,13 @@ export default {
`,
- props: {
- things: [
- { 'data-a': 1, 'data-b': 2 },
- { 'data-c': 3, 'data-d': 4 }
- ]
+ get props() {
+ return {
+ things: [
+ { 'data-a': 1, 'data-b': 2 },
+ { 'data-c': 3, 'data-d': 4 }
+ ]
+ };
},
test({ assert, component, target }) {
diff --git a/test/runtime/samples/spread-element-boolean/_config.js b/test/runtime/samples/spread-element-boolean/_config.js
index ce1849be3f..f5893d234e 100644
--- a/test/runtime/samples/spread-element-boolean/_config.js
+++ b/test/runtime/samples/spread-element-boolean/_config.js
@@ -1,8 +1,6 @@
export default {
- props: {
- props: {
- disabled: true
- }
+ get props() {
+ return { props: { disabled: true } };
},
html: `
diff --git a/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js b/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js
index 5176fb976c..589aeb3ad6 100644
--- a/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js
+++ b/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js
@@ -1,8 +1,6 @@
export default {
- props: {
- props: {
- 'data-foo': 'bar'
- }
+ get props() {
+ return { props: { 'data-foo': 'bar' } };
},
html: '
',
diff --git a/test/runtime/samples/spread-element-input/_config.js b/test/runtime/samples/spread-element-input/_config.js
index 2e68e9832f..c25c5e9724 100644
--- a/test/runtime/samples/spread-element-input/_config.js
+++ b/test/runtime/samples/spread-element-input/_config.js
@@ -1,8 +1,6 @@
export default {
- props: {
- props: {
- 'data-foo': 'bar'
- }
+ get props() {
+ return { props: { 'data-foo': 'bar' } };
},
html: '
'
diff --git a/test/runtime/samples/spread-element-multiple/_config.js b/test/runtime/samples/spread-element-multiple/_config.js
index 38afe2fe8e..e67cf2b937 100644
--- a/test/runtime/samples/spread-element-multiple/_config.js
+++ b/test/runtime/samples/spread-element-multiple/_config.js
@@ -1,13 +1,10 @@
export default {
- props: {
- a: {
- 'data-one': 1,
- 'data-two': 2
- },
- c: {
- 'data-b': 'overridden'
- },
- d: 'deeeeee'
+ get props() {
+ return {
+ a: { 'data-one': 1, 'data-two': 2 },
+ c: { 'data-b': 'overridden' },
+ d: 'deeeeee'
+ };
},
html: `
diff --git a/test/runtime/samples/spread-own-props/_config.js b/test/runtime/samples/spread-own-props/_config.js
index 17ddec6546..fe8cafa21d 100644
--- a/test/runtime/samples/spread-own-props/_config.js
+++ b/test/runtime/samples/spread-own-props/_config.js
@@ -1,9 +1,11 @@
export default {
- props: {
- foo: 'lol',
- baz: 40 + 2,
- qux: `this is a ${'piece of'} string`,
- quux: 'core'
+ get props() {
+ return {
+ foo: 'lol',
+ baz: 40 + 2,
+ qux: `this is a ${'piece of'} string`,
+ quux: 'core'
+ };
},
html: `
diff --git a/test/runtime/samples/state-deconflicted/_config.js b/test/runtime/samples/state-deconflicted/_config.js
index 1064b8811e..1039c3f470 100644
--- a/test/runtime/samples/state-deconflicted/_config.js
+++ b/test/runtime/samples/state-deconflicted/_config.js
@@ -1,7 +1,9 @@
export default {
- props: {
- state: 'deconflicted',
- states: ['Alabama', 'Alaska', 'Arizona', 'Arkansas', '...and some others']
+ get props() {
+ return {
+ state: 'deconflicted',
+ states: ['Alabama', 'Alaska', 'Arizona', 'Arkansas', '...and some others']
+ };
},
html: `
diff --git a/test/runtime/samples/store-assignment-updates-property/main.svelte b/test/runtime/samples/store-assignment-updates-property/main.svelte
index c3196a278c..b2c4a3d1c0 100644
--- a/test/runtime/samples/store-assignment-updates-property/main.svelte
+++ b/test/runtime/samples/store-assignment-updates-property/main.svelte
@@ -1,5 +1,5 @@
diff --git a/test/runtime/samples/store-auto-resubscribe-immediate/main.svelte b/test/runtime/samples/store-auto-resubscribe-immediate/main.svelte
index 8dd40ae7ae..3bcab5674a 100644
--- a/test/runtime/samples/store-auto-resubscribe-immediate/main.svelte
+++ b/test/runtime/samples/store-auto-resubscribe-immediate/main.svelte
@@ -1,5 +1,5 @@
-
+
{width}x{height}
\ No newline at end of file
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
deleted file mode 100644
index 1351bb79d9..0000000000
--- a/test/server-side-rendering/index.js
+++ /dev/null
@@ -1,247 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import glob from 'tiny-glob/sync.js';
-
-import {
- assert,
- showOutput,
- loadConfig,
- loadSvelte,
- setupHtmlEqual,
- tryToLoadJson,
- cleanRequireCache,
- shouldUpdateExpected,
- mkdirp
-} from '../helpers';
-import { set_current_component } from '../../internal';
-
-function tryToReadFile(file) {
- try {
- return fs.readFileSync(file, 'utf-8');
- } catch (err) {
- if (err.code !== 'ENOENT') throw err;
- return null;
- }
-}
-
-const sveltePath = process.cwd().split('\\').join('/');
-let compile = null;
-
-describe('ssr', () => {
- before(() => {
- compile = loadSvelte(true).compile;
-
- return setupHtmlEqual();
- });
-
- let saved_window;
- before(() => (saved_window = global.window));
- after(() => (global.window = saved_window));
-
- fs.readdirSync(`${__dirname}/samples`).forEach((dir) => {
- if (dir[0] === '.') return;
-
- const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
-
- // add .solo to a sample directory name to only run that test, or
- // .show to always show the output. or both
- const solo = config.solo || /\.solo/.test(dir);
- const show = /\.show/.test(dir);
-
- if (solo && process.env.CI) {
- throw new Error('Forgot to remove `solo: true` from test');
- }
-
- (solo ? it.only : it)(dir, (done) => {
- try {
- dir = path.resolve(`${__dirname}/samples`, dir);
-
- cleanRequireCache();
-
- const compileOptions = {
- sveltePath,
- ...config.compileOptions,
- generate: 'ssr',
- format: 'cjs'
- };
-
- require('../../register.js')(compileOptions);
-
- const Component = require(`${dir}/main.svelte`).default;
-
- const expectedHtml = tryToReadFile(`${dir}/_expected.html`);
- const expectedCss = tryToReadFile(`${dir}/_expected.css`) || '';
-
- const props = tryToLoadJson(`${dir}/data.json`) || undefined;
-
- const rendered = Component.render(props);
- const { html, css, head } = rendered;
-
- fs.writeFileSync(`${dir}/_actual.html`, html);
- if (css.code) fs.writeFileSync(`${dir}/_actual.css`, css.code);
-
- try {
- assert.htmlEqualWithOptions(html, expectedHtml, {
- preserveComments: compileOptions.preserveComments,
- withoutNormalizeHtml: config.withoutNormalizeHtml
- });
- } catch (error) {
- if (shouldUpdateExpected()) {
- fs.writeFileSync(`${dir}/_expected.html`, html);
- console.log(`Updated ${dir}/_expected.html.`);
- } else {
- throw error;
- }
- }
-
- try {
- assert.equal(
- css.code.replace(/^\s+/gm, '').replace(/[\r\n]/g, ''),
- expectedCss.replace(/^\s+/gm, '').replace(/[\r\n]/g, '')
- );
- } catch (error) {
- if (shouldUpdateExpected()) {
- fs.writeFileSync(`${dir}/_expected.css`, css.code);
- console.log(`Updated ${dir}/_expected.css.`);
- } else {
- throw error;
- }
- }
-
- if (fs.existsSync(`${dir}/_expected-head.html`)) {
- fs.writeFileSync(`${dir}/_actual-head.html`, head);
-
- try {
- assert.htmlEqualWithOptions(
- head,
- fs.readFileSync(`${dir}/_expected-head.html`, 'utf-8'),
- { preserveComments: compileOptions.hydratable }
- );
- } catch (error) {
- if (shouldUpdateExpected()) {
- fs.writeFileSync(`${dir}/_expected-head.html`, head);
- console.log(`Updated ${dir}/_expected-head.html.`);
- } else {
- throw error;
- }
- }
- }
-
- if (show) showOutput(dir, { generate: 'ssr', format: 'cjs' });
- done();
- } catch (err) {
- showOutput(dir, { generate: 'ssr', format: 'cjs' });
- err.stack += `\n\ncmd-click: ${path.relative(process.cwd(), dir)}/main.svelte`;
- done(err);
- } finally {
- set_current_component(null);
- }
- });
- });
-
- // duplicate client-side tests, as far as possible
- runRuntimeSamples('runtime');
- runRuntimeSamples('runtime-browser');
-
- function runRuntimeSamples(suite) {
- fs.readdirSync(`test/${suite}/samples`).forEach((dir) => {
- if (dir[0] === '.') return;
-
- const config = loadConfig(`./${suite}/samples/${dir}/_config.js`);
- const solo = config.solo || /\.solo/.test(dir);
-
- if (solo && process.env.CI) {
- throw new Error('Forgot to remove `solo: true` from test');
- }
-
- if (config.skip_if_ssr) return;
-
- (config.skip ? it.skip : solo ? it.only : it)(dir, () => {
- const cwd = path.resolve(`test/${suite}/samples`, dir);
-
- cleanRequireCache();
-
- delete global.window;
-
- const compileOptions = {
- sveltePath,
- ...config.compileOptions,
- generate: 'ssr',
- format: 'cjs'
- };
-
- require('../../register')(compileOptions);
-
- glob('**/*.svelte', { cwd }).forEach((file) => {
- if (file[0] === '_') return;
-
- const dir = `${cwd}/_output/ssr`;
- const out = `${dir}/${file.replace(/\.svelte$/, '.js')}`;
-
- if (fs.existsSync(out)) {
- fs.unlinkSync(out);
- }
-
- mkdirp(dir);
-
- try {
- const { js } = compile(fs.readFileSync(`${cwd}/${file}`, 'utf-8'), {
- ...compileOptions,
- filename: file
- });
-
- fs.writeFileSync(out, js.code);
- } catch (err) {
- // do nothing
- }
- });
-
- try {
- if (config.before_test) config.before_test();
-
- const Component = require(`../${suite}/samples/${dir}/main.svelte`).default;
- const { html } = Component.render(config.props, {
- store: config.store !== true && config.store
- });
-
- if (config.ssrHtml) {
- assert.htmlEqualWithOptions(html, config.ssrHtml, {
- preserveComments: compileOptions.preserveComments,
- withoutNormalizeHtml: config.withoutNormalizeHtml
- });
- } else if (config.html) {
- assert.htmlEqualWithOptions(html, config.html, {
- preserveComments: compileOptions.preserveComments,
- withoutNormalizeHtml: config.withoutNormalizeHtml
- });
- }
-
- if (config.test_ssr) {
- config.test_ssr({ assert });
- }
-
- if (config.after_test) config.after_test();
-
- if (config.show) {
- showOutput(cwd, compileOptions);
- }
- } catch (err) {
- err.stack += `\n\ncmd-click: ${path.relative(process.cwd(), cwd)}/main.svelte`;
-
- if (config.error) {
- if (typeof config.error === 'function') {
- config.error(assert, err);
- } else {
- assert.equal(err.message, config.error);
- }
- } else {
- showOutput(cwd, compileOptions);
- throw err;
- }
- } finally {
- set_current_component(null);
- }
- });
- });
- }
-});
diff --git a/test/server-side-rendering/ssr-1.test.js b/test/server-side-rendering/ssr-1.test.js
new file mode 100644
index 0000000000..c0b668fd9e
--- /dev/null
+++ b/test/server-side-rendering/ssr-1.test.js
@@ -0,0 +1,103 @@
+// @vitest-environment jsdom
+
+// Yes it's an SSR test, but we need the env to compare html
+// TODO: Isolate the html comparison
+// TODO: happy-dom might be faster but currently replaces quotes which fails assertions
+
+import * as fs from 'fs';
+import * as path from 'path';
+import { assert, describe, it } from 'vitest';
+import {
+ create_loader,
+ should_update_expected,
+ try_load_config,
+ try_load_json,
+ try_read_file
+} from '../helpers.js';
+import { assert_html_equal } from '../html_equal.js';
+
+describe('ssr', async () => {
+ async function run_test(dir) {
+ if (dir[0] === '.') return;
+
+ const config = await try_load_config(`${__dirname}/samples/${dir}/_config.js`);
+
+ const solo = config.solo || /\.solo/.test(dir);
+ const it_fn = solo ? it.only : it;
+
+ it_fn(dir, async () => {
+ dir = path.resolve(`${__dirname}/samples`, dir);
+
+ const compileOptions = {
+ ...config.compileOptions,
+ generate: 'ssr',
+ format: 'cjs'
+ };
+
+ const load = create_loader(compileOptions, dir);
+
+ const Component = (await load(`${dir}/main.svelte`)).default;
+
+ const expectedHtml = try_read_file(`${dir}/_expected.html`);
+ const expectedCss = try_read_file(`${dir}/_expected.css`) || '';
+
+ const props = try_load_json(`${dir}/data.json`) || undefined;
+
+ const rendered = Component.render(props);
+ const { html, css, head } = rendered;
+
+ fs.writeFileSync(`${dir}/_actual.html`, html);
+ if (css.code) fs.writeFileSync(`${dir}/_actual.css`, css.code);
+
+ try {
+ assert_html_equal(html, expectedHtml, {
+ normalize_html: { preserveComments: compileOptions.preserveComments },
+ without_normalize: config.withoutNormalizeHtml
+ });
+ } catch (error) {
+ if (should_update_expected()) {
+ fs.writeFileSync(`${dir}/_expected.html`, html);
+ console.log(`Updated ${dir}/_expected.html.`);
+ } else {
+ error.message += '\n' + `${dir}/main.svelte`;
+ throw error;
+ }
+ }
+
+ try {
+ assert.equal(
+ css.code.trim().replace(/[\r\n]/g, ''),
+ expectedCss.trim().replace(/[\r\n]/g, '')
+ );
+ } catch (error) {
+ if (should_update_expected()) {
+ fs.writeFileSync(`${dir}/_expected.css`, css.code);
+ console.log(`Updated ${dir}/_expected.css.`);
+ } else {
+ error.message += '\n' + `${dir}/main.svelte`;
+ throw error;
+ }
+ }
+
+ if (fs.existsSync(`${dir}/_expected-head.html`)) {
+ fs.writeFileSync(`${dir}/_actual-head.html`, head);
+
+ try {
+ assert_html_equal(head, fs.readFileSync(`${dir}/_expected-head.html`, 'utf-8'), {
+ normalize_html: { preserveComments: compileOptions.hydratable }
+ });
+ } catch (error) {
+ if (should_update_expected()) {
+ fs.writeFileSync(`${dir}/_expected-head.html`, head);
+ console.log(`Updated ${dir}/_expected-head.html.`);
+ error.message += '\n' + `${dir}/main.svelte`;
+ } else {
+ throw error;
+ }
+ }
+ }
+ });
+ }
+
+ await Promise.all(fs.readdirSync(`${__dirname}/samples`).map(run_test));
+});
diff --git a/test/server-side-rendering/ssr-2.test.js b/test/server-side-rendering/ssr-2.test.js
new file mode 100644
index 0000000000..b33b4a94b0
--- /dev/null
+++ b/test/server-side-rendering/ssr-2.test.js
@@ -0,0 +1,118 @@
+// @vitest-environment jsdom
+
+import * as path from 'path';
+import { describe, it, assert } from 'vitest';
+import * as fs from 'fs';
+import { try_load_config, mkdirp, create_loader } from '../helpers.js';
+import { assert_html_equal } from '../html_equal';
+import glob from 'tiny-glob/sync';
+import { setTimeout } from 'timers/promises';
+
+// duplicate client-side tests, as far as possible
+run_runtime_samples('runtime');
+run_runtime_samples('runtime-browser');
+
+function run_runtime_samples(suite) {
+ const samples = path.resolve(__dirname, '..', suite, 'samples');
+
+ describe(`ssr: ${suite}`, async () => {
+ await Promise.all(fs.readdirSync(samples).map(run_test));
+ });
+
+ async function run_test(dir) {
+ if (dir[0] === '.') return;
+
+ const cwd = path.resolve(samples, dir);
+ const config = await try_load_config(`${cwd}/_config.js`);
+ const solo = config.solo || /\.solo/.test(dir);
+
+ if (config.skip_if_ssr) return;
+ const it_fn = config.skip ? it.skip : solo ? it.only : it;
+
+ it_fn(dir, async () => {
+ const compileOptions = {
+ ...config.compileOptions,
+ generate: 'ssr',
+ format: 'cjs'
+ };
+
+ const load = create_loader(compileOptions, cwd);
+
+ glob('**/*.svelte', { cwd: cwd }).forEach((file) => {
+ if (file[0] === '_') return;
+
+ const dir = `${cwd}/_output/ssr`;
+ const out = `${cwd}/${file.replace(/\.svelte$/, '.js')}`;
+
+ if (fs.existsSync(out)) {
+ fs.unlinkSync(out);
+ }
+
+ mkdirp(dir);
+
+ try {
+ const { js } = compile(fs.readFileSync(`${cwd}/${file}`, 'utf-8'), {
+ ...compileOptions,
+ filename: file
+ });
+
+ fs.writeFileSync(out, js.code);
+ } catch (err) {
+ // do nothing
+ }
+ });
+
+ try {
+ if (config.before_test) config.before_test();
+
+ const Component = (await load(`${cwd}/main.svelte`)).default;
+ const { html } = Component.render(config.props, {
+ store: config.store !== true && config.store
+ });
+
+ if (config.ssrHtml) {
+ assert_html_equal(html, config.ssrHtml, {
+ normalize_html: {
+ preserveComments: compileOptions.preserveComments,
+ withoutNormalizeHtml: config.withoutNormalizeHtml
+ }
+ });
+ } else if (config.html) {
+ assert_html_equal(html, config.html, {
+ normalize_html: {
+ preserveComments: compileOptions.preserveComments,
+ withoutNormalizeHtml: config.withoutNormalizeHtml
+ }
+ });
+ }
+
+ if (config.test_ssr) {
+ await config.test_ssr({
+ assert: {
+ ...assert,
+ htmlEqual: assert_html_equal
+ },
+ load
+ });
+ }
+
+ if (config.after_test) config.after_test();
+ } catch (err) {
+ err.stack += `\n\ncmd-click: ${path.relative(process.cwd(), cwd)}/main.svelte`;
+
+ if (config.error) {
+ if (typeof config.error === 'function') {
+ config.error(assert, err);
+ } else {
+ assert.equal(err.message, config.error);
+ }
+ } else {
+ throw err;
+ }
+ }
+
+ // wait for vitest to report progress
+ await setTimeout(10);
+ });
+ }
+}
diff --git a/test/setup.js b/test/setup.js
deleted file mode 100644
index b36153c159..0000000000
--- a/test/setup.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const fs = require('fs');
-
-require('source-map-support').install();
-
-process.env.TEST = 'true';
-
-require.extensions['.js'] = function (module, filename) {
- const exports = [];
-
- let code = fs
- .readFileSync(filename, 'utf-8')
- .replace(/^import \* as (\S+) from ['"]([^'"]+)['"];?/gm, 'var $1 = require("$2");')
- .replace(/^import {([^}]+)} from ['"](.+)['"];?/gm, 'var {$1} = require("$2");')
- .replace(
- /^import (\S+),\s+?{([^}]+)} from ['"](.+)['"];?/gm,
- 'var {default: $1, $2} = require("$3");'
- )
- .replace(/^import (\S+) from ['"]([./][^'"]+)['"];?/gm, 'var {default: $1} = require("$2");')
- .replace(/^import (\S+) from ['"]([^'"]+)['"];?/gm, 'var $1 = require("$2");')
- .replace(/^export default /gm, 'exports.default = ')
- .replace(
- /^export (const|let|var|class|function|async\s+function) (\w+)/gm,
- (match, type, name) => {
- exports.push(name);
- return `${type} ${name}`;
- }
- )
- .replace(/^export \{([^}]+)\}(?: from ['"]([^'"]+)['"];?)?/gm, (match, names, source) => {
- names
- .split(',')
- .filter(Boolean)
- .forEach((name) => {
- exports.push(name);
- });
-
- return source ? `const { ${names} } = require("${source}");` : '';
- })
- .replace(/^export function (\w+)/gm, 'exports.$1 = function $1');
-
- exports.forEach((name) => {
- code += `\nexports.${name} = ${name};`;
- });
-
- try {
- return module._compile(code, filename);
- } catch (err) {
- console.log(code); // eslint-disable-line no-console
- throw err;
- }
-};
diff --git a/test/sourcemaps/samples/compile-option-dev/_config.js b/test/sourcemaps/samples/compile-option-dev/_config.js
index cd353dda40..886030acfe 100644
--- a/test/sourcemaps/samples/compile-option-dev/_config.js
+++ b/test/sourcemaps/samples/compile-option-dev/_config.js
@@ -1,5 +1,5 @@
import MagicString from 'magic-string';
-import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers';
+import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers.js';
export default {
compile_options: {
diff --git a/test/sourcemaps/samples/compile-option-dev/test.js b/test/sourcemaps/samples/compile-option-dev/test.js
index 0dbcaf56b8..f0425495d5 100644
--- a/test/sourcemaps/samples/compile-option-dev/test.js
+++ b/test/sourcemaps/samples/compile-option-dev/test.js
@@ -7,6 +7,7 @@ export async function test({ assert, css, js }) {
const match = js.code.match(
/\tappend_styles\(target, "svelte-.{6}", "(.*?)(?:\\n\/\*# sourceMappingURL=data:(.*?);charset=(.*?);base64,(.*?) \*\/)?"\);\n/
);
+
assert.notEqual(match, null);
const [mimeType, encoding, cssMapBase64] = match.slice(2);
diff --git a/test/sourcemaps/samples/decoded-sourcemap/_config.js b/test/sourcemaps/samples/decoded-sourcemap/_config.js
index 3af6b4a2b1..89e1bc5273 100644
--- a/test/sourcemaps/samples/decoded-sourcemap/_config.js
+++ b/test/sourcemaps/samples/decoded-sourcemap/_config.js
@@ -1,5 +1,5 @@
import MagicString from 'magic-string';
-import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers';
+import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers.js';
export default {
js_map_sources: ['input.svelte'],
diff --git a/test/sourcemaps/samples/external/_config.js b/test/sourcemaps/samples/external/_config.js
index 07a0903482..8738d5cc07 100644
--- a/test/sourcemaps/samples/external/_config.js
+++ b/test/sourcemaps/samples/external/_config.js
@@ -1,4 +1,4 @@
-import { magic_string_bundle } from '../../helpers';
+import { magic_string_bundle } from '../../helpers.js';
export const COMMON = ':global(html) { height: 100%; }\n';
diff --git a/test/sourcemaps/samples/external/test.js b/test/sourcemaps/samples/external/test.js
index 5193b62ba1..b4b14b7cf5 100644
--- a/test/sourcemaps/samples/external/test.js
+++ b/test/sourcemaps/samples/external/test.js
@@ -1,4 +1,4 @@
-import { assert_mapped } from '../../helpers';
+import { assert_mapped } from '../../helpers.js';
import { COMMON, STYLES } from './_config';
export function test({ input, preprocessed }) {
diff --git a/test/sourcemaps/samples/preprocessed-markup/_config.js b/test/sourcemaps/samples/preprocessed-markup/_config.js
index 40e73d7f9b..d08411da48 100644
--- a/test/sourcemaps/samples/preprocessed-markup/_config.js
+++ b/test/sourcemaps/samples/preprocessed-markup/_config.js
@@ -1,5 +1,5 @@
import MagicString from 'magic-string';
-import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers';
+import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers.js';
export default {
preprocess: {
diff --git a/test/sourcemaps/samples/preprocessed-multiple/_config.js b/test/sourcemaps/samples/preprocessed-multiple/_config.js
index 39259a02a8..fa2506bf3e 100644
--- a/test/sourcemaps/samples/preprocessed-multiple/_config.js
+++ b/test/sourcemaps/samples/preprocessed-multiple/_config.js
@@ -1,5 +1,5 @@
import MagicString from 'magic-string';
-import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers';
+import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers.js';
export default {
preprocess: {
diff --git a/test/sourcemaps/samples/preprocessed-no-map/test.js b/test/sourcemaps/samples/preprocessed-no-map/test.js
index ef1aba1630..167e5872b7 100644
--- a/test/sourcemaps/samples/preprocessed-no-map/test.js
+++ b/test/sourcemaps/samples/preprocessed-no-map/test.js
@@ -1,4 +1,4 @@
-import { assert_mapped, assert_not_mapped } from '../../helpers';
+import { assert_mapped, assert_not_mapped } from '../../helpers.js';
export function test({ input, preprocessed }) {
// markup (start)
diff --git a/test/sourcemaps/samples/preprocessed-script/_config.js b/test/sourcemaps/samples/preprocessed-script/_config.js
index 8e129d06a6..0c4455bc5f 100644
--- a/test/sourcemaps/samples/preprocessed-script/_config.js
+++ b/test/sourcemaps/samples/preprocessed-script/_config.js
@@ -1,5 +1,5 @@
import MagicString from 'magic-string';
-import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers';
+import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers.js';
export default {
preprocess: {
diff --git a/test/sourcemaps/samples/preprocessed-styles/_config.js b/test/sourcemaps/samples/preprocessed-styles/_config.js
index d1d681bea7..2851912e80 100644
--- a/test/sourcemaps/samples/preprocessed-styles/_config.js
+++ b/test/sourcemaps/samples/preprocessed-styles/_config.js
@@ -1,5 +1,5 @@
import MagicString from 'magic-string';
-import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers';
+import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers.js';
export default {
preprocess: {
diff --git a/test/sourcemaps/samples/sourcemap-basename-without-outputname/_config.js b/test/sourcemaps/samples/sourcemap-basename-without-outputname/_config.js
index d1656d0680..2f345d3661 100644
--- a/test/sourcemaps/samples/sourcemap-basename-without-outputname/_config.js
+++ b/test/sourcemaps/samples/sourcemap-basename-without-outputname/_config.js
@@ -1,4 +1,4 @@
-import { magic_string_bundle } from '../../helpers';
+import { magic_string_bundle } from '../../helpers.js';
export const component_filepath = 'src/some/deep/path/input.svelte';
export const component_file_basename = 'input.svelte';
diff --git a/test/sourcemaps/samples/sourcemap-basename/_config.js b/test/sourcemaps/samples/sourcemap-basename/_config.js
index 7692b7a6d9..69c87e7a58 100644
--- a/test/sourcemaps/samples/sourcemap-basename/_config.js
+++ b/test/sourcemaps/samples/sourcemap-basename/_config.js
@@ -1,4 +1,4 @@
-import { magic_string_bundle } from '../../helpers';
+import { magic_string_bundle } from '../../helpers.js';
export const component_filepath = 'src/input.svelte';
diff --git a/test/sourcemaps/samples/sourcemap-concat/_config.js b/test/sourcemaps/samples/sourcemap-concat/_config.js
index 835b3c9e48..6790adcec3 100644
--- a/test/sourcemaps/samples/sourcemap-concat/_config.js
+++ b/test/sourcemaps/samples/sourcemap-concat/_config.js
@@ -1,5 +1,5 @@
import MagicString from 'magic-string';
-import { magic_string_preprocessor_result } from '../../helpers';
+import { magic_string_preprocessor_result } from '../../helpers.js';
export default {
js_map_sources: ['input.svelte'],
diff --git a/test/sourcemaps/samples/sourcemap-concat/test.js b/test/sourcemaps/samples/sourcemap-concat/test.js
index c68d7175dc..889b290b15 100644
--- a/test/sourcemaps/samples/sourcemap-concat/test.js
+++ b/test/sourcemaps/samples/sourcemap-concat/test.js
@@ -1,4 +1,4 @@
-import { assert_mapped } from '../../helpers';
+import { assert_mapped } from '../../helpers.js';
export function test({ input, preprocessed }) {
assert_mapped({
diff --git a/test/sourcemaps/samples/sourcemap-names/_config.js b/test/sourcemaps/samples/sourcemap-names/_config.js
index 5d2207d8c3..1d56d050a7 100644
--- a/test/sourcemaps/samples/sourcemap-names/_config.js
+++ b/test/sourcemaps/samples/sourcemap-names/_config.js
@@ -1,5 +1,5 @@
import MagicString from 'magic-string';
-import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers';
+import { magic_string_preprocessor_result, magic_string_replace_all } from '../../helpers.js';
export default {
preprocess: [
diff --git a/test/sourcemaps/samples/sourcemap-offsets/_config.js b/test/sourcemaps/samples/sourcemap-offsets/_config.js
index bbc24c3225..2f0bcdd6cd 100644
--- a/test/sourcemaps/samples/sourcemap-offsets/_config.js
+++ b/test/sourcemaps/samples/sourcemap-offsets/_config.js
@@ -1,4 +1,4 @@
-import { magic_string_bundle } from '../../helpers';
+import { magic_string_bundle } from '../../helpers.js';
export const EXTERNAL = 'span { --external-var: 1px; }';
diff --git a/test/sourcemaps/samples/sourcemap-offsets/test.js b/test/sourcemaps/samples/sourcemap-offsets/test.js
index ccfa34e945..138fc10b57 100644
--- a/test/sourcemaps/samples/sourcemap-offsets/test.js
+++ b/test/sourcemaps/samples/sourcemap-offsets/test.js
@@ -1,4 +1,4 @@
-import { assert_mapped } from '../../helpers';
+import { assert_mapped } from '../../helpers.js';
import { EXTERNAL } from './_config';
export function test({ input, preprocessed }) {
diff --git a/test/sourcemaps/samples/typescript/test.js b/test/sourcemaps/samples/typescript/test.js
index 7af24b6e3b..a1ff5c350d 100644
--- a/test/sourcemaps/samples/typescript/test.js
+++ b/test/sourcemaps/samples/typescript/test.js
@@ -1,4 +1,4 @@
-import { assert_mapped, assert_not_located } from '../../helpers';
+import { assert_mapped, assert_not_located } from '../../helpers.js';
export function test({ input, preprocessed }) {
// TS => JS code
diff --git a/test/sourcemaps/index.js b/test/sourcemaps/sourcemaps.test.js
similarity index 86%
rename from test/sourcemaps/index.js
rename to test/sourcemaps/sourcemaps.test.js
index 5a4235366d..4fd8ad8033 100644
--- a/test/sourcemaps/index.js
+++ b/test/sourcemaps/sourcemaps.test.js
@@ -1,28 +1,30 @@
import * as fs from 'fs';
import * as path from 'path';
-import * as assert from 'assert';
-import { loadConfig, svelte } from '../helpers';
+import * as svelte from '../../compiler.js';
+import { try_load_config } from '../helpers';
+import { describe, assert, it } from 'vitest';
// keep source-map at version 0.7.x
// https://github.com/mozilla/source-map/issues/400
import { getLocator } from 'locate-character';
import { SourceMapConsumer } from 'source-map';
-describe('sourcemaps', () => {
- fs.readdirSync(`${__dirname}/samples`).forEach((dir) => {
+describe('sourcemaps', async () => {
+ await Promise.all(fs.readdirSync(`${__dirname}/samples`).map((dir) => run(dir)));
+
+ async function run(dir) {
if (dir[0] === '.') return;
- const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
+ const config = await try_load_config(`${__dirname}/samples/${dir}/_config.js`);
// add .solo to a sample directory name to only run that test
const solo = config.solo || /\.solo/.test(dir);
const skip = config.skip || /\.skip/.test(dir);
- if (solo && process.env.CI) {
- throw new Error('Forgot to remove `solo: true` from test');
- }
+ const it_fn = solo ? it.only : skip ? it.skip : it;
+
+ it_fn(dir, async () => {
+ const { test } = await import(`./samples/${dir}/test.js`);
- (solo ? it.only : skip ? it.skip : it)(dir, async () => {
- const { test } = require(`./samples/${dir}/test.js`);
const inputFile = path.resolve(`${__dirname}/samples/${dir}/input.svelte`);
const outputName = '_actual';
const outputBase = path.resolve(`${__dirname}/samples/${dir}/${outputName}`);
@@ -33,7 +35,6 @@ describe('sourcemaps', () => {
locate: getLocator(inputCode),
locate_1: getLocator(inputCode, { offsetLine: 1 })
};
-
const preprocessed = await svelte.preprocess(
input.code,
config.preprocess || {},
@@ -41,7 +42,6 @@ describe('sourcemaps', () => {
filename: 'input.svelte'
}
);
-
const { js, css } = svelte.compile(preprocessed.code, {
filename: 'input.svelte',
// filenames for sourcemaps
@@ -103,7 +103,8 @@ describe('sourcemaps', () => {
css.mapConsumer = css.map && (await new SourceMapConsumer(css.map));
css.locate = getLocator(css.code || '');
css.locate_1 = getLocator(css.code || '', { offsetLine: 1 });
+
await test({ assert, input, preprocessed, js, css });
});
- });
+ }
});
diff --git a/test/stats/index.js b/test/stats/stats.test.js
similarity index 76%
rename from test/stats/index.js
rename to test/stats/stats.test.js
index 22e2ef5be5..3459868c0f 100644
--- a/test/stats/index.js
+++ b/test/stats/stats.test.js
@@ -1,6 +1,7 @@
import * as fs from 'fs';
-import * as assert from 'assert';
-import { svelte, loadConfig, tryToLoadJson } from '../helpers';
+import { describe, it, assert } from 'vitest';
+import * as svelte from '../../compiler';
+import { try_load_config, try_load_json } from '../helpers';
describe('stats', () => {
fs.readdirSync(`${__dirname}/samples`).forEach((dir) => {
@@ -9,17 +10,14 @@ describe('stats', () => {
// add .solo to a sample directory name to only run that test
const solo = /\.solo/.test(dir);
const skip = /\.skip/.test(dir);
+ const it_fn = solo ? it.only : skip ? it.skip : it;
- if (solo && process.env.CI) {
- throw new Error('Forgot to remove `solo: true` from test');
- }
-
- (solo ? it.only : skip ? it.skip : it)(dir, () => {
- const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
+ it_fn(dir, async () => {
+ const config = await try_load_config(`${__dirname}/samples/${dir}/_config.js`);
const filename = `${__dirname}/samples/${dir}/input.svelte`;
const input = fs.readFileSync(filename, 'utf-8').replace(/\s+$/, '');
- const expectedError = tryToLoadJson(`${__dirname}/samples/${dir}/error.json`);
+ const expectedError = try_load_json(`${__dirname}/samples/${dir}/error.json`);
let result;
let error;
diff --git a/test/store/index.js b/test/store/store.test.js
similarity index 98%
rename from test/store/index.js
rename to test/store/store.test.js
index 9fcda311e8..1f7d90e50c 100644
--- a/test/store/index.js
+++ b/test/store/store.test.js
@@ -1,5 +1,5 @@
-import * as assert from 'assert';
-import { readable, writable, derived, get, readonly } from '../../store';
+import { describe, it, assert } from 'vitest';
+import { readable, writable, derived, get, readonly } from 'svelte/store';
describe('store', () => {
describe('writable', () => {
@@ -139,7 +139,9 @@ describe('store', () => {
it('passes an optional update function', () => {
let running;
+ /** @type {(value: any) => void} */
let tick;
+ /** @type {(value: any) => void} */
let add;
const store = readable(undefined, (set, update) => {
diff --git a/test/test.js b/test/test.js
deleted file mode 100644
index b6998943c2..0000000000
--- a/test/test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const glob = require('tiny-glob/sync.js');
-
-require('./setup.js');
-
-// bind internal to jsdom
-require('./helpers.js');
-require('../internal');
-
-console.clear();
-
-const test_folders = glob('*/index.js', { cwd: 'test' });
-const solo_folders = test_folders.filter((folder) => /\.solo/.test(folder));
-
-if (solo_folders.length) {
- if (process.env.CI) {
- throw new Error('Forgot to remove `.solo` from test');
- }
- solo_folders.forEach((name) => require('./' + name));
-} else {
- test_folders.forEach((name) => require('./' + name));
-}
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 83eecc51dc..c5f45fe821 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -6,6 +6,10 @@
"compilerOptions": {
"allowJs": true,
"checkJs": true,
- "noEmit": true
+ "noEmit": true,
+ "paths": {
+ "svelte": [".."],
+ "svelte/*": ["../*"]
+ }
}
}
diff --git a/test/utils/index.js b/test/utils/index.js
deleted file mode 100644
index 37ba63b1c7..0000000000
--- a/test/utils/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as assert from 'assert';
-import { trim_start, trim_end } from '../../src/compiler/utils/trim';
-import { split_css_unit } from '../../src/runtime/internal/utils';
-
-describe('utils', () => {
- describe('trim', () => {
- it('trim_start', () => {
- const value = trim_start(' \r\n\t svelte content \r\n\t ');
- assert.equal(value, 'svelte content \r\n\t ');
- });
-
- it('trim_end', () => {
- const value = trim_end(' \r\n\t svelte content \r\n\t ');
- assert.equal(value, ' \r\n\t svelte content');
- });
- });
-
- describe('split_css_unit', () => {
- it('should use px as default', () => {
- assert.deepEqual(split_css_unit(10), [10, 'px']);
- assert.deepEqual(split_css_unit('10'), [10, 'px']);
- });
-
- it('should split the css notation into value and unit', () => {
- assert.deepEqual(split_css_unit('-50%'), [-50, '%']);
- assert.deepEqual(split_css_unit('0.1rem'), [0.1, 'rem']);
- assert.deepEqual(split_css_unit('.1rem'), [0.1, 'rem']);
- });
- });
-});
diff --git a/test/utils/utils.test.js b/test/utils/utils.test.js
new file mode 100644
index 0000000000..1714ef4d64
--- /dev/null
+++ b/test/utils/utils.test.js
@@ -0,0 +1,118 @@
+import { assert, describe, it } from 'vitest';
+import {
+ CONTENTEDITABLE_BINDINGS,
+ get_contenteditable_attr,
+ has_contenteditable_attr,
+ is_contenteditable,
+ is_name_contenteditable
+} from '../../src/compiler/compile/utils/contenteditable';
+import get_name_from_filename from '../../src/compiler/compile/utils/get_name_from_filename';
+import { trim_end, trim_start } from '../../src/compiler/utils/trim';
+import { split_css_unit } from '../../src/runtime/internal/utils';
+
+describe('utils', () => {
+ describe('trim', () => {
+ it('trim_start', () => {
+ const value = trim_start(' \r\n\t svelte content \r\n\t ');
+ assert.equal(value, 'svelte content \r\n\t ');
+ });
+
+ it('trim_end', () => {
+ const value = trim_end(' \r\n\t svelte content \r\n\t ');
+ assert.equal(value, ' \r\n\t svelte content');
+ });
+ });
+
+ describe('split_css_unit', () => {
+ it('should use px as default', () => {
+ assert.deepEqual(split_css_unit(10), [10, 'px']);
+ assert.deepEqual(split_css_unit('10'), [10, 'px']);
+ });
+
+ it('should split the css notation into value and unit', () => {
+ assert.deepEqual(split_css_unit('-50%'), [-50, '%']);
+ assert.deepEqual(split_css_unit('0.1rem'), [0.1, 'rem']);
+ assert.deepEqual(split_css_unit('.1rem'), [0.1, 'rem']);
+ });
+ });
+
+ describe('get_name_from_filename', () => {
+ it('uses the basename', () => {
+ assert.equal(get_name_from_filename('path/to/Widget.svelte'), 'Widget');
+ });
+
+ it('uses the directory name, if basename is index', () => {
+ assert.equal(get_name_from_filename('path/to/Widget/index.svelte'), 'Widget');
+ });
+
+ it('handles Windows filenames', () => {
+ assert.equal(get_name_from_filename('path\\to\\Widget.svelte'), 'Widget');
+ });
+
+ it('handles special characters in filenames', () => {
+ assert.equal(get_name_from_filename('@.svelte'), '_');
+ assert.equal(get_name_from_filename('&.svelte'), '_');
+ assert.equal(get_name_from_filename('~.svelte'), '_');
+ });
+ });
+
+ /** @typedef {import("../../src/compiler/compile/nodes/Element.js").default} Element */
+ /** @typedef {import("../../src/compiler/compile/nodes/Attribute.js").default} Attribute */
+
+ describe('contenteditable', () => {
+ describe('is_contenteditable', () => {
+ it('returns false if node is input', () => {
+ const node = /** @type {Element} */ ({ name: 'input' });
+ assert.equal(is_contenteditable(node), false);
+ });
+ it('returns false if node is textarea', () => {
+ const node = /** @type {Element} */ ({ name: 'textarea' });
+ assert.equal(is_contenteditable(node), false);
+ });
+ it('returns false if node is not input or textarea AND it is not contenteditable', () => {
+ const attr = /** @type {Attribute}*/ ({ name: 'href' });
+ const node = /** @type {Element} */ ({ name: 'a', attributes: [attr] });
+ assert.equal(is_contenteditable(node), false);
+ });
+ it('returns true if node is not input or textarea AND it is contenteditable', () => {
+ const attr = /** @type {Attribute}*/ ({ name: 'contenteditable' });
+ const node = /** @type {Element} */ ({ name: 'a', attributes: [attr] });
+ assert.equal(is_contenteditable(node), true);
+ });
+ });
+
+ describe('has_contenteditable_attr', () => {
+ it('returns true if attribute is contenteditable', () => {
+ const attr = /** @type {Attribute}*/ ({ name: 'contenteditable' });
+ const node = /** @type {Element} */ ({ attributes: [attr] });
+ assert.equal(has_contenteditable_attr(node), true);
+ });
+ it('returns false if attribute is not contenteditable', () => {
+ const attr = /** @type {Attribute}*/ ({ name: 'href' });
+ const node = /** @type {Element} */ ({ attributes: [attr] });
+ assert.equal(has_contenteditable_attr(node), false);
+ });
+ });
+
+ describe('is_name_contenteditable', () => {
+ it('returns true if name is a contenteditable type', () => {
+ assert.equal(is_name_contenteditable(CONTENTEDITABLE_BINDINGS[0]), true);
+ });
+ it('returns false if name is not contenteditable type', () => {
+ assert.equal(is_name_contenteditable('value'), false);
+ });
+ });
+
+ describe('get_contenteditable_attr', () => {
+ it('returns the contenteditable Attribute if it exists', () => {
+ const attr = /** @type {Attribute}*/ ({ name: 'contenteditable' });
+ const node = /** @type {Element} */ ({ name: 'div', attributes: [attr] });
+ assert.equal(get_contenteditable_attr(node), attr);
+ });
+ it('returns undefined if contenteditable attribute cannot be found', () => {
+ const node = /** @type {Element} */ ({ name: 'div', attributes: [] });
+ assert.equal(get_contenteditable_attr(node), undefined);
+ });
+ });
+ });
+});
diff --git a/test/validator/index.js b/test/validator/validator.test.js
similarity index 88%
rename from test/validator/index.js
rename to test/validator/validator.test.js
index 4c15eaf22b..e251259e3b 100644
--- a/test/validator/index.js
+++ b/test/validator/validator.test.js
@@ -1,6 +1,7 @@
import * as fs from 'fs';
-import * as assert from 'assert';
-import { svelte, loadConfig, tryToLoadJson } from '../helpers';
+import { describe, it, assert } from 'vitest';
+import * as svelte from '../../compiler.mjs';
+import { try_load_json, try_load_config } from '../helpers.js';
describe('validate', () => {
fs.readdirSync(`${__dirname}/samples`).forEach((dir) => {
@@ -10,20 +11,19 @@ describe('validate', () => {
const solo = /\.solo/.test(dir);
const skip = /\.skip/.test(dir);
- if (solo && process.env.CI) {
- throw new Error('Forgot to remove `solo: true` from test');
- }
+ const it_fn = solo ? it.only : skip ? it.skip : it;
- (solo ? it.only : skip ? it.skip : it)(dir, () => {
- const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
+ it_fn(dir, async () => {
+ const config = await try_load_config(`${__dirname}/samples/${dir}/_config.js`);
const input = fs
.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8')
.replace(/\s+$/, '')
.replace(/\r/g, '');
- const expected_warnings = tryToLoadJson(`${__dirname}/samples/${dir}/warnings.json`) || [];
- const expected_errors = tryToLoadJson(`${__dirname}/samples/${dir}/errors.json`);
- const options = tryToLoadJson(`${__dirname}/samples/${dir}/options.json`);
+
+ const expected_warnings = try_load_json(`${__dirname}/samples/${dir}/warnings.json`) || [];
+ const expected_errors = try_load_json(`${__dirname}/samples/${dir}/errors.json`);
+ const options = try_load_json(`${__dirname}/samples/${dir}/options.json`);
let error;
diff --git a/test/vars/index.js b/test/vars/index.js
deleted file mode 100644
index bec6f5b727..0000000000
--- a/test/vars/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import * as fs from 'fs';
-import * as assert from 'assert';
-import { svelte, loadConfig, tryToLoadJson } from '../helpers';
-
-describe('vars', () => {
- fs.readdirSync(`${__dirname}/samples`).forEach((dir) => {
- if (dir[0] === '.') return;
-
- // add .solo to a sample directory name to only run that test
- const solo = /\.solo/.test(dir);
- const skip = /\.skip/.test(dir);
-
- if (solo && process.env.CI) {
- throw new Error('Forgot to remove `solo: true` from test');
- }
-
- for (const generate of ['dom', 'ssr', false]) {
- (solo ? it.only : skip ? it.skip : it)(`${dir}, generate: ${generate}`, () => {
- const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
- const filename = `${__dirname}/samples/${dir}/input.svelte`;
- const input = fs.readFileSync(filename, 'utf-8').replace(/\s+$/, '');
-
- const expectedError = tryToLoadJson(`${__dirname}/samples/${dir}/error.json`);
-
- let result;
- let error;
-
- try {
- result = svelte.compile(input, { ...config.options, generate });
- config.test(assert, result.vars);
- } catch (e) {
- error = e;
- }
-
- if (error || expectedError) {
- if (error && !expectedError) {
- throw error;
- }
-
- if (expectedError && !error) {
- throw new Error(`Expected an error: ${expectedError.message}`);
- }
-
- assert.equal(error.message, expectedError.message);
- assert.deepEqual(error.start, expectedError.start);
- assert.deepEqual(error.end, expectedError.end);
- assert.equal(error.pos, expectedError.pos);
- }
- });
- }
- });
-});
diff --git a/test/vars/samples/$$props-logicless/_config.js b/test/vars/samples/$$props-logicless/_config.js
index 05bbe7e0b2..a6dc8d975c 100644
--- a/test/vars/samples/$$props-logicless/_config.js
+++ b/test/vars/samples/$$props-logicless/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/$$props/_config.js b/test/vars/samples/$$props/_config.js
index 05bbe7e0b2..a6dc8d975c 100644
--- a/test/vars/samples/$$props/_config.js
+++ b/test/vars/samples/$$props/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/actions/_config.js b/test/vars/samples/actions/_config.js
index 4cc2b9d18c..5d8e2a1855 100644
--- a/test/vars/samples/actions/_config.js
+++ b/test/vars/samples/actions/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/animations/_config.js b/test/vars/samples/animations/_config.js
index 4cc2b9d18c..5d8e2a1855 100644
--- a/test/vars/samples/animations/_config.js
+++ b/test/vars/samples/animations/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/assumed-global/_config.js b/test/vars/samples/assumed-global/_config.js
index 782760bb8b..8be1bf443c 100644
--- a/test/vars/samples/assumed-global/_config.js
+++ b/test/vars/samples/assumed-global/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, []);
}
diff --git a/test/vars/samples/component-namespaced/_config.js b/test/vars/samples/component-namespaced/_config.js
index 8ed4872355..33687f75cd 100644
--- a/test/vars/samples/component-namespaced/_config.js
+++ b/test/vars/samples/component-namespaced/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/duplicate-globals/_config.js b/test/vars/samples/duplicate-globals/_config.js
index 782760bb8b..8be1bf443c 100644
--- a/test/vars/samples/duplicate-globals/_config.js
+++ b/test/vars/samples/duplicate-globals/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, []);
}
diff --git a/test/vars/samples/duplicate-non-hoistable/_config.js b/test/vars/samples/duplicate-non-hoistable/_config.js
index bd70e29800..3b7a03fdd6 100644
--- a/test/vars/samples/duplicate-non-hoistable/_config.js
+++ b/test/vars/samples/duplicate-non-hoistable/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/duplicate-vars/_config.js b/test/vars/samples/duplicate-vars/_config.js
index 749a0c59af..5234a9c6fc 100644
--- a/test/vars/samples/duplicate-vars/_config.js
+++ b/test/vars/samples/duplicate-vars/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/implicit-reactive/_config.js b/test/vars/samples/implicit-reactive/_config.js
index a8bf261d4f..847cb329e6 100644
--- a/test/vars/samples/implicit-reactive/_config.js
+++ b/test/vars/samples/implicit-reactive/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/imports/_config.js b/test/vars/samples/imports/_config.js
index 47e8c0c5d9..b2cd77a0e6 100644
--- a/test/vars/samples/imports/_config.js
+++ b/test/vars/samples/imports/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/modules-vars/_config.js b/test/vars/samples/modules-vars/_config.js
index 52b8940148..3c7be58f57 100644
--- a/test/vars/samples/modules-vars/_config.js
+++ b/test/vars/samples/modules-vars/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/mutated-vs-reassigned-bindings/_config.js b/test/vars/samples/mutated-vs-reassigned-bindings/_config.js
index 65c7d5cc90..13f15e6b3e 100644
--- a/test/vars/samples/mutated-vs-reassigned-bindings/_config.js
+++ b/test/vars/samples/mutated-vs-reassigned-bindings/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/mutated-vs-reassigned/_config.js b/test/vars/samples/mutated-vs-reassigned/_config.js
index 65c7d5cc90..13f15e6b3e 100644
--- a/test/vars/samples/mutated-vs-reassigned/_config.js
+++ b/test/vars/samples/mutated-vs-reassigned/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/props/_config.js b/test/vars/samples/props/_config.js
index d5f5d1cc2b..8d987ee948 100644
--- a/test/vars/samples/props/_config.js
+++ b/test/vars/samples/props/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/referenced-from-script/_config.js b/test/vars/samples/referenced-from-script/_config.js
index ec068cb1d7..d0fb2b423c 100644
--- a/test/vars/samples/referenced-from-script/_config.js
+++ b/test/vars/samples/referenced-from-script/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/store-referenced/_config.js b/test/vars/samples/store-referenced/_config.js
index bac35d1dba..5e9df4dbbe 100644
--- a/test/vars/samples/store-referenced/_config.js
+++ b/test/vars/samples/store-referenced/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/store-unreferenced/_config.js b/test/vars/samples/store-unreferenced/_config.js
index 4965e52fec..601ab07d65 100644
--- a/test/vars/samples/store-unreferenced/_config.js
+++ b/test/vars/samples/store-unreferenced/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/template-references/_config.js b/test/vars/samples/template-references/_config.js
index 34c07e19e0..563573d71c 100644
--- a/test/vars/samples/template-references/_config.js
+++ b/test/vars/samples/template-references/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/transitions/_config.js b/test/vars/samples/transitions/_config.js
index 29a99b16cc..79dcc694f6 100644
--- a/test/vars/samples/transitions/_config.js
+++ b/test/vars/samples/transitions/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/undeclared/_config.js b/test/vars/samples/undeclared/_config.js
index 782760bb8b..8be1bf443c 100644
--- a/test/vars/samples/undeclared/_config.js
+++ b/test/vars/samples/undeclared/_config.js
@@ -1,4 +1,7 @@
export default {
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, []);
}
diff --git a/test/vars/samples/vars-report-false/_config.js b/test/vars/samples/vars-report-false/_config.js
index f4709f09c8..9967a7f20f 100644
--- a/test/vars/samples/vars-report-false/_config.js
+++ b/test/vars/samples/vars-report-false/_config.js
@@ -3,6 +3,9 @@ export default {
varsReport: false
},
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, []);
}
diff --git a/test/vars/samples/vars-report-full-noscript/_config.js b/test/vars/samples/vars-report-full-noscript/_config.js
index 9dc875cd83..04310f4bb5 100644
--- a/test/vars/samples/vars-report-full-noscript/_config.js
+++ b/test/vars/samples/vars-report-full-noscript/_config.js
@@ -3,6 +3,9 @@ export default {
varsReport: 'full'
},
+ /**
+ * @param {import("vitest").assert} assert
+ */
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/vars-report-full-script/_config.js b/test/vars/samples/vars-report-full-script/_config.js
index 1b267e5b22..ea8b6c3a36 100644
--- a/test/vars/samples/vars-report-full-script/_config.js
+++ b/test/vars/samples/vars-report-full-script/_config.js
@@ -3,6 +3,10 @@ export default {
varsReport: 'full'
},
+ /**
+ * @param {import("vitest").assert} assert
+ */
+
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/samples/vars-report-full/_config.js b/test/vars/samples/vars-report-full/_config.js
index 9dc875cd83..2332dd3e76 100644
--- a/test/vars/samples/vars-report-full/_config.js
+++ b/test/vars/samples/vars-report-full/_config.js
@@ -3,6 +3,10 @@ export default {
varsReport: 'full'
},
+ /**
+ * @param {import("vitest").assert} assert
+ */
+
test(assert, vars) {
assert.deepEqual(vars, [
{
diff --git a/test/vars/vars.test.js b/test/vars/vars.test.js
new file mode 100644
index 0000000000..de3ed11c09
--- /dev/null
+++ b/test/vars/vars.test.js
@@ -0,0 +1,48 @@
+import * as fs from 'fs';
+import { assert, describe, it } from 'vitest';
+import { compile } from '../../compiler.mjs';
+import { try_load_json } from '../helpers.js';
+
+describe('vars', () => {
+ fs.readdirSync(`${__dirname}/samples`).forEach((dir) => {
+ if (dir[0] === '.') return;
+
+ // add .solo to a sample directory name to only run that test
+ const solo = /\.solo/.test(dir);
+ const skip = /\.skip/.test(dir);
+
+ const it_fn = solo ? it.only : skip ? it.skip : it;
+
+ it_fn.each(['dom', 'ssr', false])(`${dir} generate: %s`, async (generate) => {
+ const input = (await import(`./samples/${dir}/input.svelte?raw`)).default
+ .trimEnd()
+ .replace(/\r/g, '');
+
+ const expectedError = try_load_json(`${__dirname}/samples/${dir}/error.json`);
+
+ /**
+ * @type {{ options: any, test: (assert: typeof import('vitest').assert, vars: any[]) => void }}}
+ */
+ const { options, test } = (await import(`./samples/${dir}/_config.js`)).default;
+
+ try {
+ const { vars } = compile(input, { ...options, generate });
+ test(assert, vars);
+ } catch (error) {
+ if (expectedError) {
+ assert.equal(error.message, expectedError.message);
+ assert.deepEqual(error.start, expectedError.start);
+ assert.deepEqual(error.end, expectedError.end);
+ assert.equal(error.pos, expectedError.pos);
+ return;
+ } else {
+ throw error;
+ }
+ }
+
+ if (expectedError) {
+ assert.fail(`Expected an error: ${JSON.stringify(expectedError)}`);
+ }
+ });
+ });
+});
diff --git a/vitest.config.js b/vitest.config.js
new file mode 100644
index 0000000000..c38baca71c
--- /dev/null
+++ b/vitest.config.js
@@ -0,0 +1,19 @@
+import { defineConfig, configDefaults } from 'vitest/config';
+
+export default defineConfig({
+ plugins: [
+ {
+ name: 'resolve-svelte',
+ resolveId(id) {
+ if (id.startsWith('svelte')) {
+ return id.replace(/^svelte(.*)\/?$/, `${__dirname}$1/index.mjs`);
+ }
+ }
+ }
+ ],
+ test: {
+ dir: 'test',
+ reporters: ['dot'],
+ exclude: [...configDefaults.exclude, '**/samples/**']
+ }
+});