Skip to content

Commit

Permalink
chore: website sdk windows snapshot mismatch (#2994)
Browse files Browse the repository at this point in the history
Regression from #2784

2 things:

Raised the local node version for developing wing to the latest 18 (18.16.0) to make sure user versions support fetch
On windows the path for the Website construct is a windows path, so any matching needs to account for that.
  • Loading branch information
MarkMcCulloh authored Jun 20, 2023
1 parent e75d6c6 commit cb25f3e
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"updateContentCommand": "npm install",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "18.12.1"
"version": "18.16.0"
},
"ghcr.io/devcontainers/features/aws-cli:1": {},
"ghcr.io/devcontainers/features/terraform:1": {},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:

env:
RUST_VERSION: "1.67.1"
NODE_VERSION: "18.12.1"
NODE_VERSION: "18.16.0"
NPM_VERSION: "8.19.3"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wingsdk-mutation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ defaults:
working-directory: libs/wingsdk

env:
NODE_VERSION: "18.12.1"
NODE_VERSION: "18.16.0"
NPM_VERSION: "8.19.3"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12.1
18.16.0
2 changes: 1 addition & 1 deletion apps/jsii-docgen/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/vscode-wing/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/wing-api-checker/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/wing-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"vite-plugin-node-polyfills": "^0.8.1"
},
"volta": {
"node": "18.12.1",
"node": "18.16.0",
"npm": "8.19.3"
}
}
2 changes: 1 addition & 1 deletion apps/wing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"bump-pack": "file:../../tools/bump-pack"
},
"volta": {
"node": "18.12.1",
"node": "18.16.0",
"npm": "8.19.3"
}
}
2 changes: 1 addition & 1 deletion examples/tests/invalid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"jsii-code-samples": "1.7.0"
},
"volta": {
"node": "18.12.1",
"node": "18.16.0",
"npm": "8.19.3"
}
}
2 changes: 1 addition & 1 deletion examples/tests/sdk_tests/website/website.w
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let otherFile = Util.readFile("./website/website/inner-folder/other.html");
w.addJson("config.json", config);

// asserting the website path exists and points to the right folder
assert(w.path.endsWith("sdk_tests/website/website"));
assert(w.path.endsWith("sdk_tests/website/website") || w.path.endsWith("sdk_tests\\website\\website"));


test "access files on the website" {
Expand Down
2 changes: 1 addition & 1 deletion examples/tests/valid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"uuid": "^9.0.0"
},
"volta": {
"node": "18.12.1",
"node": "18.16.0",
"npm": "8.19.3"
}
}
2 changes: 1 addition & 1 deletion libs/tree-sitter-wing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"playground:watch": "npx -y nodemon --watch grammar.js --watch src/scanner.c --exec \"npm run playground:quiet\""
},
"volta": {
"node": "18.12.1",
"node": "18.16.0",
"npm": "8.19.3"
}
}
2 changes: 1 addition & 1 deletion libs/wingcompiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"wasi-js"
],
"volta": {
"node": "18.12.1",
"node": "18.16.0",
"npm": "8.19.3"
}
}
2 changes: 1 addition & 1 deletion libs/wingsdk/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"postinstall": "run-p -l --max-parallel 3 'install:*'"
},
"volta": {
"node": "18.12.1",
"node": "18.16.0",
"npm": "8.19.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ class $Root extends $stdlib.std.Resource {
const indexFile = (Util.readFile("./website/website/index.html"));
const otherFile = (Util.readFile("./website/website/inner-folder/other.html"));
(w.addJson("config.json",config));
{((cond) => {if (!cond) throw new Error(`assertion failed: 'w.path.endsWith("sdk_tests/website/website")'`)})(w.path.endsWith("sdk_tests/website/website"))};
{((cond) => {if (!cond) throw new Error(`assertion failed: '(w.path.endsWith("sdk_tests/website/website") || w.path.endsWith("sdk_tests\\website\\website"))'`)})((w.path.endsWith("sdk_tests/website/website") || w.path.endsWith("sdk_tests\\website\\website")))};
this.node.root.new("@winglang/sdk.std.Test",std.Test,this,"test:access files on the website",new $Closure1(this,"$Closure1"));
}
}
Expand Down

0 comments on commit cb25f3e

Please sign in to comment.