From 0fa168f4389c9d49ad254be82972abe835c10653 Mon Sep 17 00:00:00 2001 From: James Dabbs Date: Fri, 8 Dec 2023 20:21:56 -0800 Subject: [PATCH] fix compile build failure which appears to have been introduced through random dependency drift, not any changes here :/ --- packages/compile/package.json | 7 +++--- packages/compile/src/main.test.ts | 20 +++++++---------- pnpm-lock.yaml | 36 +++++++++++++++++++++++++++++-- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/packages/compile/package.json b/packages/compile/package.json index 62c764ba..ab74f6d8 100644 --- a/packages/compile/package.json +++ b/packages/compile/package.json @@ -25,7 +25,7 @@ "scripts": { "build": "tsc", "dev": "nodemon", - "start": "ts-node --esm src/watch.ts", + "start": "tsx src/watch.ts", "test": "vitest run", "test:cov": "vitest run --coverage", "test:watch": "vitest" @@ -47,6 +47,7 @@ "@types/yaml-front-matter": "^4.1.0", "cors": "^2.8.5", "express": "^4.18.2", - "tsheredoc": "^1.0.1" + "tsheredoc": "^1.0.1", + "tsx": "^4.6.2" } -} \ No newline at end of file +} diff --git a/packages/compile/src/main.test.ts b/packages/compile/src/main.test.ts index 943967e1..b1a5bf82 100644 --- a/packages/compile/src/main.test.ts +++ b/packages/compile/src/main.test.ts @@ -8,19 +8,15 @@ const repo = join(__dirname, '..', 'test', 'repo') const out = join(repo, 'out.json') async function run(dir: string) { - const { stdout, stderr, error, status } = spawnSync( - 'pnpm', - ['exec', 'ts-node', '--esm', main], - { - env: { - GITHUB_REF: 'refs/heads/test', - GITHUB_SHA: 'c74d99cf46f6ed23e742f2617e9908294b4a608b', - GITHUB_WORKSPACE: join(repo, dir), - INPUT_OUT: out, - PATH: process.env.PATH, - }, + const { stdout, stderr, error, status } = spawnSync('tsx', [main], { + env: { + GITHUB_REF: 'refs/heads/test', + GITHUB_SHA: 'c74d99cf46f6ed23e742f2617e9908294b4a608b', + GITHUB_WORKSPACE: join(repo, dir), + INPUT_OUT: out, + PATH: process.env.PATH, }, - ) + }) if (error) { throw error diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3996532a..2a50245b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -83,6 +83,9 @@ importers: tsheredoc: specifier: ^1.0.1 version: 1.0.1 + tsx: + specifier: ^4.6.2 + version: 4.6.2 packages/core: dependencies: @@ -2833,6 +2836,14 @@ packages: requiresBuild: true optional: true + /fsevents@2.3.3: + resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + os: [darwin] + requiresBuild: true + dev: true + optional: true + /function-bind@1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} dev: true @@ -2890,6 +2901,12 @@ packages: engines: {node: '>=10'} dev: true + /get-tsconfig@4.7.2: + resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} + dependencies: + resolve-pkg-maps: 1.0.0 + dev: true + /getos@3.2.1: resolution: {integrity: sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==} dependencies: @@ -4972,6 +4989,10 @@ packages: engines: {node: '>=4'} dev: true + /resolve-pkg-maps@1.0.0: + resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + dev: true + /resolve@1.22.2: resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==} hasBin: true @@ -5045,7 +5066,7 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /run-parallel@1.2.0: @@ -5786,6 +5807,17 @@ packages: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: true + /tsx@4.6.2: + resolution: {integrity: sha512-QPpBdJo+ZDtqZgAnq86iY/PD2KYCUPSUGIunHdGwyII99GKH+f3z3FZ8XNFLSGQIA4I365ui8wnQpl8OKLqcsg==} + engines: {node: '>=18.0.0'} + hasBin: true + dependencies: + esbuild: 0.18.20 + get-tsconfig: 4.7.2 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /tuf-js@1.1.7: resolution: {integrity: sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -6172,7 +6204,7 @@ packages: postcss: 8.4.23 rollup: 3.21.5 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /vitefu@0.2.4(vite@4.3.5):