Skip to content

Commit 87a3651

Browse files
committed
fix(repo): address smoke-v2 review feedback
1 parent cfcaf5e commit 87a3651

File tree

6 files changed

+181
-33
lines changed

6 files changed

+181
-33
lines changed

.github/workflows/test-smoke-v2.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,7 @@ jobs:
3434
moon run :build --query "project~plugin-*"
3535
3636
- name: Run smoke-v2 tests
37-
run: moon smoke-v2:run.ci
37+
env:
38+
DOT_LOG_LEVEL: debug
39+
LOCAL_SMOKE: 'true'
40+
run: moon smoke-v2:run

pnpm-lock.yaml

Lines changed: 160 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/ci-preview-setup-smoke-v2.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@ pnpm exec create-mail "$PROJECT_DIR_NAME" --yes
2323
mv -f "$PROJECT_DIR_NAME" "$TESTS_DIR/$PROJECT_DIR_NAME"
2424

2525
cd "$TESTS_DIR/$PROJECT_DIR_NAME"
26+
27+
REPO_PACKAGE_MANAGER=$(node -p "require('$REPO_DIR/package.json').packageManager")
28+
29+
REPO_PACKAGE_MANAGER="$REPO_PACKAGE_MANAGER" node -e "const fs=require('node:fs'); const pkg=JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.packageManager=process.env.REPO_PACKAGE_MANAGER; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');"
30+
31+
cat > pnpm-workspace.yaml <<'EOF'
32+
packages:
33+
- .
34+
35+
dangerouslyAllowAllBuilds: true
36+
EOF
37+
2638
pnpm i
2739

2840
# The dependencies below are required for fixtures

test/smoke-v2/moon.yml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,51 +23,21 @@ tasks:
2323
deps:
2424
- ~:install
2525
- ~:setup
26-
env:
27-
SMOKE_V2_STATE_PATH: /tmp/jsx-email-smoke-v2.state
28-
options:
29-
cache: false
30-
outputStyle: 'stream'
31-
runDepsInParallel: false
32-
33-
run.ci:
34-
command: playwright test -x
35-
deps:
36-
- ~:install
37-
- ~:setup.ci
38-
env:
39-
DOT_LOG_LEVEL: debug
40-
LOCAL_SMOKE: 'true'
41-
SMOKE_V2_STATE_PATH: /tmp/jsx-email-smoke-v2.state
4226
options:
4327
cache: false
4428
outputStyle: 'stream'
4529
runDepsInParallel: false
4630

4731
setup:
4832
command: ./scripts/ci-preview-setup-smoke-v2.sh
49-
env:
50-
SMOKE_V2_STATE_PATH: /tmp/jsx-email-smoke-v2.state
51-
options:
52-
cache: false
53-
outputStyle: 'stream'
54-
runFromWorkspaceRoot: true
55-
platform: system
56-
57-
setup.ci:
58-
command: ./scripts/ci-preview-setup-smoke-v2.sh
59-
env:
60-
SMOKE_V2_STATE_PATH: /tmp/jsx-email-smoke-v2.state
6133
options:
6234
cache: false
6335
outputStyle: 'stream'
6436
runFromWorkspaceRoot: true
6537
platform: system
6638

67-
start.ci:
39+
start:
6840
command: ./scripts/ci-preview-start-smoke-v2.sh
69-
env:
70-
SMOKE_V2_STATE_PATH: /tmp/jsx-email-smoke-v2.state
7141
options:
7242
cache: false
7343
outputStyle: 'stream'

test/smoke-v2/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
},
1111
"dependencies": {
1212
"@playwright/test": "^1.57.0",
13+
"@jsx-email/plugin-inline": "workspace:^",
14+
"@jsx-email/plugin-minify": "workspace:^",
15+
"@jsx-email/plugin-pretty": "workspace:^",
1316
"dedent": "^1.5.1",
1417
"diffable-html": "^6.0.1",
1518
"jsx-email": "workspace:^",

test/smoke-v2/playwright.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default defineConfig({
2323
trace: 'on-first-retry'
2424
},
2525
webServer: {
26-
command: 'moon smoke-v2:start.ci',
26+
command: 'moon smoke-v2:start',
2727
env: {
2828
ENV_TEST_VALUE: 'joker'
2929
},

0 commit comments

Comments
 (0)