From 6418affe645f5175002aef7ac8ff798276191fdf Mon Sep 17 00:00:00 2001 From: zonemeen Date: Thu, 30 Jun 2022 17:59:52 +0800 Subject: [PATCH] fix: wrong import of shared.ts file --- src/client/app/composables/head.ts | 2 +- src/client/app/data.ts | 2 +- src/client/app/router.ts | 4 ++-- src/client/app/theme.ts | 2 +- src/client/app/utils.ts | 2 +- src/node/build/render.ts | 2 +- src/node/config.ts | 4 ++-- src/node/markdown/markdown.ts | 2 +- src/node/markdown/plugins/image.ts | 2 +- src/node/markdown/plugins/link.ts | 2 +- src/node/markdownToVue.ts | 2 +- src/node/plugin.ts | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/client/app/composables/head.ts b/src/client/app/composables/head.ts index 91a46d21..0aa3957c 100644 --- a/src/client/app/composables/head.ts +++ b/src/client/app/composables/head.ts @@ -1,5 +1,5 @@ import { watchEffect, Ref } from 'vue' -import { HeadConfig, SiteData, createTitle } from '../../shared' +import { HeadConfig, SiteData, createTitle } from '../../../shared/shared' import { Route } from '../router' export function useUpdateHead(route: Route, siteDataByRouteRef: Ref) { diff --git a/src/client/app/data.ts b/src/client/app/data.ts index cea5a8a8..a1e9056c 100644 --- a/src/client/app/data.ts +++ b/src/client/app/data.ts @@ -6,7 +6,7 @@ import { SiteData, resolveSiteDataByRoute, createTitle -} from '../shared' +} from '../../shared/shared' import { withBase } from './utils' export const dataSymbol: InjectionKey = Symbol() diff --git a/src/client/app/router.ts b/src/client/app/router.ts index 39418559..bf2b586a 100644 --- a/src/client/app/router.ts +++ b/src/client/app/router.ts @@ -1,7 +1,7 @@ import { reactive, inject, markRaw, nextTick, readonly } from 'vue' import type { Component, InjectionKey } from 'vue' -import { notFoundPageData } from '../shared' -import type { PageData, PageDataPayload } from '../shared' +import { notFoundPageData } from '../../shared/shared' +import type { PageData, PageDataPayload } from '../../shared/shared' import { inBrowser, withBase } from './utils' import { siteDataRef } from './data' diff --git a/src/client/app/theme.ts b/src/client/app/theme.ts index bb25f0ab..e03ae7b2 100644 --- a/src/client/app/theme.ts +++ b/src/client/app/theme.ts @@ -1,6 +1,6 @@ import { App, Ref, Component } from 'vue' import { Router } from './router' -import { SiteData } from '../shared' +import { SiteData } from '../../shared/shared' export interface EnhanceAppContext { app: App diff --git a/src/client/app/utils.ts b/src/client/app/utils.ts index 4879f7ab..83216033 100644 --- a/src/client/app/utils.ts +++ b/src/client/app/utils.ts @@ -1,5 +1,5 @@ import { siteDataRef } from './data' -import { inBrowser, EXTERNAL_URL_RE } from '../shared' +import { inBrowser, EXTERNAL_URL_RE } from '../../shared/shared' export { inBrowser } diff --git a/src/node/build/render.ts b/src/node/build/render.ts index c4330e3e..0b775e6f 100644 --- a/src/node/build/render.ts +++ b/src/node/build/render.ts @@ -5,7 +5,7 @@ import { pathToFileURL } from 'url' import escape from 'escape-html' import { normalizePath, transformWithEsbuild } from 'vite' import { RollupOutput, OutputChunk, OutputAsset } from 'rollup' -import { HeadConfig, PageData, createTitle, notFoundPageData } from '../shared' +import { HeadConfig, PageData, createTitle, notFoundPageData } from '../../shared/shared' import { slash } from '../utils/slash' import { SiteConfig, resolveSiteDataByRoute } from '../config' diff --git a/src/node/config.ts b/src/node/config.ts index fca1df47..a6ba99cf 100644 --- a/src/node/config.ts +++ b/src/node/config.ts @@ -17,12 +17,12 @@ import { DefaultTheme, APPEARANCE_KEY, createLangDictionary -} from './shared' +} from '../shared/shared' import { resolveAliases, DEFAULT_THEME_PATH } from './alias' import { MarkdownOptions } from './markdown/markdown' import _debug from 'debug' -export { resolveSiteDataByRoute } from './shared' +export { resolveSiteDataByRoute } from '../shared/shared' const debug = _debug('vitepress:config') diff --git a/src/node/markdown/markdown.ts b/src/node/markdown/markdown.ts index 77276c62..ce1dc55f 100644 --- a/src/node/markdown/markdown.ts +++ b/src/node/markdown/markdown.ts @@ -13,7 +13,7 @@ import { preWrapperPlugin } from './plugins/preWrapper' import { linkPlugin } from './plugins/link' import { headingPlugin } from './plugins/headings' import { imagePlugin } from './plugins/image' -import { Header } from '../shared' +import { Header } from '../../shared/shared' import anchor from 'markdown-it-anchor' import attrs from 'markdown-it-attrs' import emoji from 'markdown-it-emoji' diff --git a/src/node/markdown/plugins/image.ts b/src/node/markdown/plugins/image.ts index 59dadcc1..e7ac2d57 100644 --- a/src/node/markdown/plugins/image.ts +++ b/src/node/markdown/plugins/image.ts @@ -1,7 +1,7 @@ // markdown-it plugin for normalizing image source import MarkdownIt from 'markdown-it' -import { EXTERNAL_URL_RE } from '../../shared' +import { EXTERNAL_URL_RE } from '../../../shared/shared' export const imagePlugin = (md: MarkdownIt) => { md.renderer.rules.image = (tokens, idx, options, env, self) => { diff --git a/src/node/markdown/plugins/link.ts b/src/node/markdown/plugins/link.ts index e88e425c..c780d81a 100644 --- a/src/node/markdown/plugins/link.ts +++ b/src/node/markdown/plugins/link.ts @@ -5,7 +5,7 @@ import MarkdownIt from 'markdown-it' import { MarkdownRenderer } from '../markdown' import { URL } from 'url' -import { EXTERNAL_URL_RE } from '../../shared' +import { EXTERNAL_URL_RE } from '../../../shared/shared' const indexRE = /(^|.*\/)index.md(#?.*)$/i diff --git a/src/node/markdownToVue.ts b/src/node/markdownToVue.ts index 049bd8d8..bc7e58b0 100644 --- a/src/node/markdownToVue.ts +++ b/src/node/markdownToVue.ts @@ -3,7 +3,7 @@ import path from 'path' import c from 'picocolors' import matter from 'gray-matter' import LRUCache from 'lru-cache' -import { PageData, HeadConfig, EXTERNAL_URL_RE } from './shared' +import { PageData, HeadConfig, EXTERNAL_URL_RE } from '../shared/shared' import { slash } from './utils/slash' import { deeplyParseHeader } from './utils/parseHeader' import { getGitTimestamp } from './utils/getGitTimestamp' diff --git a/src/node/plugin.ts b/src/node/plugin.ts index a5fb7cce..fca7fc7e 100644 --- a/src/node/plugin.ts +++ b/src/node/plugin.ts @@ -6,7 +6,7 @@ import { DIST_CLIENT_PATH, APP_PATH, SITE_DATA_REQUEST_PATH } from './alias' import { slash } from './utils/slash' import { OutputAsset, OutputChunk } from 'rollup' import { staticDataPlugin } from './staticDataPlugin' -import { PageDataPayload } from './shared' +import { PageDataPayload } from '../shared/shared' const hashRE = /\.(\w+)\.js$/ const staticInjectMarkerRE =