diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json deleted file mode 100644 index 62406593a8..0000000000 --- a/packages/cli/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "experimentalDecorators": true - }, - "files": [], - "include": [], - "exclude": ["**/*"] -} diff --git a/packages/core/build.ts b/packages/core/build.ts index 15354cd6d9..f064202a07 100644 --- a/packages/core/build.ts +++ b/packages/core/build.ts @@ -91,7 +91,7 @@ await mergePackageJson(); async function buildVite() { const newViteRolldownConfig = viteRolldownConfig.map((config) => { - config.tsconfig = join(projectDir, 'tsconfig.json'); + config.tsconfig = join(projectDir, '..', '..', 'tsconfig.json'); config.cwd = projectDir; if (Array.isArray(config.external)) { diff --git a/packages/core/package.json b/packages/core/package.json index d6df374112..cdcd7a44cc 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -100,7 +100,7 @@ "./types/internal/*": null }, "scripts": { - "build": "oxnode -C dev ./build.ts" + "build": "cross-env OXC_TSCONFIG_PATH=../../tsconfig.json oxnode -C dev ./build.ts" }, "dependencies": { "@oxc-project/runtime": "catalog:", @@ -116,6 +116,7 @@ "@oxc-node/cli": "catalog:", "@oxc-node/core": "catalog:", "@vitejs/devtools": "^0.1.15", + "cross-env": "catalog:", "es-module-lexer": "^1.7.0", "hookable": "^6.0.1", "magic-string": "^0.30.21", diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json deleted file mode 100644 index 62406593a8..0000000000 --- a/packages/core/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "experimentalDecorators": true - }, - "files": [], - "include": [], - "exclude": ["**/*"] -} diff --git a/packages/test/package.json b/packages/test/package.json index bfd1f53909..f6e1d03dd4 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -272,7 +272,7 @@ } }, "scripts": { - "build": "oxnode -C dev ./build.ts" + "build": "cross-env OXC_TSCONFIG_PATH=../../tsconfig.json oxnode -C dev ./build.ts" }, "dependencies": { "@standard-schema/spec": "^1.1.0", @@ -306,6 +306,7 @@ "@vitest/utils": "4.1.5", "chai": "^6.2.1", "convert-source-map": "^2.0.0", + "cross-env": "catalog:", "estree-walker": "^3.0.3", "expect-type": "^1.2.2", "magic-string": "^0.30.21", diff --git a/packages/test/tsconfig.json b/packages/test/tsconfig.json deleted file mode 100644 index 62406593a8..0000000000 --- a/packages/test/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "experimentalDecorators": true - }, - "files": [], - "include": [], - "exclude": ["**/*"] -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0d97ae07f5..b78880e670 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -111,6 +111,9 @@ catalogs: consola: specifier: ^3.4.2 version: 3.4.2 + cross-env: + specifier: ^10.1.0 + version: 10.1.0 cross-spawn: specifier: ^7.0.5 version: 7.0.6 @@ -507,6 +510,9 @@ importers: '@vitejs/devtools': specifier: ^0.1.15 version: 0.1.15(@pnpm/logger@1001.0.1)(typescript@6.0.2)(vite@packages+core) + cross-env: + specifier: 'catalog:' + version: 10.1.0 es-module-lexer: specifier: ^1.7.0 version: 1.7.0 @@ -705,6 +711,9 @@ importers: convert-source-map: specifier: ^2.0.0 version: 2.0.0 + cross-env: + specifier: 'catalog:' + version: 10.1.0 estree-walker: specifier: ^3.0.3 version: 3.0.3 @@ -2163,6 +2172,9 @@ packages: '@emnapi/wasi-threads@1.2.1': resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} + '@epic-web/invariant@1.0.0': + resolution: {integrity: sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==} + '@esbuild/aix-ppc64@0.27.4': resolution: {integrity: sha512-cQPwL2mp2nSmHHJlCyoXgHGhbEPMrEEU5xhkcy3Hs/O7nGZqEpZ2sUtLaL9MORLtDfRvVl2/3PAuEkYZH0Ty8Q==} engines: {node: '>=18'} @@ -6238,6 +6250,11 @@ packages: resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==} engines: {node: '>= 14'} + cross-env@10.1.0: + resolution: {integrity: sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==} + engines: {node: '>=20'} + hasBin: true + cross-spawn@7.0.6: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} @@ -10428,6 +10445,8 @@ snapshots: dependencies: tslib: 2.8.1 + '@epic-web/invariant@1.0.0': {} + '@esbuild/aix-ppc64@0.27.4': optional: true @@ -13942,6 +13961,11 @@ snapshots: crc-32: 1.2.2 readable-stream: 4.7.0 + cross-env@10.1.0: + dependencies: + '@epic-web/invariant': 1.0.0 + cross-spawn: 7.0.6 + cross-spawn@7.0.6: dependencies: path-key: 3.1.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1e20b53d20..63a313fa94 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -56,6 +56,7 @@ catalog: change-case: ^5.4.4 connect: ^3.7.0 consola: ^3.4.2 + cross-env: ^10.1.0 cross-spawn: ^7.0.5 debug: ^4.4.3 dedent: ^1.5.3 diff --git a/tsconfig.json b/tsconfig.json index 7be7b1a51b..bd0060afe7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,7 +13,8 @@ "strict": true, "target": "esnext", "types": ["node"], - "verbatimModuleSyntax": true + "verbatimModuleSyntax": true, + "experimentalDecorators": true }, "exclude": [ "ecosystem-ci",