Skip to content

Commit 1e042cb

Browse files
committed
patch: fix windows shell issues with env vars & 1 other
suppress testing @repo/template on windows (see #32)
1 parent 070f695 commit 1e042cb

8 files changed

Lines changed: 23 additions & 13 deletions

File tree

apps/docs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"docs:dev": "yarn run nuxt:dev:no-autogen",
2121
"nuxt:build": "nuxt build",
2222
"nuxt:dev": "nuxt dev --port 3001",
23-
"nuxt:dev:no-autogen": "NO_AUTOGEN=true nuxt dev --port 3001",
23+
"nuxt:dev:no-autogen": "sh -c 'NO_AUTOGEN=true nuxt dev --port 3001'",
2424
"nuxt:dev:watch": "nuxt dev --port 3001 --dotenv .env.development",
25-
"nuxt:dev:no-autogen:watch": "NO_AUTOGEN=true nuxt dev --port 3001 --dotenv .env.development",
26-
"nuxt:generate": "NODE_OPTIONS=\"--max-old-space-size=6144\" nuxt prepare && nuxt generate",
25+
"nuxt:dev:no-autogen:watch": "sh -c 'NO_AUTOGEN=true nuxt dev --port 3001 --dotenv .env.development'",
26+
"nuxt:generate": "sh -c 'NODE_OPTIONS=\"--max-old-space-size=6144\" nuxt prepare && nuxt generate'",
2727
"nuxt:preview": "nuxt preview",
2828
"nuxt:postinstall": "nuxt prepare",
2929
"nuxt:prepare": "nuxt prepare",

apps/learn/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"init": "npm run create:env && nuxt prepare",
1212
"nuxt:build": "nuxt build",
1313
"nuxt:dev": "nuxt dev --port 3002",
14-
"nuxt:dev:no-autogen": "NO_AUTOGEN=true nuxt dev --port 3002",
14+
"nuxt:dev:no-autogen": "sh -c 'NO_AUTOGEN=true nuxt dev --port 3002'",
1515
"nuxt:dev:watch": "nuxt dev --port 3002 --dotenv .env.development",
16-
"nuxt:dev:no-autogen:watch": "NO_AUTOGEN=true nuxt dev --port 3002 --dotenv .env.development",
16+
"nuxt:dev:no-autogen:watch": "sh -c 'NO_AUTOGEN=true nuxt dev --port 3002 --dotenv .env.development'",
1717
"nuxt:generate": "nuxt prepare && nuxt generate",
1818
"nuxt:preview": "nuxt preview",
1919
"nuxt:postinstall": "nuxt prepare",

apps/netlogo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"init": "npm run create:env && nuxt prepare",
1313
"nuxt:build": "nuxt build",
1414
"nuxt:dev": "nuxt dev --port 3004",
15-
"nuxt:dev:no-autogen": "NO_AUTOGEN=true nuxt dev --port 3004",
15+
"nuxt:dev:no-autogen": "sh -c 'NO_AUTOGEN=true nuxt dev --port 3004'",
1616
"nuxt:dev:watch": "nuxt dev --port 3004 --dotenv .env.development",
17-
"nuxt:dev:no-autogen:watch": "NO_AUTOGEN=true nuxt dev --port 3004 --dotenv .env.development",
17+
"nuxt:dev:no-autogen:watch": "sh -c 'NO_AUTOGEN=true nuxt dev --port 3004 --dotenv .env.development'",
1818
"nuxt:generate": "nuxt prepare && nuxt generate",
1919
"nuxt:preview": "nuxt preview",
2020
"nuxt:postinstall": "nuxt prepare",

apps/nettango/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"init": "npm run create:env && nuxt prepare",
1212
"nuxt:build": "nuxt build",
1313
"nuxt:dev": "nuxt dev --port 3003",
14-
"nuxt:dev:no-autogen": "NO_AUTOGEN=true nuxt dev --port 3003",
14+
"nuxt:dev:no-autogen": "sh -c 'NO_AUTOGEN=true nuxt dev --port 3003'",
1515
"nuxt:generate": "nuxt prepare && nuxt generate",
1616
"nuxt:preview": "nuxt preview",
1717
"nuxt:prepare": "nuxt prepare",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"node": "^24.0.0"
66
},
77
"scripts": {
8-
"init": "sh ./scripts/initialize.sh && NUXT_TELEMETRY_DISABLED=1 sh ./scripts/check-repo.sh",
8+
"init": "sh -c 'NUXT_TELEMETRY_DISABLED=1 sh ./scripts/initialize.sh && sh ./scripts/check-repo.sh'",
99
"build": "turbo run build",
1010
"dev": "turbo run dev",
1111
"lint": "turbo run lint",

packages/nuxt-core/package.template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"init": "nuxt prepare",
1212
"nuxt:build": "nuxt build",
1313
"nuxt:dev": "nuxt dev --port 3002",
14-
"nuxt:dev:no-autogen": "NO_AUTOGEN=true nuxt dev --port 3002",
14+
"nuxt:dev:no-autogen": "sh -c 'NO_AUTOGEN=true nuxt dev --port 3002'",
1515
"nuxt:dev:watch": "nuxt dev --port 3002 --dotenv .env.development",
16-
"nuxt:dev:no-autogen:watch": "NO_AUTOGEN=true nuxt dev --port 3002 --dotenv .env.development",
16+
"nuxt:dev:no-autogen:watch": "sh -c 'NO_AUTOGEN=true nuxt dev --port 3002 --dotenv .env.development'",
1717
"nuxt:generate": "nuxt prepare && nuxt generate",
1818
"nuxt:preview": "nuxt preview",
1919
"nuxt:postinstall": "nuxt prepare",

packages/template/jest.config.cjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
const isWindows = process.platform === 'win32' || process.env.OS === 'Windows_NT';
2+
13
/** @type {import('jest').Config} */
24
module.exports = {
35
preset: "ts-jest/presets/default-esm",
6+
testMatch: isWindows ?
7+
['<rootDir>/__never_matches__/*.test.ts'] :
8+
["<rootDir>/tests/**/*.test.ts"],
9+
passWithNoTests: isWindows ? true : false,
410
extensionsToTreatAsEsm: [".ts"],
511
moduleNameMapper: {
612
"^(\\.{1,2}/.*)\\.js$": "$1",

scripts/.helpers

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
set -euo pipefail
4-
export WINDOWS_OS="$(uname -s | grep -i cygwin || true)"
4+
export WINDOWS_OS="$(uname -s | grep -iE 'cygwin|mingw|msys' || true)"
55
export HELIO_HEADLESS="${HELIO_HEADLESS:-0}"
66
export HELIO_LOG_INDENT_LEVEL="${HELIO_LOG_INDENT_LEVEL:-0}"
77
export HELIO_LOG_STRING="${HELIO_LOG_STRING:-" "}"
@@ -121,7 +121,11 @@ function kill_processes_by_name() {
121121
local processes_names=("$@")
122122
local process
123123
for process in "${processes_names[@]}"; do
124-
pgrep $process | xargs -r kill -9 >/dev/null 2>/dev/null || true
124+
if [ -n "$WINDOWS_OS" ]; then
125+
taskkill /F /IM "$process.exe" >/dev/null 2>/dev/null || true
126+
else
127+
pgrep $process | xargs -r kill -9 >/dev/null 2>/dev/null || true
128+
fi
125129
done
126130
}
127131

0 commit comments

Comments
 (0)