fix: sourcemap warnings

nuxt-modules · Jul 5, 2023 · 06e6d19 · 06e6d19
1 parent ed975fb
commit 06e6d19
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/src/bundler.ts b/src/bundler.ts
@@ -55,8 +55,6 @@ export async function extendBundler(
   }
 
   const dynamicOptions: ResourceDynamicPluginOptions = {
-    ssr: nuxt.options.ssr,
-    dev: nuxt.options.dev,
     sourcemap: nuxt.options.sourcemap.server || nuxt.options.sourcemap.client
   }
 

diff --git a/src/transform/dynamic.ts b/src/transform/dynamic.ts
@@ -6,10 +6,7 @@ import MagicString from 'magic-string'
 import { VIRTUAL_PREFIX_HEX } from './utils'
 import { NUXT_I18N_COMPOSABLE_DEFINE_LOCALE, NUXT_I18N_COMPOSABLE_DEFINE_CONFIG } from '../constants'
 
-// TODO: remove
 export interface ResourceDynamicPluginOptions {
-  ssr: boolean
-  dev?: boolean
   sourcemap?: boolean
 }
 
@@ -18,8 +15,6 @@ const debug = createDebug('@nuxtjs/i18n:transform:dynamic')
 export const ResourceDynamicPlugin = createUnplugin((options: ResourceDynamicPluginOptions) => {
   debug('options', options)
 
-  // const relativeToSrcDir = (path: string) => relative(options.srcDir, path)
-
   return {
     name: 'nuxtjs:i18n-resource-dynamic',
     enforce: 'post',
@@ -33,26 +28,22 @@ export const ResourceDynamicPlugin = createUnplugin((options: ResourceDynamicPlu
 
       const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href))
       const query = parseQuery(search)
-      return /\.([c|m]?[j|t]s)$/.test(pathname) && !!query.hash && (!!query.locale || !!query.config)
+      return /\.([c|m]?[j|t]s)$/.test(pathname) && (!!query.locale || !!query.config)
     },
 
     transform(code, id) {
       debug('transform', id)
 
       const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href))
       const query = parseQuery(search)
-      const hash = query.hash as string
 
       const s = new MagicString(code)
 
       function result() {
         if (s.hasChanged()) {
           return {
             code: s.toString(),
-            map:
-              options.sourcemap && !/\.([c|m]?ts)$/.test(pathname)
-                ? s.generateMap({ source: id, includeContent: true })
-                : undefined
+            map: options.sourcemap && !/\.([c|m]?ts)$/.test(pathname) ? s.generateMap({ hires: true }) : null
           }
         }
       }

diff --git a/src/transform/macros.ts b/src/transform/macros.ts
@@ -51,7 +51,7 @@ export const TransformMacroPlugin = createUnplugin((options: TransformMacroPlugi
           debug('transformed: code -> ', s.toString())
           return {
             code: s.toString(),
-            map: options.sourcemap ? s.generateMap({ source: id, includeContent: true }) : undefined
+            map: options.sourcemap ? s.generateMap({ hires: true }) : undefined
           }
         }
       }

diff --git a/src/transform/proxy.ts b/src/transform/proxy.ts
@@ -68,15 +68,15 @@ export const ResourceProxyPlugin = createUnplugin((options: ResourceProxyPluginO
           // prettier-ignore
           const code = `export default async function(locale) {
   __DEBUG__ && console.log('loadResource', locale)
-  const loader = await import(${toCode(withQuery(resolve(baseDir, query.target), { hash: query.hash, locale: query.locale }))}).then(m => m.default || m)
+  const loader = await import(${toCode(withQuery(resolve(baseDir, query.target), { locale: query.locale }))}).then(m => m.default || m)
   const message = await loader(locale)
   __DEBUG__ && console.log('loaded on loadResource', message)
   return message
 }`
           const s = new MagicString(code)
           return {
             code: s.toString(),
-            map: options.sourcemap ? s.generateMap({ source: id, includeContent: true }) : undefined
+            map: options.sourcemap ? s.generateMap({ hires: true }) : undefined
           }
         }
       } else if (pathname === NUXT_I18N_CONFIG_PROXY_ID) {
@@ -86,7 +86,7 @@ export const ResourceProxyPlugin = createUnplugin((options: ResourceProxyPluginO
           // prettier-ignore
           const code = `import { isObject, isFunction } from '@intlify/shared'
 export default async function() {
-  const loader = await import(${toCode(withQuery(resolve(baseDir, query.target), { hash: query.hash, config: 'true' }))}).then(m => m.default || m)
+  const loader = await import(${toCode(withQuery(resolve(baseDir, query.target), { config: 'true' }))}).then(m => m.default || m)
   const config = isFunction(loader)
     ? await loader()
     : isObject(loader)
@@ -98,7 +98,7 @@ export default async function() {
           const s = new MagicString(code)
           return {
             code: s.toString(),
-            map: options.sourcemap ? s.generateMap({ source: id, includeContent: true }) : undefined
+            map: options.sourcemap ? s.generateMap({ hires: true }) : undefined
           }
         }
       }
@@ -125,7 +125,7 @@ export default async function() {
 
       return {
         code: s.toString(),
-        map: options.sourcemap ? s.generateMap({ source: id, includeContent: true }) : undefined
+        map: options.sourcemap ? s.generateMap({ hires: true }) : undefined
       }
     }
   }