Skip to content

Commit f63dde0

Browse files
committed
Merge branch 'release' into deploy-web
2 parents 4798e66 + c026919 commit f63dde0

File tree

1,747 files changed

+76624
-57052
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,747 files changed

+76624
-57052
lines changed

.devcontainer/devcontainer.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @wasp-lang/eng

.github/actions/prepare-deploy-test/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
uses: actions/setup-node@v6
1616
with:
1717
cache: "npm"
18-
node-version: lts/*
18+
node-version-file: .nvmrc
1919

2020
- name: Install Wasp CLI
2121
working-directory: waspc

.github/workflows/automation-merge-release-to-main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
Automated PR to merge changes from `release` branch back into `main`.
1818
1919
> [!IMPORTANT]
20-
> You should **NOT** "Rebase and merge" or "Squash and merge" this PR, so we avoid conflicts in the future.
20+
> Choose "Create a merge commit"/"Merge pull request." You must **NOT** "Rebase and merge" or "Squash and merge" this PR, so we avoid conflicts in the future.
2121
2222
jobs:
2323
create-pr:

.github/workflows/ci-deploy-test.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
name: "Test - Wasp Deploy"
22

33
on:
4-
push:
5-
# TODO: remove before merging this PR
6-
branches:
7-
- miho-railway-deployment-test-ci
84
workflow_call:
95
secrets:
106
FLY_GITHUB_TESTING_TOKEN:
@@ -145,7 +141,11 @@ jobs:
145141
# want to always clean them up.
146142
if: always()
147143
steps:
148-
- uses: actions/checkout@v5
144+
- name: Install Railway CLI
145+
# NOTE: We pinned the Railway version because we don't want the changes in the
146+
# Railway CLI to affect our cleanup procedure. `railway delete` isn't a part
147+
# of Wasp, we're just incidentally using the same tool Wasp uses.
148+
run: npm install -g @railway/cli@4.23.0
149149

150150
- name: Clean up test project
151-
run: node ./scripts/deploy-test/cleanup-railway-project.mjs "$APP_PREFIX"
151+
run: railway delete --yes --project "$APP_PREFIX" || true

.github/workflows/ci-examples-test.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,23 @@ jobs:
3131

3232
- uses: actions/setup-node@v6
3333
with:
34-
node-version: lts/*
34+
node-version-file: .nvmrc
3535

3636
- name: Install Wasp CLI
3737
working-directory: waspc
3838
run: ./run install
3939

40-
- name: Install node dependencies for ${{ matrix.example }}
40+
- name: Setup Wasp TS Config (if needed)
4141
working-directory: examples/${{ matrix.example }}
42-
run: npm ci
42+
run: |
43+
if [ -f *.wasp.ts ]; then
44+
wasp-cli ts-setup
45+
fi
46+
47+
# We must compile the project to generate the Wasp libs before installing deps
48+
- name: Compile project and install deps for ${{ matrix.example }}
49+
working-directory: examples/${{ matrix.example }}
50+
run: wasp-cli compile
4351

4452
- name: Setup project environment for ${{ matrix.example }}
4553
working-directory: examples/${{ matrix.example }}

.github/workflows/ci-formatting.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-node@v6
1919
with:
2020
cache: "npm"
21-
node-version: "22"
21+
node-version-file: .nvmrc
2222

2323
- name: Run Prettier
2424
run: |
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: "Test - Wasp Libs"
2+
3+
on:
4+
workflow_call:
5+
6+
env:
7+
WASP_TELEMETRY_DISABLE: 1
8+
9+
jobs:
10+
test-libs:
11+
name: Test Wasp libs
12+
runs-on: ubuntu-22.04
13+
steps:
14+
- uses: "actions/checkout@v6"
15+
16+
- uses: actions/setup-node@v6
17+
with:
18+
node-version-file: .nvmrc
19+
20+
- name: Test all libs
21+
working-directory: waspc
22+
run: ./run test:libs

.github/workflows/ci-npm-package-build.yaml

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,19 @@ name: "Build - Wasp npm packages"
33
on:
44
workflow_call:
55
inputs:
6-
build-outputs:
6+
build-outputs-json:
77
description: "The returned outputs from the build workflow, as a JSON string"
88
required: true
99
type: string
1010

11+
override-npm-package-version:
12+
description: >
13+
If set, overrides the version of npm packages to publish.
14+
Useful for publishing an RC version.
15+
Leading 'v' will be stripped if present.
16+
required: false
17+
type: string
18+
1119
env:
1220
WASP_TELEMETRY_DISABLE: 1
1321

@@ -37,15 +45,17 @@ jobs:
3745
3846
- name: Create build metadata file
3947
env:
40-
INPUT_DATA: ${{ inputs.build-outputs}}
48+
INPUT_DATA_JSON: ${{ inputs.build-outputs-json }}
49+
OVERRIDE_VERSION_JSON: ${{ inputs.override-npm-package-version && toJson(inputs.override-npm-package-version) || 'null' }}
4150
JQ_PROGRAM:
4251
# The schema for this file is at `scripts/make-npm-packages/src/schema/input-data.ts`.
4352
# We'll wrangle the data from the build jobs into that schema here.
4453
|
4554
{
46-
version: .waspc_version,
55+
version: ($overrideVersion // $inputData.waspc_version) | ltrimstr("v"),
4756
tarballs:
48-
with_entries(select(.key | startswith("output_")))
57+
$inputData
58+
| with_entries(select(.key | startswith("output_")))
4959
| map(
5060
fromjson
5161
| {
@@ -54,21 +64,33 @@ jobs:
5464
}
5565
)
5666
}
57-
run: echo "$INPUT_DATA" | jq "$JQ_PROGRAM" > ./input/data.json
67+
run: |
68+
jq \
69+
--null-input \
70+
--argjson inputData "$INPUT_DATA_JSON" \
71+
--argjson overrideVersion "$OVERRIDE_VERSION_JSON" \
72+
"$JQ_PROGRAM" \
73+
> ./input/data.json
74+
75+
cat ./input/data.json # For debugging purposes
5876
5977
- uses: actions/setup-node@v6
6078
with:
61-
node-version: "22"
6279
cache: npm
80+
node-version-file: ".nvmrc"
6381

6482
- name: Install dependencies for script
6583
working-directory: ./scripts/make-npm-packages
6684
run: npm ci
6785

86+
# NOTE: --experimental-strip-types allows Node to run TypeScript
87+
# directly. This flag became the default in Node v22.18+, but we need
88+
# it explicitly for our minimum supported version (v22.12.0).
6889
- name: Run packager script
69-
run: node ./scripts/make-npm-packages/src/index.ts --input-dir ./input/ --output-dir ./output/
90+
run: node --experimental-strip-types ./scripts/make-npm-packages/src/index.ts --input-dir ./input/ --output-dir ./output/
7091

7192
- uses: actions/upload-artifact@v5
7293
with:
73-
name: wasp-npm-packages
94+
name: ${{ vars.WASP_NPM_ARTIFACT_NAME }}
95+
include-hidden-files: true
7496
path: ./output/

.github/workflows/ci-npm-package-publish.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12+
- uses: actions/checkout@v6
13+
1214
- uses: actions/setup-node@v6
15+
with:
16+
node-version-file: .nvmrc
1317

1418
- uses: actions/download-artifact@v6
1519
with:
16-
name: wasp-npm-packages
20+
name: ${{ vars.WASP_NPM_ARTIFACT_NAME }}
1721
path: packages/
1822

1923
- name: Publish Wasp npm packages

0 commit comments

Comments
 (0)