browser-extension-manager 1.3.13 → 1.3.14

package/CLAUDE.md

@@ -209,8 +209,33 @@ When adding a new component type to the framework:
 - **distribute** ([gulp/tasks/distribute.js](src/gulp/tasks/distribute.js)) - Copies project files to `dist/`
 - **sass** ([gulp/tasks/sass.js](src/gulp/tasks/sass.js)) - Compiles SCSS with sophisticated load path system
 - **webpack** ([gulp/tasks/webpack.js](src/gulp/tasks/webpack.js)) - Bundles JavaScript with Babel
-- **html** ([gulp/tasks/html.js](src/gulp/tasks/html.js)) - Processes HTML views into templates
+- **html** ([gulp/tasks/html.js](src/gulp/tasks/html.js)) - Processes HTML views into templates (see HTML Templating below)
 - **package** ([gulp/tasks/package.js](src/gulp/tasks/package.js)) - Creates packaged extension
+
+### HTML Templating
+
+HTML views in `src/views/` are processed through a two-step templating system using `{{ }}` brackets.
+
+**Available variables:**
+- `{{ brand.name }}` - Brand name from config
+- `{{ brand.url }}` - Brand URL from config
+- `{{ page.name }}` - Component name (e.g., `popup`, `pages/index`)
+- `{{ page.path }}` - Full view path
+- `{{ page.title }}` - Page title (defaults to brand name)
+- `{{ theme.appearance }}` - Theme appearance (`dark` or `light`)
+- `{{ cacheBust }}` - Cache-busting timestamp
+
+**Example usage in views:**
+```html
+<a href="{{ brand.url }}/pricing">Upgrade to Premium</a>
+<p>Welcome to {{ brand.name }}</p>
+```
+
+**How it works:**
+1. Your view file (`src/views/[component]/index.html`) is templated first
+2. The result is injected into [page-template.html](src/config/page-template.html)
+3. The outer template is processed with the same variables
+
 - **serve** ([gulp/tasks/serve.js](src/gulp/tasks/serve.js)) - WebSocket server for live reload
 
 ### Modifying Themes

package/dist/gulp/tasks/html.js

@@ -105,6 +105,15 @@ function processHtml(templateContent) {
       };
 
       // Apply template with custom brackets
+      // First, template the body content to replace any {{ }} placeholders in the view
+      const templatedBody = template(bodyContent, data, {
+        brackets: ['{{', '}}'],
+      });
+
+      // Update data with templated body
+      data.content = templatedBody;
+
+      // Then template the outer page template
       const rendered = template(templateContent, data, {
         brackets: ['{{', '}}'],
       });

package/dist/gulp/tasks/publish.js

@@ -314,59 +314,77 @@ async function publishToEdge() {
     throw new Error('Missing Edge credentials. Set EDGE_PRODUCT_ID, EDGE_CLIENT_ID, EDGE_API_KEY in .env');
   }
 
-  // Check current submission status first
-  logger.log('[edge] Checking submission status...');
-  const statusUrl = `https://api.addons.microsoftedge.microsoft.com/v1/products/${productId}/submissions`;
-  const statusResponse = await fetch(statusUrl, {
-    method: 'GET',
+  // Helper for Edge API requests
+  const edgeHeaders = {
+    'Authorization': `ApiKey ${apiKey}`,
+    'X-ClientID': clientId,
+  };
+
+  // Step 1: Try to submit first to check if there's a pending submission
+  // This is faster than uploading first, since upload always succeeds
+  logger.log('[edge] Checking for pending submissions...');
+
+  const publishUrl = `https://api.addons.microsoftedge.microsoft.com/v1/products/${productId}/submissions`;
+  const checkResponse = await fetch(publishUrl, {
+    method: 'POST',
     headers: {
-      'Authorization': `ApiKey ${apiKey}`,
-      'X-ClientID': clientId,
+      ...edgeHeaders,
+      'Content-Type': 'application/json',
     },
+    body: JSON.stringify({
+      notes: `Check for pending submission`,
+    }),
   });
 
-  if (statusResponse.ok) {
-    const statusData = await statusResponse.json();
-    // Check if there's a pending submission (InReview, PendingPublish, etc.)
-    const pendingStatuses = ['InReview', 'PendingPublish', 'Submitted', 'InProgress'];
-    if (statusData && pendingStatuses.includes(statusData.status)) {
-      throw new Error(`Extension already has a pending submission (status: ${statusData.status}). Wait for it to complete.`);
+  const checkData = await checkResponse.json().catch(() => null);
+
+  // Log the response for debugging
+  logger.log(`[edge] Submission check response: ${JSON.stringify(checkData)}`);
+
+  // Check if there's a pending submission blocking us
+  if (checkData && checkData.status === 'Failed') {
+    if (checkData.errorCode === 'InProgressSubmission') {
+      throw new Error('Extension already has a pending submission in review. Wait for it to complete before publishing again.');
+    }
+    if (checkData.errorCode === 'UnpublishInProgress') {
+      throw new Error('Extension is being unpublished. Wait for unpublish to complete before publishing.');
+    }
+    // If it failed for another reason (like no draft package), that's expected - continue to upload
+    if (checkData.errorCode !== 'NoDraftPackage' && checkData.errorCode !== 'NoPackageToPublish') {
+      logger.log(`[edge] Check failed with: ${checkData.errorCode} - ${checkData.message}`);
     }
   }
 
+  // Step 2: Upload the package
   logger.log('[edge] Uploading to Microsoft Edge Add-ons...');
 
-  // Read chromium zip file (Edge uses same build as Chrome)
   const zipBuffer = jetpack.read(PATHS.chromium.zip, 'buffer');
-
-  // Edge API v1.1 endpoint
   const uploadUrl = `https://api.addons.microsoftedge.microsoft.com/v1/products/${productId}/submissions/draft/package`;
 
-  // Upload using fetch
-  const response = await fetch(uploadUrl, {
+  const uploadResponse = await fetch(uploadUrl, {
     method: 'POST',
     headers: {
-      'Authorization': `ApiKey ${apiKey}`,
-      'X-ClientID': clientId,
+      ...edgeHeaders,
       'Content-Type': 'application/zip',
     },
     body: zipBuffer,
   });
 
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`Edge API error: ${response.status} - ${errorText}`);
+  if (!uploadResponse.ok) {
+    const errorText = await uploadResponse.text();
+    throw new Error(`Edge upload error: ${uploadResponse.status} - ${errorText}`);
   }
 
+  const uploadData = await uploadResponse.json().catch(() => null);
+  logger.log(`[edge] Upload response: ${JSON.stringify(uploadData)}`);
+
   logger.log('[edge] Package uploaded, submitting for review...');
 
-  // Submit for review
-  const publishUrl = `https://api.addons.microsoftedge.microsoft.com/v1/products/${productId}/submissions`;
+  // Step 3: Submit for review
   const publishResponse = await fetch(publishUrl, {
     method: 'POST',
     headers: {
-      'Authorization': `ApiKey ${apiKey}`,
-      'X-ClientID': clientId,
+      ...edgeHeaders,
       'Content-Type': 'application/json',
     },
     body: JSON.stringify({
@@ -374,9 +392,25 @@ async function publishToEdge() {
     }),
   });
 
+  const publishData = await publishResponse.json().catch(() => null);
+
+  // Log the full response
+  logger.log(`[edge] Publish response: ${JSON.stringify(publishData)}`);
+
+  // Check for HTTP errors
   if (!publishResponse.ok) {
-    const errorText = await publishResponse.text();
-    throw new Error(`Edge publish error: ${publishResponse.status} - ${errorText}`);
+    throw new Error(`Edge publish error: ${publishResponse.status} - ${JSON.stringify(publishData)}`);
+  }
+
+  // Check for API-level failures (HTTP 200 but status: "Failed")
+  if (publishData && publishData.status === 'Failed') {
+    if (publishData.errorCode === 'InProgressSubmission') {
+      throw new Error('Extension already has a pending submission in review. Wait for it to complete before publishing again.');
+    }
+    if (publishData.errorCode === 'UnpublishInProgress') {
+      throw new Error('Extension is being unpublished. Wait for unpublish to complete before publishing.');
+    }
+    throw new Error(`Edge publish failed: ${publishData.message || publishData.errorCode || 'Unknown error'}`);
   }
 
   logger.log('[edge] Upload complete');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-extension-manager",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "description": "Browser Extension Manager dependency manager",
   "main": "dist/index.js",
   "exports": {