From 4b0839a4b1805b32974d006b6698c528288b1375 Mon Sep 17 00:00:00 2001 From: mrkishi Date: Thu, 3 Mar 2022 21:59:58 -0300 Subject: [PATCH 1/8] deduplicate tests --- packages/kit/package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/kit/package.json b/packages/kit/package.json index 8aa270c68b4e..153f9fd42ce6 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -60,7 +60,8 @@ "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components && npm run types", "dev": "rollup -cw", "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format", - "check": "tsc && npm run check:integration && npm run check:prerendering", + "check": "tsc", + "check:all": "tsc && npm run check:integration && npm run check:prerendering", "check:integration": "npm run check:integration:amp && npm run check:integration:basics && npm run check:integration:options && npm run check:integration:options-2", "check:integration:amp": "cd test/apps/amp && pnpm sync && pnpm check", "check:integration:basics": "cd test/apps/basics && pnpm sync && pnpm check", @@ -72,7 +73,8 @@ "format": "npm run check-format -- --write", "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore", "prepublishOnly": "npm run build", - "test": "npm run test:unit && npm run test:typings && npm run test:packaging && npm run test:prerendering && npm run test:integration", + "test": "npm run test:unit && npm run test:typings && npm run test:packaging", + "test:all": "npm run test:unit && npm run test:typings && npm run test:packaging && npm run test:prerendering && npm run test:integration", "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging", "test:typings": "tsc --project test/typings", "test:prerendering": "pnpm test:prerendering:basics && pnpm test:prerendering:options", From fdb4fde3f3f796d04adfc66511e0e096c0923093 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 3 Mar 2022 20:41:59 -0500 Subject: [PATCH 2/8] Update packages/kit/package.json --- packages/kit/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kit/package.json b/packages/kit/package.json index 153f9fd42ce6..6d21adfe9c94 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -74,7 +74,7 @@ "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore", "prepublishOnly": "npm run build", "test": "npm run test:unit && npm run test:typings && npm run test:packaging", - "test:all": "npm run test:unit && npm run test:typings && npm run test:packaging && npm run test:prerendering && npm run test:integration", + "test:all": "npm run test && npm run test:prerendering && npm run test:integration", "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging", "test:typings": "tsc --project test/typings", "test:prerendering": "pnpm test:prerendering:basics && pnpm test:prerendering:options", From 470b4fbe88cd1eb936cf972a03deec05cbb7bb85 Mon Sep 17 00:00:00 2001 From: mrkishi Date: Thu, 3 Mar 2022 20:23:42 -0300 Subject: [PATCH 3/8] parallelize tests --- package.json | 2 +- .../kit/test/apps/amp/playwright.config.js | 5 +- .../kit/test/apps/basics/playwright.config.js | 3 +- .../test/apps/options-2/playwright.config.js | 3 +- .../test/apps/options/playwright.config.js | 3 +- packages/kit/test/utils.js | 56 ++++++++++--------- 6 files changed, 40 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index bfcee1b74640..4f1f5fe29a17 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "scripts": { "build": "pnpm build --filter=\"@sveltejs/*\" --filter=\"create-svelte\"", - "test": "pnpm -r test --workspace-concurrency=1", + "test": "pnpm -r test", "check": "pnpm -r check", "lint": "pnpm -r lint", "format": "pnpm -r format", diff --git a/packages/kit/test/apps/amp/playwright.config.js b/packages/kit/test/apps/amp/playwright.config.js index e83b1fd33ce2..f7a8d593a4d9 100644 --- a/packages/kit/test/apps/amp/playwright.config.js +++ b/packages/kit/test/apps/amp/playwright.config.js @@ -1,6 +1,7 @@ -import { config } from '../../utils.js'; +import { get_config } from '../../utils.js'; -config.webServer && (config.webServer.timeout = 15000); // AMP validator needs a long time to get moving +const config = get_config(3000); +config.webServer.timeout = 15000; // AMP validator needs a long time to get moving // remove any projects with javaScriptEnabled const projects = config.projects || []; diff --git a/packages/kit/test/apps/basics/playwright.config.js b/packages/kit/test/apps/basics/playwright.config.js index 33d36b651014..46f305662479 100644 --- a/packages/kit/test/apps/basics/playwright.config.js +++ b/packages/kit/test/apps/basics/playwright.config.js @@ -1 +1,2 @@ -export { config as default } from '../../utils.js'; +import { get_config } from '../../utils.js'; +export default get_config(3001); diff --git a/packages/kit/test/apps/options-2/playwright.config.js b/packages/kit/test/apps/options-2/playwright.config.js index 33d36b651014..0fa6b836f197 100644 --- a/packages/kit/test/apps/options-2/playwright.config.js +++ b/packages/kit/test/apps/options-2/playwright.config.js @@ -1 +1,2 @@ -export { config as default } from '../../utils.js'; +import { get_config } from '../../utils.js'; +export default get_config(3003); diff --git a/packages/kit/test/apps/options/playwright.config.js b/packages/kit/test/apps/options/playwright.config.js index 33d36b651014..c0a3a7265da3 100644 --- a/packages/kit/test/apps/options/playwright.config.js +++ b/packages/kit/test/apps/options/playwright.config.js @@ -1 +1,2 @@ -export { config as default } from '../../utils.js'; +import { get_config } from '../../utils.js'; +export default get_config(3002); diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js index 84ca7cfb020f..14dedacf3aa1 100644 --- a/packages/kit/test/utils.js +++ b/packages/kit/test/utils.js @@ -142,35 +142,39 @@ export const test = base.extend({ } }); -/** @type {import('@playwright/test').PlaywrightTestConfig} */ -export const config = { - forbidOnly: !!process.env.CI, - // generous timeouts on CI - timeout: process.env.CI ? 45000 : 15000, - webServer: { - command: process.env.DEV ? 'npm run dev' : 'npm run build && npm run preview', - port: 3000 - }, - retries: process.env.CI ? 5 : 0, - projects: [ - { - name: `${process.env.DEV ? 'dev' : 'build'}+js`, - use: { - javaScriptEnabled: true - } +/** @type {(port: number) => import('@playwright/test').PlaywrightTestConfig} */ +export function get_config(port) { + return { + forbidOnly: !!process.env.CI, + // generous timeouts on CI + timeout: process.env.CI ? 45000 : 15000, + webServer: { + port, + command: process.env.DEV + ? `npm run dev -- --port=${port}` + : `npm run build && npm run preview -- --port=${port}` }, - { - name: `${process.env.DEV ? 'dev' : 'build'}-js`, - use: { - javaScriptEnabled: false + retries: process.env.CI ? 5 : 0, + projects: [ + { + name: `${process.env.DEV ? 'dev' : 'build'}+js`, + use: { + javaScriptEnabled: true + } + }, + { + name: `${process.env.DEV ? 'dev' : 'build'}-js`, + use: { + javaScriptEnabled: false + } } + ], + use: { + screenshot: 'only-on-failure', + trace: 'retain-on-failure' } - ], - use: { - screenshot: 'only-on-failure', - trace: 'retain-on-failure' - } -}; + }; +} /** * From 0da1989146dd3faf816babc4f1d6a67335602df5 Mon Sep 17 00:00:00 2001 From: mrkishi Date: Fri, 4 Mar 2022 01:05:44 -0300 Subject: [PATCH 4/8] test if splitting basics helps any --- packages/kit/test/apps/amp/dev/package.json | 9 +++++++++ packages/kit/test/apps/amp/preview/package.json | 9 +++++++++ packages/kit/test/apps/amp/{ => project}/package.json | 1 - .../kit/test/apps/amp/{ => project}/playwright.config.js | 2 +- packages/kit/test/apps/amp/{ => project}/src/app.html | 0 .../apps/amp/{ => project}/src/routes/__layout.svelte | 0 .../amp/{ => project}/src/routes/invalid/index.svelte | 0 .../amp/{ => project}/src/routes/origin/index.json.js | 0 .../amp/{ => project}/src/routes/origin/index.svelte | 0 .../amp/{ => project}/src/routes/styles/Unused.svelte | 0 .../amp/{ => project}/src/routes/styles/imported.css | 0 .../amp/{ => project}/src/routes/styles/index.svelte | 0 .../amp/{ => project}/src/routes/valid/index.json.js | 0 .../apps/amp/{ => project}/src/routes/valid/index.svelte | 0 .../kit/test/apps/amp/{ => project}/svelte.config.js | 0 packages/kit/test/apps/amp/{ => project}/test/test.js | 0 packages/kit/test/apps/amp/{ => project}/tsconfig.json | 0 packages/kit/test/apps/basics/playwright.config.js | 2 +- packages/kit/test/apps/options-2/playwright.config.js | 2 +- packages/kit/test/apps/options/playwright.config.js | 2 +- 20 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 packages/kit/test/apps/amp/dev/package.json create mode 100644 packages/kit/test/apps/amp/preview/package.json rename packages/kit/test/apps/amp/{ => project}/package.json (90%) rename packages/kit/test/apps/amp/{ => project}/playwright.config.js (86%) rename packages/kit/test/apps/amp/{ => project}/src/app.html (100%) rename packages/kit/test/apps/amp/{ => project}/src/routes/__layout.svelte (100%) rename packages/kit/test/apps/amp/{ => project}/src/routes/invalid/index.svelte (100%) rename packages/kit/test/apps/amp/{ => project}/src/routes/origin/index.json.js (100%) rename packages/kit/test/apps/amp/{ => project}/src/routes/origin/index.svelte (100%) rename packages/kit/test/apps/amp/{ => project}/src/routes/styles/Unused.svelte (100%) rename packages/kit/test/apps/amp/{ => project}/src/routes/styles/imported.css (100%) rename packages/kit/test/apps/amp/{ => project}/src/routes/styles/index.svelte (100%) rename packages/kit/test/apps/amp/{ => project}/src/routes/valid/index.json.js (100%) rename packages/kit/test/apps/amp/{ => project}/src/routes/valid/index.svelte (100%) rename packages/kit/test/apps/amp/{ => project}/svelte.config.js (100%) rename packages/kit/test/apps/amp/{ => project}/test/test.js (100%) rename packages/kit/test/apps/amp/{ => project}/tsconfig.json (100%) diff --git a/packages/kit/test/apps/amp/dev/package.json b/packages/kit/test/apps/amp/dev/package.json new file mode 100644 index 000000000000..7a97917ced41 --- /dev/null +++ b/packages/kit/test/apps/amp/dev/package.json @@ -0,0 +1,9 @@ +{ + "name": "test-amp", + "private": true, + "version": "0.0.1", + "scripts": { + "test": "cd ../project && npm run test:dev" + }, + "type": "module" +} diff --git a/packages/kit/test/apps/amp/preview/package.json b/packages/kit/test/apps/amp/preview/package.json new file mode 100644 index 000000000000..9b173ef95403 --- /dev/null +++ b/packages/kit/test/apps/amp/preview/package.json @@ -0,0 +1,9 @@ +{ + "name": "test-amp", + "private": true, + "version": "0.0.1", + "scripts": { + "test": "cd ../project && npm run test:build" + }, + "type": "module" +} diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/project/package.json similarity index 90% rename from packages/kit/test/apps/amp/package.json rename to packages/kit/test/apps/amp/project/package.json index f610279d5a73..db238c7ac548 100644 --- a/packages/kit/test/apps/amp/package.json +++ b/packages/kit/test/apps/amp/project/package.json @@ -7,7 +7,6 @@ "build": "node ../../cli.js build", "preview": "node ../../cli.js preview", "check": "tsc && svelte-check", - "test": "npm run test:dev && npm run test:build", "test:dev": "cross-env DEV=true playwright test", "test:build": "playwright test" }, diff --git a/packages/kit/test/apps/amp/playwright.config.js b/packages/kit/test/apps/amp/project/playwright.config.js similarity index 86% rename from packages/kit/test/apps/amp/playwright.config.js rename to packages/kit/test/apps/amp/project/playwright.config.js index f7a8d593a4d9..097f4d1b40ec 100644 --- a/packages/kit/test/apps/amp/playwright.config.js +++ b/packages/kit/test/apps/amp/project/playwright.config.js @@ -1,6 +1,6 @@ import { get_config } from '../../utils.js'; -const config = get_config(3000); +const config = get_config(process.env.DEV ? 3000 : 3001); config.webServer.timeout = 15000; // AMP validator needs a long time to get moving // remove any projects with javaScriptEnabled diff --git a/packages/kit/test/apps/amp/src/app.html b/packages/kit/test/apps/amp/project/src/app.html similarity index 100% rename from packages/kit/test/apps/amp/src/app.html rename to packages/kit/test/apps/amp/project/src/app.html diff --git a/packages/kit/test/apps/amp/src/routes/__layout.svelte b/packages/kit/test/apps/amp/project/src/routes/__layout.svelte similarity index 100% rename from packages/kit/test/apps/amp/src/routes/__layout.svelte rename to packages/kit/test/apps/amp/project/src/routes/__layout.svelte diff --git a/packages/kit/test/apps/amp/src/routes/invalid/index.svelte b/packages/kit/test/apps/amp/project/src/routes/invalid/index.svelte similarity index 100% rename from packages/kit/test/apps/amp/src/routes/invalid/index.svelte rename to packages/kit/test/apps/amp/project/src/routes/invalid/index.svelte diff --git a/packages/kit/test/apps/amp/src/routes/origin/index.json.js b/packages/kit/test/apps/amp/project/src/routes/origin/index.json.js similarity index 100% rename from packages/kit/test/apps/amp/src/routes/origin/index.json.js rename to packages/kit/test/apps/amp/project/src/routes/origin/index.json.js diff --git a/packages/kit/test/apps/amp/src/routes/origin/index.svelte b/packages/kit/test/apps/amp/project/src/routes/origin/index.svelte similarity index 100% rename from packages/kit/test/apps/amp/src/routes/origin/index.svelte rename to packages/kit/test/apps/amp/project/src/routes/origin/index.svelte diff --git a/packages/kit/test/apps/amp/src/routes/styles/Unused.svelte b/packages/kit/test/apps/amp/project/src/routes/styles/Unused.svelte similarity index 100% rename from packages/kit/test/apps/amp/src/routes/styles/Unused.svelte rename to packages/kit/test/apps/amp/project/src/routes/styles/Unused.svelte diff --git a/packages/kit/test/apps/amp/src/routes/styles/imported.css b/packages/kit/test/apps/amp/project/src/routes/styles/imported.css similarity index 100% rename from packages/kit/test/apps/amp/src/routes/styles/imported.css rename to packages/kit/test/apps/amp/project/src/routes/styles/imported.css diff --git a/packages/kit/test/apps/amp/src/routes/styles/index.svelte b/packages/kit/test/apps/amp/project/src/routes/styles/index.svelte similarity index 100% rename from packages/kit/test/apps/amp/src/routes/styles/index.svelte rename to packages/kit/test/apps/amp/project/src/routes/styles/index.svelte diff --git a/packages/kit/test/apps/amp/src/routes/valid/index.json.js b/packages/kit/test/apps/amp/project/src/routes/valid/index.json.js similarity index 100% rename from packages/kit/test/apps/amp/src/routes/valid/index.json.js rename to packages/kit/test/apps/amp/project/src/routes/valid/index.json.js diff --git a/packages/kit/test/apps/amp/src/routes/valid/index.svelte b/packages/kit/test/apps/amp/project/src/routes/valid/index.svelte similarity index 100% rename from packages/kit/test/apps/amp/src/routes/valid/index.svelte rename to packages/kit/test/apps/amp/project/src/routes/valid/index.svelte diff --git a/packages/kit/test/apps/amp/svelte.config.js b/packages/kit/test/apps/amp/project/svelte.config.js similarity index 100% rename from packages/kit/test/apps/amp/svelte.config.js rename to packages/kit/test/apps/amp/project/svelte.config.js diff --git a/packages/kit/test/apps/amp/test/test.js b/packages/kit/test/apps/amp/project/test/test.js similarity index 100% rename from packages/kit/test/apps/amp/test/test.js rename to packages/kit/test/apps/amp/project/test/test.js diff --git a/packages/kit/test/apps/amp/tsconfig.json b/packages/kit/test/apps/amp/project/tsconfig.json similarity index 100% rename from packages/kit/test/apps/amp/tsconfig.json rename to packages/kit/test/apps/amp/project/tsconfig.json diff --git a/packages/kit/test/apps/basics/playwright.config.js b/packages/kit/test/apps/basics/playwright.config.js index 46f305662479..c0a3a7265da3 100644 --- a/packages/kit/test/apps/basics/playwright.config.js +++ b/packages/kit/test/apps/basics/playwright.config.js @@ -1,2 +1,2 @@ import { get_config } from '../../utils.js'; -export default get_config(3001); +export default get_config(3002); diff --git a/packages/kit/test/apps/options-2/playwright.config.js b/packages/kit/test/apps/options-2/playwright.config.js index 0fa6b836f197..b1a7b5b58047 100644 --- a/packages/kit/test/apps/options-2/playwright.config.js +++ b/packages/kit/test/apps/options-2/playwright.config.js @@ -1,2 +1,2 @@ import { get_config } from '../../utils.js'; -export default get_config(3003); +export default get_config(3004); diff --git a/packages/kit/test/apps/options/playwright.config.js b/packages/kit/test/apps/options/playwright.config.js index c0a3a7265da3..0fa6b836f197 100644 --- a/packages/kit/test/apps/options/playwright.config.js +++ b/packages/kit/test/apps/options/playwright.config.js @@ -1,2 +1,2 @@ import { get_config } from '../../utils.js'; -export default get_config(3002); +export default get_config(3003); From 38770896ead2542d52c85a86d62ca15fa0765b2c Mon Sep 17 00:00:00 2001 From: mrkishi Date: Fri, 4 Mar 2022 01:23:40 -0300 Subject: [PATCH 5/8] Revert "parallelize tests" This reverts commit 470b4fbe88cd1eb936cf972a03deec05cbb7bb85. --- package.json | 2 +- packages/kit/test/apps/amp/dev/package.json | 9 --- .../test/apps/amp/{project => }/package.json | 1 + .../amp/{project => }/playwright.config.js | 5 +- .../kit/test/apps/amp/preview/package.json | 9 --- .../test/apps/amp/{project => }/src/app.html | 0 .../{project => }/src/routes/__layout.svelte | 0 .../src/routes/invalid/index.svelte | 0 .../src/routes/origin/index.json.js | 0 .../src/routes/origin/index.svelte | 0 .../src/routes/styles/Unused.svelte | 0 .../src/routes/styles/imported.css | 0 .../src/routes/styles/index.svelte | 0 .../src/routes/valid/index.json.js | 0 .../src/routes/valid/index.svelte | 0 .../apps/amp/{project => }/svelte.config.js | 0 .../test/apps/amp/{project => }/test/test.js | 0 .../test/apps/amp/{project => }/tsconfig.json | 0 .../kit/test/apps/basics/playwright.config.js | 3 +- .../test/apps/options-2/playwright.config.js | 3 +- .../test/apps/options/playwright.config.js | 3 +- packages/kit/test/utils.js | 56 +++++++++---------- 22 files changed, 33 insertions(+), 58 deletions(-) delete mode 100644 packages/kit/test/apps/amp/dev/package.json rename packages/kit/test/apps/amp/{project => }/package.json (90%) rename packages/kit/test/apps/amp/{project => }/playwright.config.js (55%) delete mode 100644 packages/kit/test/apps/amp/preview/package.json rename packages/kit/test/apps/amp/{project => }/src/app.html (100%) rename packages/kit/test/apps/amp/{project => }/src/routes/__layout.svelte (100%) rename packages/kit/test/apps/amp/{project => }/src/routes/invalid/index.svelte (100%) rename packages/kit/test/apps/amp/{project => }/src/routes/origin/index.json.js (100%) rename packages/kit/test/apps/amp/{project => }/src/routes/origin/index.svelte (100%) rename packages/kit/test/apps/amp/{project => }/src/routes/styles/Unused.svelte (100%) rename packages/kit/test/apps/amp/{project => }/src/routes/styles/imported.css (100%) rename packages/kit/test/apps/amp/{project => }/src/routes/styles/index.svelte (100%) rename packages/kit/test/apps/amp/{project => }/src/routes/valid/index.json.js (100%) rename packages/kit/test/apps/amp/{project => }/src/routes/valid/index.svelte (100%) rename packages/kit/test/apps/amp/{project => }/svelte.config.js (100%) rename packages/kit/test/apps/amp/{project => }/test/test.js (100%) rename packages/kit/test/apps/amp/{project => }/tsconfig.json (100%) diff --git a/package.json b/package.json index 4f1f5fe29a17..bfcee1b74640 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "scripts": { "build": "pnpm build --filter=\"@sveltejs/*\" --filter=\"create-svelte\"", - "test": "pnpm -r test", + "test": "pnpm -r test --workspace-concurrency=1", "check": "pnpm -r check", "lint": "pnpm -r lint", "format": "pnpm -r format", diff --git a/packages/kit/test/apps/amp/dev/package.json b/packages/kit/test/apps/amp/dev/package.json deleted file mode 100644 index 7a97917ced41..000000000000 --- a/packages/kit/test/apps/amp/dev/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "test-amp", - "private": true, - "version": "0.0.1", - "scripts": { - "test": "cd ../project && npm run test:dev" - }, - "type": "module" -} diff --git a/packages/kit/test/apps/amp/project/package.json b/packages/kit/test/apps/amp/package.json similarity index 90% rename from packages/kit/test/apps/amp/project/package.json rename to packages/kit/test/apps/amp/package.json index db238c7ac548..f610279d5a73 100644 --- a/packages/kit/test/apps/amp/project/package.json +++ b/packages/kit/test/apps/amp/package.json @@ -7,6 +7,7 @@ "build": "node ../../cli.js build", "preview": "node ../../cli.js preview", "check": "tsc && svelte-check", + "test": "npm run test:dev && npm run test:build", "test:dev": "cross-env DEV=true playwright test", "test:build": "playwright test" }, diff --git a/packages/kit/test/apps/amp/project/playwright.config.js b/packages/kit/test/apps/amp/playwright.config.js similarity index 55% rename from packages/kit/test/apps/amp/project/playwright.config.js rename to packages/kit/test/apps/amp/playwright.config.js index 097f4d1b40ec..e83b1fd33ce2 100644 --- a/packages/kit/test/apps/amp/project/playwright.config.js +++ b/packages/kit/test/apps/amp/playwright.config.js @@ -1,7 +1,6 @@ -import { get_config } from '../../utils.js'; +import { config } from '../../utils.js'; -const config = get_config(process.env.DEV ? 3000 : 3001); -config.webServer.timeout = 15000; // AMP validator needs a long time to get moving +config.webServer && (config.webServer.timeout = 15000); // AMP validator needs a long time to get moving // remove any projects with javaScriptEnabled const projects = config.projects || []; diff --git a/packages/kit/test/apps/amp/preview/package.json b/packages/kit/test/apps/amp/preview/package.json deleted file mode 100644 index 9b173ef95403..000000000000 --- a/packages/kit/test/apps/amp/preview/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "test-amp", - "private": true, - "version": "0.0.1", - "scripts": { - "test": "cd ../project && npm run test:build" - }, - "type": "module" -} diff --git a/packages/kit/test/apps/amp/project/src/app.html b/packages/kit/test/apps/amp/src/app.html similarity index 100% rename from packages/kit/test/apps/amp/project/src/app.html rename to packages/kit/test/apps/amp/src/app.html diff --git a/packages/kit/test/apps/amp/project/src/routes/__layout.svelte b/packages/kit/test/apps/amp/src/routes/__layout.svelte similarity index 100% rename from packages/kit/test/apps/amp/project/src/routes/__layout.svelte rename to packages/kit/test/apps/amp/src/routes/__layout.svelte diff --git a/packages/kit/test/apps/amp/project/src/routes/invalid/index.svelte b/packages/kit/test/apps/amp/src/routes/invalid/index.svelte similarity index 100% rename from packages/kit/test/apps/amp/project/src/routes/invalid/index.svelte rename to packages/kit/test/apps/amp/src/routes/invalid/index.svelte diff --git a/packages/kit/test/apps/amp/project/src/routes/origin/index.json.js b/packages/kit/test/apps/amp/src/routes/origin/index.json.js similarity index 100% rename from packages/kit/test/apps/amp/project/src/routes/origin/index.json.js rename to packages/kit/test/apps/amp/src/routes/origin/index.json.js diff --git a/packages/kit/test/apps/amp/project/src/routes/origin/index.svelte b/packages/kit/test/apps/amp/src/routes/origin/index.svelte similarity index 100% rename from packages/kit/test/apps/amp/project/src/routes/origin/index.svelte rename to packages/kit/test/apps/amp/src/routes/origin/index.svelte diff --git a/packages/kit/test/apps/amp/project/src/routes/styles/Unused.svelte b/packages/kit/test/apps/amp/src/routes/styles/Unused.svelte similarity index 100% rename from packages/kit/test/apps/amp/project/src/routes/styles/Unused.svelte rename to packages/kit/test/apps/amp/src/routes/styles/Unused.svelte diff --git a/packages/kit/test/apps/amp/project/src/routes/styles/imported.css b/packages/kit/test/apps/amp/src/routes/styles/imported.css similarity index 100% rename from packages/kit/test/apps/amp/project/src/routes/styles/imported.css rename to packages/kit/test/apps/amp/src/routes/styles/imported.css diff --git a/packages/kit/test/apps/amp/project/src/routes/styles/index.svelte b/packages/kit/test/apps/amp/src/routes/styles/index.svelte similarity index 100% rename from packages/kit/test/apps/amp/project/src/routes/styles/index.svelte rename to packages/kit/test/apps/amp/src/routes/styles/index.svelte diff --git a/packages/kit/test/apps/amp/project/src/routes/valid/index.json.js b/packages/kit/test/apps/amp/src/routes/valid/index.json.js similarity index 100% rename from packages/kit/test/apps/amp/project/src/routes/valid/index.json.js rename to packages/kit/test/apps/amp/src/routes/valid/index.json.js diff --git a/packages/kit/test/apps/amp/project/src/routes/valid/index.svelte b/packages/kit/test/apps/amp/src/routes/valid/index.svelte similarity index 100% rename from packages/kit/test/apps/amp/project/src/routes/valid/index.svelte rename to packages/kit/test/apps/amp/src/routes/valid/index.svelte diff --git a/packages/kit/test/apps/amp/project/svelte.config.js b/packages/kit/test/apps/amp/svelte.config.js similarity index 100% rename from packages/kit/test/apps/amp/project/svelte.config.js rename to packages/kit/test/apps/amp/svelte.config.js diff --git a/packages/kit/test/apps/amp/project/test/test.js b/packages/kit/test/apps/amp/test/test.js similarity index 100% rename from packages/kit/test/apps/amp/project/test/test.js rename to packages/kit/test/apps/amp/test/test.js diff --git a/packages/kit/test/apps/amp/project/tsconfig.json b/packages/kit/test/apps/amp/tsconfig.json similarity index 100% rename from packages/kit/test/apps/amp/project/tsconfig.json rename to packages/kit/test/apps/amp/tsconfig.json diff --git a/packages/kit/test/apps/basics/playwright.config.js b/packages/kit/test/apps/basics/playwright.config.js index c0a3a7265da3..33d36b651014 100644 --- a/packages/kit/test/apps/basics/playwright.config.js +++ b/packages/kit/test/apps/basics/playwright.config.js @@ -1,2 +1 @@ -import { get_config } from '../../utils.js'; -export default get_config(3002); +export { config as default } from '../../utils.js'; diff --git a/packages/kit/test/apps/options-2/playwright.config.js b/packages/kit/test/apps/options-2/playwright.config.js index b1a7b5b58047..33d36b651014 100644 --- a/packages/kit/test/apps/options-2/playwright.config.js +++ b/packages/kit/test/apps/options-2/playwright.config.js @@ -1,2 +1 @@ -import { get_config } from '../../utils.js'; -export default get_config(3004); +export { config as default } from '../../utils.js'; diff --git a/packages/kit/test/apps/options/playwright.config.js b/packages/kit/test/apps/options/playwright.config.js index 0fa6b836f197..33d36b651014 100644 --- a/packages/kit/test/apps/options/playwright.config.js +++ b/packages/kit/test/apps/options/playwright.config.js @@ -1,2 +1 @@ -import { get_config } from '../../utils.js'; -export default get_config(3003); +export { config as default } from '../../utils.js'; diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js index 14dedacf3aa1..84ca7cfb020f 100644 --- a/packages/kit/test/utils.js +++ b/packages/kit/test/utils.js @@ -142,39 +142,35 @@ export const test = base.extend({ } }); -/** @type {(port: number) => import('@playwright/test').PlaywrightTestConfig} */ -export function get_config(port) { - return { - forbidOnly: !!process.env.CI, - // generous timeouts on CI - timeout: process.env.CI ? 45000 : 15000, - webServer: { - port, - command: process.env.DEV - ? `npm run dev -- --port=${port}` - : `npm run build && npm run preview -- --port=${port}` +/** @type {import('@playwright/test').PlaywrightTestConfig} */ +export const config = { + forbidOnly: !!process.env.CI, + // generous timeouts on CI + timeout: process.env.CI ? 45000 : 15000, + webServer: { + command: process.env.DEV ? 'npm run dev' : 'npm run build && npm run preview', + port: 3000 + }, + retries: process.env.CI ? 5 : 0, + projects: [ + { + name: `${process.env.DEV ? 'dev' : 'build'}+js`, + use: { + javaScriptEnabled: true + } }, - retries: process.env.CI ? 5 : 0, - projects: [ - { - name: `${process.env.DEV ? 'dev' : 'build'}+js`, - use: { - javaScriptEnabled: true - } - }, - { - name: `${process.env.DEV ? 'dev' : 'build'}-js`, - use: { - javaScriptEnabled: false - } + { + name: `${process.env.DEV ? 'dev' : 'build'}-js`, + use: { + javaScriptEnabled: false } - ], - use: { - screenshot: 'only-on-failure', - trace: 'retain-on-failure' } - }; -} + ], + use: { + screenshot: 'only-on-failure', + trace: 'retain-on-failure' + } +}; /** * From 14670dd670306bb276efe95f46975f7f08e8f7d1 Mon Sep 17 00:00:00 2001 From: mrkishi Date: Fri, 4 Mar 2022 11:54:06 -0300 Subject: [PATCH 6/8] reduce number of test scripts --- packages/kit/package.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/kit/package.json b/packages/kit/package.json index 6d21adfe9c94..b0921ce0c2d5 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -74,18 +74,10 @@ "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore", "prepublishOnly": "npm run build", "test": "npm run test:unit && npm run test:typings && npm run test:packaging", - "test:all": "npm run test && npm run test:prerendering && npm run test:integration", + "test:all": "pnpm run -r test --workspace-concurrency=1 --filter ./", "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging", "test:typings": "tsc --project test/typings", - "test:prerendering": "pnpm test:prerendering:basics && pnpm test:prerendering:options", - "test:prerendering:basics": "cd test/prerendering/basics && pnpm test", - "test:prerendering:options": "cd test/prerendering/options && pnpm test", "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"", - "test:integration": "pnpm test:integration:amp && pnpm test:integration:basics && pnpm test:integration:options && pnpm test:integration:options-2", - "test:integration:amp": "cd test/apps/amp && pnpm test", - "test:integration:basics": "cd test/apps/basics && pnpm test", - "test:integration:options": "cd test/apps/options && pnpm test", - "test:integration:options-2": "cd test/apps/options-2 && pnpm test", "types": "node scripts/extract-types.js" }, "exports": { From a0333d7f9c117b7bb897d4490c76835b252784aa Mon Sep 17 00:00:00 2001 From: mrkishi Date: Fri, 4 Mar 2022 12:08:10 -0300 Subject: [PATCH 7/8] increase playwright workers on ci --- packages/kit/test/utils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js index 84ca7cfb020f..f76049b28293 100644 --- a/packages/kit/test/utils.js +++ b/packages/kit/test/utils.js @@ -169,7 +169,8 @@ export const config = { use: { screenshot: 'only-on-failure', trace: 'retain-on-failure' - } + }, + workers: process.env.CI ? 2 : undefined }; /** From 8c4f6987f55b850b6ce35fb6b256d64884891695 Mon Sep 17 00:00:00 2001 From: mrkishi Date: Fri, 4 Mar 2022 12:20:55 -0300 Subject: [PATCH 8/8] reduce script further --- packages/kit/package.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/packages/kit/package.json b/packages/kit/package.json index b0921ce0c2d5..1ce2d1224551 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -61,20 +61,12 @@ "dev": "rollup -cw", "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format", "check": "tsc", - "check:all": "tsc && npm run check:integration && npm run check:prerendering", - "check:integration": "npm run check:integration:amp && npm run check:integration:basics && npm run check:integration:options && npm run check:integration:options-2", - "check:integration:amp": "cd test/apps/amp && pnpm sync && pnpm check", - "check:integration:basics": "cd test/apps/basics && pnpm sync && pnpm check", - "check:integration:options": "cd test/apps/options && pnpm sync && pnpm check", - "check:integration:options-2": "cd test/apps/options-2 && pnpm sync && pnpm check", - "check:prerendering": "npm run check:prerendering:basics && npm run check:prerendering:options", - "check:prerendering:basics": "cd test/prerendering/basics && pnpm sync && pnpm check", - "check:prerendering:options": "cd test/prerendering/options && pnpm sync && pnpm check", + "check:all": "tsc && pnpm run -r check --filter ./", "format": "npm run check-format -- --write", "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore", "prepublishOnly": "npm run build", "test": "npm run test:unit && npm run test:typings && npm run test:packaging", - "test:all": "pnpm run -r test --workspace-concurrency=1 --filter ./", + "test:all": "pnpm run -r test --workspace-concurrency 1 --filter ./", "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging", "test:typings": "tsc --project test/typings", "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",