From caf8329151828e36fc187a5a622d8c4d57e85257 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 3 Aug 2023 14:25:26 +0100 Subject: [PATCH] test: remove separate test for baseurl (#22467) --- .github/workflows/ci.yml | 2 -- packages/schema/src/config/experimental.ts | 2 +- test/fixtures/basic-types/nuxt.config.ts | 8 -------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac87ccc4c7..d1e19fb347 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,6 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] module: ['bundler', 'node'] - base: ['with-base-url', 'without-base-url'] steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 @@ -135,7 +134,6 @@ jobs: run: pnpm test:types env: MODULE_RESOLUTION: ${{ matrix.module }} - TS_BASE_URL: ${{ matrix.base }} lint: # autofix workflow will be triggered instead for PRs diff --git a/packages/schema/src/config/experimental.ts b/packages/schema/src/config/experimental.ts index 3eb28b2973..990163481f 100644 --- a/packages/schema/src/config/experimental.ts +++ b/packages/schema/src/config/experimental.ts @@ -19,7 +19,7 @@ export default defineUntypedSchema({ */ reactivityTransform: false, - // TODO: Remove in v3.6 when nitro has support for mocking traced dependencies + // TODO: Remove in v3.8 when nitro has support for mocking traced dependencies // https://github.com/unjs/nitro/issues/1118 /** * Externalize `vue`, `@vue/*` and `vue-router` when building. diff --git a/test/fixtures/basic-types/nuxt.config.ts b/test/fixtures/basic-types/nuxt.config.ts index f9ec4ab7ec..972097ab41 100644 --- a/test/fixtures/basic-types/nuxt.config.ts +++ b/test/fixtures/basic-types/nuxt.config.ts @@ -28,14 +28,6 @@ export default defineNuxtConfig({ } }, modules: [ - function (_, nuxt) { - // TODO: remove in v3.7 - if (process.env.TS_BASE_URL === 'without-base-url') { - nuxt.hook('prepare:types', ({ tsConfig }) => { - delete tsConfig.compilerOptions!.baseUrl - }) - } - }, function () { addTypeTemplate({ filename: 'test.d.ts',