@mayson-org/inject-script 1.0.30 → 1.0.32

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EAEf,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,GAC1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,+BAA+B,GAChC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,WAAW,EACX,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,8BAA8B,EAC9B,sBAAsB,EACtB,wBAAwB,EACxB,yBAAyB,EACzB,eAAe,EACf,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,sCAAsC,EACtC,8BAA8B,EAC9B,mBAAmB,EACnB,eAAe,EACf,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,aAAa,EACb,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EACf,cAAc,EACd,YAAY,EACZ,qBAAqB,EACrB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AAKzB,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,mFAAmF;IACnF,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AA4EF;;;GAGG;AACH,wBAAsB,aAAa,CACjC,WAAW,GAAE,MAAsB,EACnC,cAAc,GAAE,aAAa,EAAE,GAAG,oBAAoC,EACtE,SAAS,GAAE,OAAe,GACzB,OAAO,CAAC,cAAc,CAAC,CAsHzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EAEf,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,GAC1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,+BAA+B,GAChC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,WAAW,EACX,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,8BAA8B,EAC9B,sBAAsB,EACtB,wBAAwB,EACxB,yBAAyB,EACzB,eAAe,EACf,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,sCAAsC,EACtC,8BAA8B,EAC9B,mBAAmB,EACnB,eAAe,EACf,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,aAAa,EACb,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EACf,cAAc,EACd,YAAY,EACZ,qBAAqB,EACrB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AAKzB,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,mFAAmF;IACnF,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AA2EF;;;GAGG;AACH,wBAAsB,aAAa,CACjC,WAAW,GAAE,MAAsB,EACnC,cAAc,GAAE,aAAa,EAAE,GAAG,oBAAoC,EACtE,SAAS,GAAE,OAAe,GACzB,OAAO,CAAC,cAAc,CAAC,CAmHzB"}

package/dist/index.js

@@ -36,7 +36,7 @@ function normalizeArgs(typesOrOptions, dryRunArg) {
         pwaEnabled: typesOrOptions.pwa !== false,
     };
 }
-function filterTypesForConfig(types, showRemixPill, pwaEnabled) {
+function filterTypesForConfig(types, pwaEnabled) {
     const messages = [];
     let selected = types.includes('all') ? [...ALL_TYPES] : [...types];
     if (!pwaEnabled) {
@@ -45,14 +45,16 @@ function filterTypesForConfig(types, showRemixPill, pwaEnabled) {
         }
         selected = selected.filter((t) => t !== 'pwa');
     }
-    if (selected.includes('watermark') && !showRemixPill) {
-        messages.push('watermark disabled — show_remix_pill is false (removing pill if present)');
-        return {
-            types: selected.filter((t) => t !== 'watermark'),
-            messages,
-            removeWatermark: true,
-        };
-    }
+    // if (selected.includes('watermark')) {
+    //   messages.push(
+    //     'watermark disabled — show_remix_pill is false (removing pill if present)',
+    //   );
+    //   return {
+    //     types: selected.filter((t) => t !== 'watermark'),
+    //     messages,
+    //     removeWatermark: true,
+    //   };
+    // }
     return { types: selected, messages, removeWatermark: false };
 }
 function stripWatermark(layoutPath, dryRun, messages) {
@@ -82,7 +84,7 @@ export async function runAutoInject(projectRoot = process.cwd(), typesOrOptions
     }
     const config = await resolveMaysonConfig();
     console.log(`[mayson] resolved show_remix_pill=${config.showRemixPill} enable_remix=${config.enableRemix}`);
-    const { types: effectiveTypes, messages, removeWatermark } = filterTypesForConfig(types, config.showRemixPill, pwaEnabled);
+    const { types: effectiveTypes, messages, removeWatermark } = filterTypesForConfig(types, pwaEnabled);
     if (removeWatermark) {
         stripWatermark(layoutPath, dryRun, messages);
     }
@@ -112,8 +114,6 @@ export async function runAutoInject(projectRoot = process.cwd(), typesOrOptions
         metadata: {
             apiRoutePath: `/api/${apiSubpath}`,
             appBaseUrl: config.appBaseUrl,
-            workspaceId: config.workspaceId,
-            collectionId: config.collectionId,
         },
     };
     const isTypeScript = layoutPath.endsWith('.tsx') || layoutPath.endsWith('.ts');

package/dist/plugins/metadata/__tests__/api-handler.test.js

@@ -54,12 +54,10 @@ describe('Metadata API Route & Cookie Caching', () => {
         assert.ok(!subpath1.startsWith('mayson-'));
         assert.notEqual(subpath1, subpath2);
     });
-    it('patches next.config with rewrites for /~muxt-app.js and /~api/analytics including workspace_id and collection_id', () => {
+    it('patches next.config with rewrites for /~muxt-app.js and /~api/analytics', () => {
         const res = patchNextConfig({
             projectRoot: process.cwd(),
             appBaseUrl: 'https://mayson.dev',
-            workspaceId: 'work_123',
-            collectionId: 'coll_456',
             dryRun: true,
         });
         assert.ok(res.messages.length > 0);

package/dist/plugins/metadata/inject-api-route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inject-api-route.d.ts","sourceRoot":"","sources":["../../../src/plugins/metadata/inject-api-route.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAIrF;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAOjD;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ3E;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAKR;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,oBAAoB,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,mBAAmB,CAqErB"}
+{"version":3,"file":"inject-api-route.d.ts","sourceRoot":"","sources":["../../../src/plugins/metadata/inject-api-route.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAIrF;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAOjD;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ3E;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAKR;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,oBAAoB,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,mBAAmB,CA4DrB"}

package/dist/plugins/metadata/inject-api-route.js

@@ -40,17 +40,10 @@ export function injectMetadataApiRoute(context) {
     const injectedComponents = [];
     const skippedComponents = [];
     const appBaseUrl = context.context?.metadata?.appBaseUrl || context.context?.watermark?.appBaseUrl;
-    const workspaceId = context.context?.metadata?.workspaceId || process.env.MAYSON_WORKSPACE_ID;
-    const collectionId = context.context?.metadata?.collectionId ||
-        context.context?.watermark?.collectionId ||
-        process.env.MAYSON_COLLECTION_ID ||
-        process.env.NEXT_PUBLIC_MAYSON_COLLECTION_ID;
     // Patch next.config rewrites for /~muxt-app.js and /~api/analytics
     const nextConfigResult = patchNextConfig({
         projectRoot,
         appBaseUrl,
-        workspaceId,
-        collectionId,
         dryRun,
     });
     messages.push(...nextConfigResult.messages);

package/dist/plugins/metadata/patch-next-config.d.ts

@@ -1,8 +1,6 @@
 export declare function patchNextConfig(options: {
     projectRoot: string;
     appBaseUrl?: string;
-    workspaceId?: string;
-    collectionId?: string;
     dryRun?: boolean;
 }): {
     changed: boolean;

package/dist/plugins/metadata/patch-next-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"patch-next-config.d.ts","sourceRoot":"","sources":["../../../src/plugins/metadata/patch-next-config.ts"],"names":[],"mappings":"AAOA,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAgH3C"}
+{"version":3,"file":"patch-next-config.d.ts","sourceRoot":"","sources":["../../../src/plugins/metadata/patch-next-config.ts"],"names":[],"mappings":"AASA,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CA0F3C"}

package/dist/plugins/metadata/patch-next-config.js

@@ -5,22 +5,8 @@ function readEnv(key) {
 }
 export function patchNextConfig(options) {
     const { projectRoot, dryRun = false } = options;
-    const rawBase = (options.appBaseUrl || readEnv('MAYSON_APP_BASE_URL') || 'https://mayson.dev').replace(/\/$/, '');
+    const rawBase = (options.appBaseUrl || 'https://mayson.dev').replace(/\/$/, '');
     const messages = [];
-    const workspaceId = (options.workspaceId ||
-        readEnv('MAYSON_WORKSPACE_ID')).trim();
-    const collectionId = (options.collectionId ||
-        readEnv('MAYSON_COLLECTION_ID') ||
-        readEnv('NEXT_PUBLIC_MAYSON_COLLECTION_ID')).trim();
-    const queryParts = [];
-    if (workspaceId) {
-        queryParts.push(`workspace_id=${encodeURIComponent(workspaceId)}`);
-    }
-    if (collectionId) {
-        queryParts.push(`collection_id=${encodeURIComponent(collectionId)}`);
-    }
-    const queryString = queryParts.length > 0 ? `?${queryParts.join('&')}` : '';
-    const analyticsDestination = `${rawBase}/api/analytics${queryString}`;
     const rewritesSnippet = `
   async rewrites() {
     return [
@@ -30,7 +16,7 @@ export function patchNextConfig(options) {
       },
       {
         source: '/~api/analytics',
-        destination: '${analyticsDestination}',
+        destination: '${rawBase}/api/analytics?workspace_id=${readEnv('MAYSON_WORKSPACE_ID')}&collection_id=${readEnv('MAYSON_COLLECTION_ID')}',
       },
     ];
   },`;
@@ -68,7 +54,7 @@ module.exports = nextConfig;
       },
       {
         source: '/~api/analytics',
-        destination: '${analyticsDestination}',
+        destination: '${rawBase}/api/analytics',
       },`;
         updated = updated.replace(/return\s*\[/, `return [${rewriteItems}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mayson-org/inject-script",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "CLI and library to inject Mayson watermark, ascii, and PWA into Next.js App Router layouts.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",