chore(ci): fix

nuxt-modules · Jun 27, 2024 · 2679f27 · 2679f27
1 parent 2f1c09d
commit 2679f27
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -81,6 +81,9 @@
   "build": {
     "entries": [
       "src/runtime/merger.mjs"
+    ],
+    "externals": [
+      "runtime/merger.mjs"
     ]
   },
   "stackblitz": {

diff --git a/src/context.ts b/src/context.ts
@@ -42,7 +42,7 @@ const unsafeInlineConfig = (inlineConfig: ModuleOptions['config']) => {
   }
 
   if (inlineConfig.content) {
-    const invalidProperty = ['extract', 'transform'].find((i) => i in inlineConfig.content! && typeof inlineConfig.content![i as keyof ModuleOptions['config']['content']] === 'function' )
+    const invalidProperty = ['extract', 'transform'].find(i => i in inlineConfig.content! && typeof inlineConfig.content![i as keyof ModuleOptions['config']['content']] === 'function')
 
     if (invalidProperty) {
       return `content.${invalidProperty}`
@@ -51,7 +51,7 @@ const unsafeInlineConfig = (inlineConfig: ModuleOptions['config']) => {
 
   if (inlineConfig.safelist) {
     // @ts-expect-error `s` is never
-    const invalidIdx = inlineConfig.safelist.findIndex((s) => typeof s === 'object' && s.pattern instanceof RegExp)
+    const invalidIdx = inlineConfig.safelist.findIndex(s => typeof s === 'object' && s.pattern instanceof RegExp)
 
     if (invalidIdx > -1) {
       return `safelist[${invalidIdx}]`
@@ -158,32 +158,34 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
     return tailwindConfig
   }
 
-  const generateConfig = () => enableHMR ? addTemplate({
-    filename: CONFIG_TEMPLATE_NAME,
-    write: true,
-    getContents: () => {
-      const serializeConfig = <T extends Partial<TWConfig>>(config: T) =>
-        JSON.stringify(
-          Array.isArray(config.plugins) && config.plugins.length > 0 ? configMerger({ plugins: (defaultPlugins: TWConfig['plugins']) => defaultPlugins?.filter(p => p && typeof p !== 'function') }, config) : config,
-          (_, v) => typeof v === 'function' ? `() => (${JSON.stringify(v())})` : v
-        ).replace(/"(\(\) => \(.*\))"/g, (_, substr) => substr.replace(/\\"/g, '"'))
-
-      const layerConfigs = configPaths.map((configPath) => {
-        const configImport = `require(${JSON.stringify(/[/\\]node_modules[/\\]/.test(configPath) ? configPath : './' + relative(nuxt.options.buildDir, configPath))})`
-        return configUpdatedHook[configPath] ? configUpdatedHook[configPath].startsWith('return {};') ? '' : `(() => {const cfg=configMerger(undefined, ${configImport});${configUpdatedHook[configPath]};return cfg;})()` : configImport
-      }).filter(Boolean)
-
-      return [
+  const generateConfig = () => enableHMR
+    ? addTemplate({
+      filename: CONFIG_TEMPLATE_NAME,
+      write: true,
+      getContents: () => {
+        const serializeConfig = <T extends Partial<TWConfig>>(config: T) =>
+          JSON.stringify(
+            Array.isArray(config.plugins) && config.plugins.length > 0 ? configMerger({ plugins: (defaultPlugins: TWConfig['plugins']) => defaultPlugins?.filter(p => p && typeof p !== 'function') }, config) : config,
+            (_, v) => typeof v === 'function' ? `() => (${JSON.stringify(v())})` : v,
+          ).replace(/"(\(\) => \(.*\))"/g, (_, substr) => substr.replace(/\\"/g, '"'))
+
+        const layerConfigs = configPaths.map((configPath) => {
+          const configImport = `require(${JSON.stringify(/[/\\]node_modules[/\\]/.test(configPath) ? configPath : './' + relative(nuxt.options.buildDir, configPath))})`
+          return configUpdatedHook[configPath] ? configUpdatedHook[configPath].startsWith('return {};') ? '' : `(() => {const cfg=configMerger(undefined, ${configImport});${configUpdatedHook[configPath]};return cfg;})()` : configImport
+        }).filter(Boolean)
+
+        return [
         `// generated by the @nuxtjs/tailwindcss <https://github.com/nuxt-modules/tailwindcss> module at ${(new Date()).toLocaleString()}`,
         `const configMerger = require(${JSON.stringify(createResolver(import.meta.url).resolve('./runtime/merger.mjs'))});`,
         `\nconst inlineConfig = ${serializeConfig(moduleOptions.config as Partial<TWConfig>)};\n`,
         'const config = [',
         layerConfigs.join(',\n'),
         `].reduce((prev, curr) => configMerger(curr, prev), configMerger(inlineConfig, { content: ${JSON.stringify(contentPaths)} }));\n`,
         `module.exports = ${configUpdatedHook['main-config'] ? `(() => {const cfg=config;${configUpdatedHook['main-config']};return cfg;})()` : 'config'}\n`,
-      ].join('\n')
-    },
-  }) : { dst: '' }
+        ].join('\n')
+      },
+    })
+    : { dst: '' }
 
   const registerHooks = () => {
     if (!enableHMR) return