Merge remote-tracking branch 'origin/main'

Author: harlan-zw

.github/workflows/ci.yml

@@ -15,13 +15,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: corepack enable
-      - uses: actions/setup-node@v4
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
         with:
-          node-version: 18
-          cache: pnpm
+          version: 9.15.2
+          run_install: false
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'pnpm'
       - run: pnpm install
-
       # https://github.com/vitejs/vite/blob/main/.github/workflows/ci.yml#L62
       # Install playwright's binary under custom directory to cache
       - name: Set Playwright path (non-windows)

package.json

@@ -49,8 +49,7 @@
     "lint:fix": "eslint . --fix",
     "test": "pnpm dev:prepare && vitest --run --exclude **/__runtime__ && pnpm test:runtime",
     "test:runtime": "cd test/fixtures/basic && vitest --run",
-    "test:types": "echo 'broken due to type regeneration, use pnpm typecheck' && npx nuxi typecheck",
-    "script:generate-tpc": "bun ./scripts/generateTpcScripts.ts && pnpm lint:fix"
+    "test:types": "echo 'broken due to type regeneration, use pnpm typecheck' && npx nuxi typecheck"
   },
   "build": {
     "externals": [

scripts/generateTpcScripts.ts

@@ -1,4 +1,3 @@
-// WARNING: This file is automatically generated, do not manually modify.
 import { withQuery } from 'ufo'
 import type { DataLayer, GTag } from 'third-party-capital'
 import { useRegistryScript } from '#nuxt-scripts/utils'
@@ -9,31 +8,49 @@ export const GoogleAnalyticsOptions = object({
   id: string(),
   l: optional(string()),
 })
+
 export type GoogleAnalyticsInput = RegistryScriptInput<typeof GoogleAnalyticsOptions>
 
-function use(options: GoogleAnalyticsInput) {
-  const gtag: GTag = function (...args: Parameters<GTag>) {
-    ((window as any)['gtag-' + (options.l ?? 'dataLayer')] as GTag)(...args)
-  } as GTag
-  return { dataLayer: (window as any)[options.l ?? 'dataLayer'] as DataLayer,
-    gtag }
+export interface GoogleAnalyticsApi {
+  gtag: GTag
+  dataLayer: DataLayer
 }
 
-export function useScriptGoogleAnalytics(_options?: GoogleAnalyticsInput) {
-  return useRegistryScript<ReturnType<typeof use>, typeof GoogleAnalyticsOptions>(_options?.key || 'googleAnalytics', options => ({
+export function useScriptGoogleAnalytics<T extends GoogleAnalyticsApi>(_options?: GoogleAnalyticsInput) {
+  return useRegistryScript<T, typeof GoogleAnalyticsOptions>(_options?.key || 'googleAnalytics', options => ({
     scriptInput: {
       src: withQuery('https://www.googletagmanager.com/gtag/js', { id: options?.id, l: options?.l }),
     },
     schema: import.meta.dev ? GoogleAnalyticsOptions : undefined,
     scriptOptions: {
-      use: () => use(options),
+      use: () => {
+        const gtag: GTag = function (...args: Parameters<GTag>) {
+          ((window as any)['gtag-' + (options.l ?? 'dataLayer')] as GTag)(...args)
+        } as GTag
+        return {
+          dataLayer: (window as any)[options.l ?? 'dataLayer'] as DataLayer,
+          gtag,
+        }
+      },
       stub: import.meta.client ? undefined : ({ fn }) => { return fn === 'dataLayer' ? [] : void 0 },
       performanceMarkFeature: 'nuxt-third-parties-ga',
-      ...({ tagPriority: 1 }),
+      tagPriority: 1,
     },
-    // eslint-disable-next-line
-        // @ts-ignore
-    // eslint-disable-next-line
-        clientInit: import.meta.server ? undefined : () => {window[(options?.l ?? "dataLayer")]=window[(options?.l ?? "dataLayer")]||[];window['gtag-'+(options?.l ?? "dataLayer")]=function (){window[(options?.l ?? "dataLayer")].push(arguments);};window['gtag-'+(options?.l ?? "dataLayer")]('js',new Date());window['gtag-'+(options?.l ?? "dataLayer")]('config',(options?.id ))},
+    clientInit: import.meta.server
+      ? undefined
+      : () => {
+          const dataLayerName = options?.l ?? 'dataLayer'
+          const dataLayer = (window as any)[dataLayerName] || [];
+
+          (window as any)[dataLayerName] = dataLayer
+          // eslint-disable-next-line
+          // @ts-ignore
+          window['gtag-' + (dataLayerName)] = function () {
+            // eslint-disable-next-line
+            (window as any)[dataLayerName].push(arguments)
+          }
+          ; ((window as any)['gtag-' + (dataLayerName)] as GTag)('js', new Date())
+          ; ((window as any)['gtag-' + (dataLayerName)] as GTag)('config', (options?.id))
+        },
   }), _options)
 }

scripts/tsconfig.json

@@ -1,4 +1,3 @@
-// WARNING: This file is automatically generated, do not manually modify.
 import { withQuery } from 'ufo'
 import type { GoogleTagManagerApi, DataLayer } from 'third-party-capital'
 import { useRegistryScript } from '#nuxt-scripts/utils'
@@ -12,27 +11,29 @@ export const GoogleTagManagerOptions = object({
   id: string(),
   l: optional(string()),
 })
-export type GoogleTagManagerInput = RegistryScriptInput<typeof GoogleTagManagerOptions>
 
-function use(options: GoogleTagManagerInput) {
-  return { dataLayer: (window as any)[options.l ?? 'dataLayer'] as DataLayer, google_tag_manager: window.google_tag_manager }
-}
+export type GoogleTagManagerInput = RegistryScriptInput<typeof GoogleTagManagerOptions>
 
-export function useScriptGoogleTagManager(_options?: GoogleTagManagerInput) {
-  return useRegistryScript<ReturnType<typeof use>, typeof GoogleTagManagerOptions>(_options?.key || 'googleTagManager', options => ({
+export function useScriptGoogleTagManager<T extends GoogleTagManagerApi>(_options?: GoogleTagManagerInput) {
+  return useRegistryScript<T, typeof GoogleTagManagerOptions>(_options?.key || 'googleTagManager', options => ({
     scriptInput: {
       src: withQuery('https://www.googletagmanager.com/gtm.js', { id: options?.id, l: options?.l }),
     },
     schema: import.meta.dev ? GoogleTagManagerOptions : undefined,
     scriptOptions: {
-      use: () => use(options),
+      use: () => {
+        return { dataLayer: (window as any)[options.l ?? 'dataLayer'] as DataLayer, google_tag_manager: window.google_tag_manager }
+      },
       stub: import.meta.client ? undefined : ({ fn }) => { return fn === 'dataLayer' ? [] : void 0 },
       performanceMarkFeature: 'nuxt-third-parties-gtm',
       ...({ tagPriority: 1 }),
     },
-    // eslint-disable-next-line
-        // @ts-ignore
-    // eslint-disable-next-line
-        clientInit: import.meta.server ? undefined : () => {window[(options?.l ?? "dataLayer")]=window[(options?.l ?? "dataLayer")]||[];window[(options?.l ?? "dataLayer")].push({'gtm.start':new Date().getTime(),event:'gtm.js'});},
+    clientInit: import.meta.server
+      ? undefined
+      : () => {
+          const dataLayerName = options?.l ?? 'dataLayer';
+          (window as any)[dataLayerName] = (window as any)[(options?.l ?? 'dataLayer')] || []
+          ;(window as any)[dataLayerName].push({ 'gtm.start': new Date().getTime(), 'event': 'gtm.js' })
+        },
   }), _options)
 }