chore: use pnpm shellEmulator instead of cross-env (#14141)

Rich-Harris · benmccann · web-flow · commit bcc8b4202250 · 2025-08-08T11:35:58.000-04:00
* chore: use pnpm shellEmulator instead of cross-env

* errr try this?

* try this

* does shellEmulator do anything at all?

* try with a dash

* quotes around * filters

* cleanup

* fix

---------

Co-authored-by: Ben McCann &lt;322311+benmccann@users.noreply.github.com&gt;
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
 link-workspace-packages = true
+shell-emulator = true
diff --git a/package.json b/package.json
@@ -11,14 +11,14 @@
 		"test:server-side-route-resolution:dev": "pnpm run --dir packages/kit test:server-side-route-resolution:dev",
 		"test:server-side-route-resolution:build": "pnpm run --dir packages/kit test:server-side-route-resolution:build",
 		"test:vite-ecosystem-ci": "pnpm --dir packages/kit test",
-		"test:others": "pnpm -r --filter=./packages/* --filter=!./packages/kit/ --workspace-concurrency=1 test",
+		"test:others": "pnpm -r --filter='./packages/*' --filter=!./packages/kit/ --workspace-concurrency=1 test",
 		"check": "pnpm -r prepublishOnly && pnpm -r check",
 		"lint": "pnpm -r lint && eslint --cache --cache-location node_modules/.eslintcache 'packages/**/*.js'",
 		"format": "pnpm -r format",
 		"precommit": "pnpm format && pnpm lint",
 		"changeset:version": "changeset version && pnpm -r generate:version && git add --all",
 		"changeset:release": "changeset publish",
-		"build": "pnpm --filter @sveltejs/* -r build",
+		"build": "pnpm --filter '@sveltejs/*' -r build",
 		"sync-all": "node scripts/sync-all.js"
 	},
 	"devDependencies": {
diff --git a/packages/adapter-cloudflare/test/apps/workers/package.json b/packages/adapter-cloudflare/test/apps/workers/package.json
@@ -7,14 +7,13 @@
 		"build": "vite build",
 		"preview": "wrangler dev dist/index.js",
 		"prepare": "svelte-kit sync || echo ''",
-		"test:dev": "cross-env DEV=true playwright test",
+		"test:dev": "DEV=true playwright test",
 		"test:build": "playwright test",
 		"test": "pnpm test:dev && pnpm test:build"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"server-side-dep": "file:server-side-dep",
 		"svelte": "^5.35.5",
 		"vite": "catalog:",
diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json
@@ -9,14 +9,13 @@
 		"prepare": "svelte-kit sync",
 		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "pnpm test:dev && pnpm test:build",
-		"test:dev": "cross-env DEV=true playwright test",
+		"test:dev": "DEV=true playwright test",
 		"test:build": "playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/amp": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"dropcss": "^1.0.16",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
@@ -9,17 +9,16 @@
 		"prepare": "svelte-kit sync",
 		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "node test/setup.js && pnpm test:dev && pnpm test:build",
-		"test:dev": "node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env DEV=true playwright test",
-		"test:build": "node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env PUBLIC_PRERENDERING=false playwright test",
-		"test:cross-platform:dev": "node test/setup.js && node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env DEV=true playwright test test/cross-platform/",
-		"test:cross-platform:build": "node test/setup.js && node -e \"fs.rmSync('test/errors.json', { force: true })\" && playwright test test/cross-platform/",
-		"test:server-side-route-resolution:dev": "node test/setup.js && node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env DEV=true ROUTER_RESOLUTION=server playwright test",
-		"test:server-side-route-resolution:build": "node test/setup.js && node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env PUBLIC_PRERENDERING=false ROUTER_RESOLUTION=server playwright test"
+		"test:dev": "rm -rf test/errors.json && DEV=true playwright test",
+		"test:build": "rm -rf test/errors.json && PUBLIC_PRERENDERING=false playwright test",
+		"test:cross-platform:dev": "node test/setup.js && rm -rf test/errors.json && DEV=true playwright test test/cross-platform/",
+		"test:cross-platform:build": "node test/setup.js && rm -rf test/errors.json && playwright test test/cross-platform/",
+		"test:server-side-route-resolution:dev": "node test/setup.js && rm -rf test/errors.json && DEV=true ROUTER_RESOLUTION=server playwright test",
+		"test:server-side-route-resolution:build": "node test/setup.js && rm -rf test/errors.json && PUBLIC_PRERENDERING=false ROUTER_RESOLUTION=server playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"test-redirect-importer": "workspace:*",
diff --git a/packages/kit/test/apps/basics/playwright.config.js b/packages/kit/test/apps/basics/playwright.config.js
@@ -1,12 +1,15 @@
 import process from 'node:process';
 import { config } from '../../utils.js';
+import { defineConfig } from '@playwright/test';
 
-export default {
+export default defineConfig({
 	...config,
 	webServer: {
-		command: process.env.DEV
-			? `cross-env PUBLIC_PRERENDERING=false ROUTER_RESOLUTION=${process.env.ROUTER_RESOLUTION ?? 'client'} pnpm dev`
-			: `cross-env PUBLIC_PRERENDERING=true ROUTER_RESOLUTION=${process.env.ROUTER_RESOLUTION ?? 'client'} pnpm build && pnpm preview`,
-		port: process.env.DEV ? 5173 : 4173
+		command: process.env.DEV ? `pnpm dev` : `pnpm build && pnpm preview`,
+		port: process.env.DEV ? 5173 : 4173,
+		env: {
+			PUBLIC_PRERENDERING: 'false',
+			ROUTER_RESOLUTION: process.env.ROUTER_RESOLUTION ?? 'client'
+		}
 	}
-};
+});
diff --git a/packages/kit/test/apps/dev-only/package.json b/packages/kit/test/apps/dev-only/package.json
@@ -8,12 +8,11 @@
 		"preview": "vite preview",
 		"prepare": "svelte-kit sync",
 		"check": "svelte-kit sync && tsc && svelte-check",
-		"test": "cross-env DEV=true playwright test"
+		"test": "DEV=true playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"e2e-test-dep-error": "file:./_test_dependencies/cjs-only",
 		"e2e-test-dep-hooks": "file:./_test_dependencies/cjs-only",
 		"e2e-test-dep-hooks-client": "file:./_test_dependencies/cjs-only",
diff --git a/packages/kit/test/apps/embed/package.json b/packages/kit/test/apps/embed/package.json
@@ -9,13 +9,12 @@
 		"prepare": "svelte-kit sync",
 		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "pnpm test:dev && pnpm test:build",
-		"test:dev": "cross-env DEV=true playwright test",
+		"test:dev": "DEV=true playwright test",
 		"test:build": "playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
diff --git a/packages/kit/test/apps/hash-based-routing/package.json b/packages/kit/test/apps/hash-based-routing/package.json
@@ -9,13 +9,12 @@
 		"prepare": "svelte-kit sync",
 		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "pnpm test:dev && pnpm test:build",
-		"test:dev": "cross-env DEV=true playwright test",
+		"test:dev": "DEV=true playwright test",
 		"test:build": "playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
diff --git a/packages/kit/test/apps/no-ssr/package.json b/packages/kit/test/apps/no-ssr/package.json
@@ -9,13 +9,12 @@
 		"prepare": "svelte-kit sync",
 		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "pnpm test:dev && pnpm test:build",
-		"test:dev": "cross-env DEV=true playwright test",
+		"test:dev": "DEV=true playwright test",
 		"test:build": "playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
diff --git a/packages/kit/test/apps/options-2/package.json b/packages/kit/test/apps/options-2/package.json
@@ -9,14 +9,13 @@
 		"prepare": "svelte-kit sync",
 		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "pnpm test:dev && pnpm test:build",
-		"test:dev": "cross-env DEV=true playwright test",
+		"test:dev": "DEV=true playwright test",
 		"test:build": "playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-node": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
diff --git a/packages/kit/test/apps/options/package.json b/packages/kit/test/apps/options/package.json
@@ -9,16 +9,15 @@
 		"prepare": "svelte-kit sync",
 		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "pnpm test:dev && pnpm test:build",
-		"test:dev": "cross-env DEV=true playwright test",
+		"test:dev": "DEV=true playwright test",
 		"test:build": "playwright test",
-		"test:server-side-route-resolution:dev": "node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env DEV=true ROUTER_RESOLUTION=server playwright test",
-		"test:server-side-route-resolution:build": "node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env ROUTER_RESOLUTION=server playwright test"
+		"test:server-side-route-resolution:dev": "rm -rf test/errors.json && DEV=true ROUTER_RESOLUTION=server playwright test",
+		"test:server-side-route-resolution:build": "rm -rf test/errors.json && ROUTER_RESOLUTION=server playwright test"
 	},
 	"devDependencies": {
 		"@fontsource/libre-barcode-128-text": "^5.1.0",
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
diff --git a/packages/kit/test/apps/options/playwright.config.js b/packages/kit/test/apps/options/playwright.config.js
@@ -1,12 +1,14 @@
 import process from 'node:process';
 import { config } from '../../utils.js';
+import { defineConfig } from '@playwright/test';
 
-export default {
+export default defineConfig({
 	...config,
 	webServer: {
 		...config.webServer,
-		command: process.env.DEV
-			? `cross-env ROUTER_RESOLUTION=${process.env.ROUTER_RESOLUTION ?? 'client'} pnpm dev`
-			: `cross-env ROUTER_RESOLUTION=${process.env.ROUTER_RESOLUTION ?? 'client'} pnpm build && pnpm preview`
+		command: process.env.DEV ? `pnpm dev` : `pnpm build && pnpm preview`,
+		env: {
+			ROUTER_RESOLUTION: process.env.ROUTER_RESOLUTION ?? 'client'
+		}
 	}
-};
+});
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/package.json b/packages/kit/test/apps/prerendered-app-error-pages/package.json
@@ -11,13 +11,12 @@
 		"check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch",
 		"test": "pnpm test:dev && pnpm test:build",
-		"test:dev": "cross-env DEV=true playwright test",
+		"test:dev": "DEV=true playwright test",
 		"test:build": "playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
diff --git a/packages/kit/test/apps/writes/package.json b/packages/kit/test/apps/writes/package.json
@@ -9,13 +9,12 @@
 		"prepare": "svelte-kit sync",
 		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "pnpm test:dev && pnpm test:build",
-		"test:dev": "cross-env DEV=true playwright test",
+		"test:dev": "DEV=true playwright test",
 		"test:build": "playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
diff --git a/packages/kit/test/build-errors/apps/private-static-env/package.json b/packages/kit/test/build-errors/apps/private-static-env/package.json
@@ -13,7 +13,6 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"cross-env": "catalog:",
 		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
diff --git a/packages/kit/test/types.d.ts b/packages/kit/test/types.d.ts
@@ -1,6 +1,5 @@
 import {
 	PlaywrightTestArgs,
-	PlaywrightTestConfig,
 	PlaywrightTestOptions,
 	PlaywrightWorkerArgs,
 	PlaywrightWorkerOptions,
@@ -43,5 +42,3 @@ export const test: TestType<
 		},
 	PlaywrightWorkerArgs & PlaywrightWorkerOptions
 >;
-
-export const config: PlaywrightTestConfig;
diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js
@@ -3,9 +3,9 @@ import http from 'node:http';
 import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
-import { test as base, devices } from '@playwright/test';
+import { defineConfig, test as base, devices } from '@playwright/test';
 
-/** @type {import('./utils.js')['test']} */
+/** @type {import('./types')['test']} */
 export const test = base.extend({
 	app: ({ page }, use) => {
 		// these are assumed to have been put in the global scope by the layout
@@ -249,8 +249,7 @@ if (!test_browser_device) {
 	);
 }
 
-/** @type {import('./utils.js')['config']} */
-export const config = {
+export const config = defineConfig({
 	forbidOnly: !!process.env.CI,
 	// generous timeouts on CI
 	timeout: process.env.CI ? 45000 : 15000,
@@ -287,4 +286,4 @@ export const config = {
 		: 'list',
 	testDir: 'test',
 	testMatch: /(.+\.)?(test|spec)\.[jt]s/
-};
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`link-workspace-packages = true`
	`2`	`+shell-emulator = true`