Merge pull request #4862 from Tyriar/image_publish

Fix image addon build
xtermjs · Nov 1, 2023 · 19bdcab · 19bdcab
2 parents 4b2e52f + 45e7efc
commit 19bdcab
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git 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
@@ -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'),
@@ -127,7 +127,17 @@ function getPublishedVersions(packageJson, version, tag) {
     }
     throw new Error('Could not get published versions\n' + err);
   }
-  const versionsJson = asArray(JSON.parse(versionsProcess.stdout));
+  const output = JSON.parse(versionsProcess.stdout);
+  if (typeof output === 'object' && !Array.isArray(output)) {
+    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 [];
+  }
+  const versionsJson = asArray(output);
   if (tag) {
     return versionsJson.filter(v => !v.search(new RegExp(`${version}-${tag}.[0-9]+`)));
   }