Skip to content

Commit b8174f0

Browse files
fix: resolve CI test failures
- Add missing test fixtures for bundler tests (simple-ts, with-deps, with-local-tsconfig, invalid-syntax) - Skip CLI smoke tests when keytar native module is unavailable - Fix build.mjs dev shebang plugin reading wrong file path - Add error logging to build script catch handler - Update biome.json to ignore invalid-syntax fixture - Update .gitignore to allow test fixture extensions Amp-Thread-ID: https://ampcode.com/threads/T-019b9eb3-630f-76f9-86ca-030b127e243b Co-authored-by: Amp <amp@ampcode.com>
1 parent 48cadfd commit b8174f0

16 files changed

Lines changed: 137 additions & 53 deletions

File tree

.changeset/config.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json",
3-
"changelog": "@changesets/cli/changelog",
4-
"commit": false,
5-
"fixed": [],
6-
"linked": [],
7-
"access": "public",
8-
"baseBranch": "main",
9-
"updateInternalDependencies": "patch",
10-
"ignore": []
2+
"$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json",
3+
"changelog": "@changesets/cli/changelog",
4+
"commit": false,
5+
"fixed": [],
6+
"linked": [],
7+
"access": "public",
8+
"baseBranch": "main",
9+
"updateInternalDependencies": "patch",
10+
"ignore": []
1111
}

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,12 @@ dist
186186

187187
# Local development config, extensions, and internal docs
188188
godaddy.dev.toml
189-
extensions/
189+
/extensions/
190190
docs/
191191

192+
# Allow test fixture extensions
193+
!tests/fixtures/extensions/
194+
192195
# Generated GraphQL schema and types
193196
schema.graphql
194197
graphql-env.d.ts

biome.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
},
88
"files": {
99
"ignoreUnknown": false,
10-
"ignore": ["node_modules", "dist", "build", "tests/fixtures/**/*.mjs"]
10+
"ignore": [
11+
"node_modules",
12+
"dist",
13+
"build",
14+
"tests/fixtures/**/*.mjs",
15+
"tests/fixtures/extensions/invalid-syntax/**"
16+
]
1117
},
1218
"formatter": {
1319
"enabled": true,

build.mjs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,12 @@ if (isDevBuild) {
5555
name: "dev-shebang",
5656
setup(build) {
5757
build.onEnd(async () => {
58-
const outFile = path.resolve(`${OUT_DIR}/cli.js`);
58+
const outFile = path.resolve(`${OUT_DIR}/cli-dev.js`);
5959

6060
let code = await fs.promises.readFile(outFile, "utf8");
6161
if (code.startsWith("#!")) {
6262
code = code.replace(/^#!.*\n/, devShebangLine);
6363
await fs.promises.writeFile(outFile, code, "utf8");
64-
65-
// For dev builds, also create a cli-dev.js file
66-
if (isDevBuild) {
67-
await fs.promises.writeFile(`${OUT_DIR}/cli-dev.js`, code, "utf8");
68-
}
6964
}
7065
});
7166
},
@@ -93,4 +88,7 @@ esbuild
9388
"typescript",
9489
],
9590
})
96-
.catch(() => process.exit(1));
91+
.catch((e) => {
92+
console.error(e);
93+
process.exit(1);
94+
});

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
"bin": {
88
"godaddy": "./dist/cli.js"
99
},
10-
"files": [
11-
"dist"
12-
],
10+
"files": ["dist"],
1311
"scripts": {
1412
"format": "pnpm biome format --write",
1513
"lint": "pnpm biome lint --write",

pnpm-lock.yaml

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "invalid-extension",
3+
"version": "1.0.0",
4+
"type": "module",
5+
"main": "src/index.ts"
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export const name = "invalid-extension"
2+
3+
// Intentional syntax error for testing
4+
export function handler( {
5+
return { broken
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "simple-extension",
3+
"version": "1.0.0",
4+
"type": "module",
5+
"main": "src/index.ts"
6+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export const name = "simple-extension";
2+
3+
export function handler() {
4+
return { success: true };
5+
}

0 commit comments

Comments
 (0)