Skip to content

chore: replace cross-env with pnpm shell emulator #2987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
teemingc wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

chore: replace cross-env with pnpm shell emulator #2987

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4fb5ce6
use shell emulator
teemingc Mar 24, 2026
7744fb8
fix
teemingc Mar 24, 2026
7e4903d
Merge branch 'master' into chore-remove-cross-env
teemingc Mar 31, 2026
d119b25
fix endless recursive
teemingc Mar 31, 2026
e3f63cd
revert
teemingc Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"scripts": {
"bootstrap": "cd ./packages/svelte2tsx && pnpm build && cd ../svelte-vscode && pnpm build:grammar",
"build": "tsc -b",
"test": "cross-env CI=true pnpm test -r",
"test": "CI=true pnpm run -r test",
Copy link
Copy Markdown
Member Author

@teemingc teemingc Mar 31, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specifying the pnpm run command fixes an endless recursion because it didn't exclude the root workspace test command.
See https://pnpm.io/cli/recursive

"watch": "tsc -b -watch",
"format": "prettier --write .",
"lint": "prettier --check .",
Expand All @@ -20,9 +20,8 @@
"devDependencies": {
"@changesets/cli": "^2.29.7",
"@svitejs/changesets-changelog-github-compact": "^1.1.0",
"cross-env": "^7.0.2",
"prettier": "~3.3.3",
"ts-node": "^10.0.0"
},
"packageManager": "pnpm@9.3.0"
"packageManager": "pnpm@10.32.1"
}
3 changes: 1 addition & 2 deletions packages/language-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"./bin/server.js": "./bin/server.js"
},
"scripts": {
"test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --require ts-node/register \"test/**/*.test.ts\" --no-experimental-strip-types",
"test": "TS_NODE_TRANSPILE_ONLY=true mocha --require ts-node/register \"test/**/*.test.ts\" --no-experimental-strip-types",
"build": "tsc",
"prepublishOnly": "npm run build",
"watch": "tsc -w"
Expand Down Expand Up @@ -45,7 +45,6 @@
"@types/mocha": "^9.1.0",
"@types/node": "^18.0.0",
"@types/sinon": "^7.5.2",
"cross-env": "^7.0.2",
"mocha": "^9.2.0",
"sinon": "^11.0.0",
"ts-node": "^10.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ async•()•=>•{•{const•$$action_0•=•__sveltets_2_ensureAction(action

•{const•$$action_0•=•__sveltets_2_ensureAction(action(svelteHTML.mapElementTag('element'),({•↲ [generated] line 13
action(svelteHTML.mapElementTag('element'),({•↲ [generated] subset
action= {•↲
action= {•↲
action= {•
action= {•
╚use:action={{•↲ [original] line 18 (rest generated at line 16)
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
...leet,
Expand Down
55 changes: 27 additions & 28 deletions packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
async () => {if(foo){ {/**
============# Originless mappings
async•()•=>•{if(foo){↲ [generated] line 3
{ foo} ↲
{ foo}↲
{ foo}
{ foo}
{#if•foo}↲ [original] line 1
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
{ svelteHTML.createElement("element", {});} {/**
╚•{•svelteHTML.createElement("element",•{});}↲ [generated] line 4
╚< element / ↲
╚<element / ↲
╚< element /
╚<element /
╚<element•/>↲ [original] line 2
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
} {/**
Expand All @@ -38,38 +38,38 @@ if($foo){•{•svelteHTML.createElement("element",•{});}}↲ [generated] l
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
if(foo){ {/**
if(foo){↲ [generated] line 9
{ foo} ↲
{ foo}↲
{ foo}
{ foo}
{#if•foo}↲ [original] line 7
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
{ svelteHTML.createElement("element", {});} {/**
╚•{•svelteHTML.createElement("element",•{});}↲ [generated] line 10
╚< element/ ↲
╚<element/ ↲
╚< element/
╚<element/
╚<element/>↲ [original] line 8
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
} else if (bar){ {/**
}•else•if•(bar){↲ [generated] line 11
{ bar} ↲
{ bar}↲
{ bar}
{ bar}
{:else•if•bar}↲ [original] line 9
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
{ svelteHTML.createElement("element", {});} {/**
╚•{•svelteHTML.createElement("element",•{});}↲ [generated] line 12
╚< element/ ↲
╚<element/ ↲
╚< element/
╚<element/
╚<element/>↲ [original] line 10
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
}else{ {/**
}else{↲ [generated] line 13
{else}↲
{ else}↲
{else}
{ else}
{:else}↲ [original] line 11
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
{ svelteHTML.createElement("element", {});} {/**
╚•{•svelteHTML.createElement("element",•{});}↲ [generated] line 14
╚< element/ ↲
╚<element/ ↲
╚< element/
╚<element/
╚<element/>↲ [original] line 12
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
}}; {/**
Expand Down
6 changes: 2 additions & 4 deletions packages/svelte2tsx/test/sourcemaps/samples/import-equal/mappings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
;function $$render() { {/**
;function•$$render()•{↲ [generated] line 2
<s
<script>↲ [original] line 1 (rest generated at line 3)
<script>↲ [original] line 1
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
{/**
↲ [generated] line 3
↲
<script>↲ [original] line 1 (rest generated at line 2)

------------------------------------------------------------------------------------------------------------------------------------------------------ */}
import A; {/**
••••import•A;↲ [generated] line 4
Expand Down
Loading
Loading