From 934dfd777b94fc661af78889864a0e9135a04001 Mon Sep 17 00:00:00 2001 From: Maksim Nedoshev Date: Thu, 20 Apr 2023 18:08:12 +0300 Subject: [PATCH] Fix/windows docs serve (#3311) * fix(build): stub tsconfig before runing build:analysis * fix(build): use path in docs build plugins * fix(build): update when-dependencies-installed * chore: update when-dependencies-installed to 1.0.1 --- packages/docs/modules/markdown/index.ts | 2 +- .../docs/modules/page-config/blocks/file/transform.ts | 2 +- .../docs/modules/page-config/compiler/create-importer.ts | 2 +- .../docs/modules/page-config/composables/useCompiler.ts | 2 +- .../page-config/i18n/tests/export-translations.test.ts | 2 +- packages/sandbox/package.json | 8 +++++--- yarn.lock | 9 +++++---- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/docs/modules/markdown/index.ts b/packages/docs/modules/markdown/index.ts index e3955e8417..ba5b3db2a5 100644 --- a/packages/docs/modules/markdown/index.ts +++ b/packages/docs/modules/markdown/index.ts @@ -1,5 +1,5 @@ import { defineNuxtModule, addImports } from '@nuxt/kit'; -import { resolve } from 'path' +import { resolve } from 'pathe' export default defineNuxtModule({ meta: { diff --git a/packages/docs/modules/page-config/blocks/file/transform.ts b/packages/docs/modules/page-config/blocks/file/transform.ts index 0bad0bf79b..317bc3e5c1 100644 --- a/packages/docs/modules/page-config/blocks/file/transform.ts +++ b/packages/docs/modules/page-config/blocks/file/transform.ts @@ -1,5 +1,5 @@ import { defineBlockTransform } from "../../compiler/define-block-transform"; -import { extname } from 'path' +import { extname } from 'pathe' import { readFile } from 'fs/promises' export default defineBlockTransform(async function (block) { diff --git a/packages/docs/modules/page-config/compiler/create-importer.ts b/packages/docs/modules/page-config/compiler/create-importer.ts index b2cc51c761..be74fd3652 100644 --- a/packages/docs/modules/page-config/compiler/create-importer.ts +++ b/packages/docs/modules/page-config/compiler/create-importer.ts @@ -1,4 +1,4 @@ -import { resolve, dirname, parse } from 'path' +import { resolve, dirname, parse } from 'pathe' import { type TransformPluginContext } from 'rollup' import { resolveAlias } from '@nuxt/kit'; import { readdirSync, existsSync } from 'fs' diff --git a/packages/docs/modules/page-config/composables/useCompiler.ts b/packages/docs/modules/page-config/composables/useCompiler.ts index b7d7d33cab..41d9abacf0 100644 --- a/packages/docs/modules/page-config/composables/useCompiler.ts +++ b/packages/docs/modules/page-config/composables/useCompiler.ts @@ -2,7 +2,7 @@ import MagicString from 'magic-string'; import { addVitePlugin } from '@nuxt/kit'; import { createFilter } from '@rollup/pluginutils' import { createImporter } from '../compiler/create-importer' -import { resolve } from 'path' +import { resolve } from 'pathe' import { transform } from '../compiler/transform' import { exportTranslations } from '../i18n/export-translations' diff --git a/packages/docs/modules/page-config/i18n/tests/export-translations.test.ts b/packages/docs/modules/page-config/i18n/tests/export-translations.test.ts index 98da164c92..d59ddbaba5 100644 --- a/packages/docs/modules/page-config/i18n/tests/export-translations.test.ts +++ b/packages/docs/modules/page-config/i18n/tests/export-translations.test.ts @@ -1,6 +1,6 @@ import { exportTranslations } from '../export-translations'; import { describe, test, expect } from 'vitest' -import { resolve } from 'path' +import { resolve } from 'pathe' import { createImporter } from '../../compiler/create-importer'; describe('export-translations', () => { diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json index 471241fa90..01b78b46d4 100644 --- a/packages/sandbox/package.json +++ b/packages/sandbox/package.json @@ -5,7 +5,7 @@ "scripts": { "build": "rm -rf ./dist && yarn build:vite && yarn build:vue-cli && yarn build:nuxt", "build:vite": "vue-tsc --noEmit && vite build --config ./configs/vite/vite.base.ts", - "build:analysis": "tsx ./scripts/bundle-analysis.ts", + "build:analysis": "node ./scripts/stud-nuxt.mjs && tsx ./scripts/bundle-analysis.ts", "build:vue-cli": "vue-cli-service build", "build:nuxt": "nuxt build", "build:web-components": "vue-tsc --noEmit && vite build --config ./web-components/vite.config.ts", @@ -47,9 +47,11 @@ "vue-tsc": "^0.38.2", "webpack": "5", "webpack-cli": "^4.9.2", - "when-dependencies-installed": "^1.0.0" + "when-dependencies-installed": "^1.0.1" }, "workspaces": { - "nohoist": ["vite"] + "nohoist": [ + "vite" + ] } } diff --git a/yarn.lock b/yarn.lock index 8c8a55504b..e0ee9f0c7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19375,12 +19375,13 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0: tr46 "^2.1.0" webidl-conversions "^6.1.0" -when-dependencies-installed@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/when-dependencies-installed/-/when-dependencies-installed-1.0.0.tgz#816dcaa1d7e1b7501e5f22a07f3f72155da6ebfe" - integrity sha512-8M3sDdOfKYy5FGUp8g8TrjUM+3mEZFLthWunT/orvgSwduDLFZ+usXsde+q1DFXGMdeWDF8RKrIZ+B/rviH39w== +when-dependencies-installed@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/when-dependencies-installed/-/when-dependencies-installed-1.0.1.tgz#56e0bab4b866c9c52987020abcc3dfed8c33541d" + integrity sha512-swvwG6T9iOLXUJ588fB+OljSvPoQwOjEP468ZYvfMIl60URTJ0ikUg0GA1C1jwYvwtwLpfzVmTeDgIHfC1BULQ== dependencies: fast-glob "^3.2.12" + pathe "^1.1.0" which-boxed-primitive@^1.0.2: version "1.0.2"