Skip to content

Commit 2679f27

Browse files
committed
chore(ci): fix
1 parent 2f1c09d commit 2679f27

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
"build": {
8282
"entries": [
8383
"src/runtime/merger.mjs"
84+
],
85+
"externals": [
86+
"runtime/merger.mjs"
8487
]
8588
},
8689
"stackblitz": {

src/context.ts

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const unsafeInlineConfig = (inlineConfig: ModuleOptions['config']) => {
4242
}
4343

4444
if (inlineConfig.content) {
45-
const invalidProperty = ['extract', 'transform'].find((i) => i in inlineConfig.content! && typeof inlineConfig.content![i as keyof ModuleOptions['config']['content']] === 'function' )
45+
const invalidProperty = ['extract', 'transform'].find(i => i in inlineConfig.content! && typeof inlineConfig.content![i as keyof ModuleOptions['config']['content']] === 'function')
4646

4747
if (invalidProperty) {
4848
return `content.${invalidProperty}`
@@ -51,7 +51,7 @@ const unsafeInlineConfig = (inlineConfig: ModuleOptions['config']) => {
5151

5252
if (inlineConfig.safelist) {
5353
// @ts-expect-error `s` is never
54-
const invalidIdx = inlineConfig.safelist.findIndex((s) => typeof s === 'object' && s.pattern instanceof RegExp)
54+
const invalidIdx = inlineConfig.safelist.findIndex(s => typeof s === 'object' && s.pattern instanceof RegExp)
5555

5656
if (invalidIdx > -1) {
5757
return `safelist[${invalidIdx}]`
@@ -158,32 +158,34 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
158158
return tailwindConfig
159159
}
160160

161-
const generateConfig = () => enableHMR ? addTemplate({
162-
filename: CONFIG_TEMPLATE_NAME,
163-
write: true,
164-
getContents: () => {
165-
const serializeConfig = <T extends Partial<TWConfig>>(config: T) =>
166-
JSON.stringify(
167-
Array.isArray(config.plugins) && config.plugins.length > 0 ? configMerger({ plugins: (defaultPlugins: TWConfig['plugins']) => defaultPlugins?.filter(p => p && typeof p !== 'function') }, config) : config,
168-
(_, v) => typeof v === 'function' ? `() => (${JSON.stringify(v())})` : v
169-
).replace(/"(\(\) => \(.*\))"/g, (_, substr) => substr.replace(/\\"/g, '"'))
170-
171-
const layerConfigs = configPaths.map((configPath) => {
172-
const configImport = `require(${JSON.stringify(/[/\\]node_modules[/\\]/.test(configPath) ? configPath : './' + relative(nuxt.options.buildDir, configPath))})`
173-
return configUpdatedHook[configPath] ? configUpdatedHook[configPath].startsWith('return {};') ? '' : `(() => {const cfg=configMerger(undefined, ${configImport});${configUpdatedHook[configPath]};return cfg;})()` : configImport
174-
}).filter(Boolean)
175-
176-
return [
161+
const generateConfig = () => enableHMR
162+
? addTemplate({
163+
filename: CONFIG_TEMPLATE_NAME,
164+
write: true,
165+
getContents: () => {
166+
const serializeConfig = <T extends Partial<TWConfig>>(config: T) =>
167+
JSON.stringify(
168+
Array.isArray(config.plugins) && config.plugins.length > 0 ? configMerger({ plugins: (defaultPlugins: TWConfig['plugins']) => defaultPlugins?.filter(p => p && typeof p !== 'function') }, config) : config,
169+
(_, v) => typeof v === 'function' ? `() => (${JSON.stringify(v())})` : v,
170+
).replace(/"(\(\) => \(.*\))"/g, (_, substr) => substr.replace(/\\"/g, '"'))
171+
172+
const layerConfigs = configPaths.map((configPath) => {
173+
const configImport = `require(${JSON.stringify(/[/\\]node_modules[/\\]/.test(configPath) ? configPath : './' + relative(nuxt.options.buildDir, configPath))})`
174+
return configUpdatedHook[configPath] ? configUpdatedHook[configPath].startsWith('return {};') ? '' : `(() => {const cfg=configMerger(undefined, ${configImport});${configUpdatedHook[configPath]};return cfg;})()` : configImport
175+
}).filter(Boolean)
176+
177+
return [
177178
`// generated by the @nuxtjs/tailwindcss <https://github.com/nuxt-modules/tailwindcss> module at ${(new Date()).toLocaleString()}`,
178179
`const configMerger = require(${JSON.stringify(createResolver(import.meta.url).resolve('./runtime/merger.mjs'))});`,
179180
`\nconst inlineConfig = ${serializeConfig(moduleOptions.config as Partial<TWConfig>)};\n`,
180181
'const config = [',
181182
layerConfigs.join(',\n'),
182183
`].reduce((prev, curr) => configMerger(curr, prev), configMerger(inlineConfig, { content: ${JSON.stringify(contentPaths)} }));\n`,
183184
`module.exports = ${configUpdatedHook['main-config'] ? `(() => {const cfg=config;${configUpdatedHook['main-config']};return cfg;})()` : 'config'}\n`,
184-
].join('\n')
185-
},
186-
}) : { dst: '' }
185+
].join('\n')
186+
},
187+
})
188+
: { dst: '' }
187189

188190
const registerHooks = () => {
189191
if (!enableHMR) return

0 commit comments

Comments
 (0)