Skip to content

Commit

Permalink
fix: broken tailwind tokens
Browse files Browse the repository at this point in the history
duplicate vue runtime loaded into the page
  • Loading branch information
Akryum committed Aug 13, 2022
1 parent a9171d4 commit 626176a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
12 changes: 3 additions & 9 deletions packages/histoire/src/node/builtin-plugins/tailwind-tokens.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import { createRequire } from 'module'
import { BasePluginApi, Plugin } from '../plugin.js'
import { getInjectedImport } from '../util/deps.js'
import { findUp } from '../util/find-up.js'

const require = createRequire(import.meta.url)

function resolveImport (request) {
return JSON.stringify(require.resolve(request))
}

export interface TailwindTokensOptions {
configFile?: string
}
Expand Down Expand Up @@ -90,15 +84,15 @@ export function tailwindTokens (options: TailwindTokensOptions = {}): Plugin {

const storyTemplate = (tailwindConfig: any) => `import 'histoire-style'
import './style.css'
import { createApp, h, markRaw, ref } from ${resolveImport('@histoire/vendors/vue')}
import { createApp, h, markRaw, ref } from ${getInjectedImport('@histoire/vendors/vue')}
import {
HstColorShades,
HstTokenList,
HstTokenGrid,
HstText,
HstTextarea,
HstNumber,
} from ${resolveImport('@histoire/controls')}
} from ${getInjectedImport('@histoire/controls')}
const config = markRaw(${JSON.stringify(tailwindConfig, null, 2)})
const search = ref('')
Expand Down
12 changes: 12 additions & 0 deletions packages/histoire/src/node/util/deps.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { dirname, join } from 'pathe'
import { fileURLToPath } from 'url'
import { createRequire } from 'module'

const __dirname = dirname(fileURLToPath(import.meta.url))
const require = createRequire(import.meta.url)

const isInHistoireMonorepo = __dirname.includes(join('packages', 'histoire', 'dist'))

export function getInjectedImport (request: string) {
return JSON.stringify(isInHistoireMonorepo ? require.resolve(request) : request)
}
3 changes: 2 additions & 1 deletion packages/histoire/src/node/vite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { makeTree } from './tree.js'
import { parseColor } from './colors.js'
import { createMarkdownPlugins } from './markdown.js'
import { getSearchDataJS, generateDocSearchData, generateTitleSearchData } from './search.js'
import { getInjectedImport } from './util/deps.js'

const require = createRequire(import.meta.url)

Expand Down Expand Up @@ -308,7 +309,7 @@ if (import.meta.hot) {

if (id === RESOLVED_MARKDOWN_FILES) {
const filesJs = ctx.markdownFiles.map(f => `${JSON.stringify(f.relativePath)}: () => import(${JSON.stringify(`./${f.relativePath}`)})`).join(',')
return `import { reactive } from ${JSON.stringify(require.resolve('@histoire/vendors/vue'))}
return `import { reactive } from ${getInjectedImport('@histoire/vendors/vue')}
export const markdownFiles = reactive({${filesJs}})
if (import.meta.hot) {
window.__hst_md_hmr = (newModule) => {
Expand Down

0 comments on commit 626176a

Please sign in to comment.