@next/third-parties 16.0.2 → 16.0.4

package/dist/google/gtm.js

@@ -12,11 +12,22 @@ const react_1 = require("react");
 const script_1 = __importDefault(require("next/script"));
 let currDataLayerName = 'dataLayer';
 function GoogleTagManager(props) {
-    const { gtmId, gtmScriptUrl = 'https://www.googletagmanager.com/gtm.js', dataLayerName = 'dataLayer', auth, preview, dataLayer, nonce, } = props;
+    const { gtmId, gtmScriptUrl, dataLayerName = 'dataLayer', auth, preview, dataLayer, nonce, } = props;
     currDataLayerName = dataLayerName;
-    const gtmLayer = dataLayerName !== 'dataLayer' ? `&l=${dataLayerName}` : '';
-    const gtmAuth = auth ? `&gtm_auth=${auth}` : '';
-    const gtmPreview = preview ? `&gtm_preview=${preview}&gtm_cookies_win=x` : '';
+    const scriptUrl = new URL(gtmScriptUrl || 'https://www.googletagmanager.com/gtm.js');
+    if (gtmId) {
+        scriptUrl.searchParams.set('id', gtmId);
+    }
+    if (dataLayerName !== 'dataLayer') {
+        scriptUrl.searchParams.set('l', dataLayerName);
+    }
+    if (auth) {
+        scriptUrl.searchParams.set('gtm_auth', auth);
+    }
+    if (preview) {
+        scriptUrl.searchParams.set('gtm_preview', preview);
+        scriptUrl.searchParams.set('gtm_cookies_win', 'x');
+    }
     (0, react_1.useEffect)(() => {
         // performance.mark is being used as a feature use signal. While it is traditionally used for performance
         // benchmarking it is low overhead and thus considered safe to use in production and it is a widely available
@@ -35,7 +46,7 @@ function GoogleTagManager(props) {
         w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});
         ${dataLayer ? `w[l].push(${JSON.stringify(dataLayer)})` : ''}
       })(window,'${dataLayerName}');`,
-                }, nonce: nonce }), (0, jsx_runtime_1.jsx)(script_1.default, { id: "_next-gtm", "data-ntpc": "GTM", src: `${gtmScriptUrl}?id=${gtmId}${gtmLayer}${gtmAuth}${gtmPreview}`, nonce: nonce })] }));
+                }, nonce: nonce }), (0, jsx_runtime_1.jsx)(script_1.default, { id: "_next-gtm", "data-ntpc": "GTM", src: scriptUrl.href, nonce: nonce })] }));
 }
 const sendGTMEvent = (data, dataLayerName) => {
     // special case if we are sending events before GTM init and we have custom dataLayerName

package/dist/types/google.d.ts

@@ -7,9 +7,7 @@ declare global {
 type JSONValue = string | number | boolean | JSONValue[] | {
     [key: string]: JSONValue;
 };
-export type GTMParams = {
-    gtmId: string;
-    gtmScriptUrl?: string;
+type GTMParamsBaseParams = {
     dataLayer?: {
         [key: string]: JSONValue;
     };
@@ -18,6 +16,15 @@ export type GTMParams = {
     preview?: string;
     nonce?: string;
 };
+type GTMParamsWithId = GTMParamsBaseParams & {
+    gtmId: string;
+    gtmScriptUrl?: string;
+};
+type GTMParamsWithScriptUrl = GTMParamsBaseParams & {
+    gtmId?: string;
+    gtmScriptUrl: string;
+};
+export type GTMParams = GTMParamsWithId | GTMParamsWithScriptUrl;
 export type GAParams = {
     gaId: string;
     dataLayerName?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "16.0.2",
+  "version": "16.0.4",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -26,7 +26,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "16.0.2",
+    "next": "16.0.4",
     "outdent": "0.8.0",
     "prettier": "2.5.1",
     "typescript": "5.9.2"