From 1c522e16a4bbe047d6bd70a577498ec33a3ef368 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:13:19 -0700
Subject: [PATCH 1/8] Fix image addon build

Fixes #4761
Fixes #4802
---
 addons/addon-image/webpack.config.js | 8 ++++++++
 bin/publish.js                       | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/addon-image/webpack.config.js b/addons/addon-image/webpack.config.js
index bcd52db2..b4283b66 100644
--- a/addons/addon-image/webpack.config.js
+++ b/addons/addon-image/webpack.config.js
@@ -21,6 +21,14 @@ const addon = {
       }
     ]
   },
+  resolve: {
+    modules: ['./node_modules'],
+    extensions: [ '.js' ],
+    alias: {
+      common: path.resolve('../../out/common'),
+      browser: path.resolve('../../out/browser')
+    }
+  },
   output: {
     filename: mainFile,
     path: path.resolve('./lib'),
diff --git a/bin/publish.js b/bin/publish.js
index 7253dffb..d6eab003 100644
--- a/bin/publish.js
+++ b/bin/publish.js
@@ -30,7 +30,7 @@ const addonPackageDirs = [
   path.resolve(__dirname, '../addons/addon-attach'),
   path.resolve(__dirname, '../addons/addon-canvas'),
   path.resolve(__dirname, '../addons/addon-fit'),
-  // path.resolve(__dirname, '../addons/addon-image'),
+  path.resolve(__dirname, '../addons/addon-image'),
   path.resolve(__dirname, '../addons/addon-ligatures'),
   path.resolve(__dirname, '../addons/addon-search'),
   path.resolve(__dirname, '../addons/addon-serialize'),

From 2744549c0fe1253970ae8b22173909620ba89517 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:35:25 -0700
Subject: [PATCH 2/8] Return [] if versionsJson is falsy

---
 bin/publish.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/publish.js b/bin/publish.js
index d6eab003..75edd635 100644
--- a/bin/publish.js
+++ b/bin/publish.js
@@ -128,6 +128,9 @@ function getPublishedVersions(packageJson, version, tag) {
     throw new Error('Could not get published versions\n' + err);
   }
   const versionsJson = asArray(JSON.parse(versionsProcess.stdout));
+  if (!versionsJson) {
+    return [];
+  }
   if (tag) {
     return versionsJson.filter(v => !v.search(new RegExp(`${version}-${tag}.[0-9]+`)));
   }

From c8b2783b85b8ecc7c817eea85211af05684f29d4 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:01:20 -0700
Subject: [PATCH 3/8] Tweak parsing versions

---
 bin/publish.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/publish.js b/bin/publish.js
index 75edd635..e4e840e9 100644
--- a/bin/publish.js
+++ b/bin/publish.js
@@ -127,10 +127,11 @@ function getPublishedVersions(packageJson, version, tag) {
     }
     throw new Error('Could not get published versions\n' + err);
   }
-  const versionsJson = asArray(JSON.parse(versionsProcess.stdout));
-  if (!versionsJson) {
+  const output = JSON.parse(versionsProcess.stdout);
+  if (!output || Array.isArray(output) && output.length === 0) {
     return [];
   }
+  const versionsJson = asArray(output);
   if (tag) {
     return versionsJson.filter(v => !v.search(new RegExp(`${version}-${tag}.[0-9]+`)));
   }

From 88b0b4a5c757b8f507bf4fcc7b35f1be6e2bba21 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:07:59 -0700
Subject: [PATCH 4/8] Log publish script

---
 bin/publish.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/publish.js b/bin/publish.js
index e4e840e9..f88b1b36 100644
--- a/bin/publish.js
+++ b/bin/publish.js
@@ -131,7 +131,9 @@ function getPublishedVersions(packageJson, version, tag) {
   if (!output || Array.isArray(output) && output.length === 0) {
     return [];
   }
+  console.log('output', output);
   const versionsJson = asArray(output);
+  console.log('versionsJson', versionsJson);
   if (tag) {
     return versionsJson.filter(v => !v.search(new RegExp(`${version}-${tag}.[0-9]+`)));
   }

From 31925596f105b74482e1d8514805daf513a7aa62 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:15:28 -0700
Subject: [PATCH 5/8] Log publish script

---
 bin/publish.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/publish.js b/bin/publish.js
index f88b1b36..836c81af 100644
--- a/bin/publish.js
+++ b/bin/publish.js
@@ -128,6 +128,12 @@ function getPublishedVersions(packageJson, version, tag) {
     throw new Error('Could not get published versions\n' + err);
   }
   const output = JSON.parse(versionsProcess.stdout);
+  if (typeof output === 'object') {
+    if (output.error?.code === 'E404')  {
+      return [];
+    }
+    throw new Error('Could not get published versions\n' + output);
+  }
   if (!output || Array.isArray(output) && output.length === 0) {
     return [];
   }

From 92eb78230b54adfb15a0bab1a3052368990f5520 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:47:39 -0700
Subject: [PATCH 6/8] Verify it's not an array

---
 bin/publish.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/publish.js b/bin/publish.js
index 836c81af..2ac60280 100644
--- a/bin/publish.js
+++ b/bin/publish.js
@@ -9,7 +9,7 @@ const os = require('os');
 const path = require('path');
 
 // Setup auth
-fs.writeFileSync(`${process.env['HOME']}/.npmrc`, `//registry.npmjs.org/:_authToken=${process.env['NPM_AUTH_TOKEN']}`);
+// fs.writeFileSync(`${process.env['HOME']}/.npmrc`, `//registry.npmjs.org/:_authToken=${process.env['NPM_AUTH_TOKEN']}`);
 
 const isDryRun = process.argv.includes('--dry');
 if (isDryRun) {
@@ -128,7 +128,9 @@ function getPublishedVersions(packageJson, version, tag) {
     throw new Error('Could not get published versions\n' + err);
   }
   const output = JSON.parse(versionsProcess.stdout);
-  if (typeof output === 'object') {
+  console.log('output', output);
+  console.log('typeof output', typeof output);
+  if (typeof output === 'object' && !Array.isArray(output)) {
     if (output.error?.code === 'E404')  {
       return [];
     }

From fbc51ae691bc27c5811f5c20532b31b5a5bd0458 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 1 Nov 2023 14:24:38 -0700
Subject: [PATCH 7/8] Remove logs

---
 bin/publish.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bin/publish.js b/bin/publish.js
index 2ac60280..a4a15f63 100644
--- a/bin/publish.js
+++ b/bin/publish.js
@@ -128,8 +128,6 @@ function getPublishedVersions(packageJson, version, tag) {
     throw new Error('Could not get published versions\n' + err);
   }
   const output = JSON.parse(versionsProcess.stdout);
-  console.log('output', output);
-  console.log('typeof output', typeof output);
   if (typeof output === 'object' && !Array.isArray(output)) {
     if (output.error?.code === 'E404')  {
       return [];
@@ -139,9 +137,7 @@ function getPublishedVersions(packageJson, version, tag) {
   if (!output || Array.isArray(output) && output.length === 0) {
     return [];
   }
-  console.log('output', output);
   const versionsJson = asArray(output);
-  console.log('versionsJson', versionsJson);
   if (tag) {
     return versionsJson.filter(v => !v.search(new RegExp(`${version}-${tag}.[0-9]+`)));
   }

From 45e7efce67efa8b225230b1813934fb9e47bc143 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 1 Nov 2023 14:29:32 -0700
Subject: [PATCH 8/8] Re-enable auth

---
 bin/publish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/publish.js b/bin/publish.js
index a4a15f63..360e09fe 100644
--- a/bin/publish.js
+++ b/bin/publish.js
@@ -9,7 +9,7 @@ const os = require('os');
 const path = require('path');
 
 // Setup auth
-// fs.writeFileSync(`${process.env['HOME']}/.npmrc`, `//registry.npmjs.org/:_authToken=${process.env['NPM_AUTH_TOKEN']}`);
+fs.writeFileSync(`${process.env['HOME']}/.npmrc`, `//registry.npmjs.org/:_authToken=${process.env['NPM_AUTH_TOKEN']}`);
 
 const isDryRun = process.argv.includes('--dry');
 if (isDryRun) {