Skip to content

Fix image addon build #4862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tyriar merged 8 commits into from
Nov 1, 2023
Merged

Fix image addon build #4862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1c522e1
Fix image addon build
Tyriar Nov 1, 2023
2744549
Return [] if versionsJson is falsy
Tyriar Nov 1, 2023
c8b2783
Tweak parsing versions
Tyriar Nov 1, 2023
88b0b4a
Log publish script
Tyriar Nov 1, 2023
3192559
Log publish script
Tyriar Nov 1, 2023
92eb782
Verify it's not an array
Tyriar Nov 1, 2023
fbc51ae
Remove logs
Tyriar Nov 1, 2023
45e7efc
Re-enable auth
Tyriar Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions addons/addon-image/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
14 changes: 12 additions & 2 deletions bin/publish.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -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]+`)));
}
Expand Down