diff --git a/cog.toml b/cog.toml index 6d8c99871..267ed42f3 100644 --- a/cog.toml +++ b/cog.toml @@ -27,7 +27,7 @@ post_package_bump_hooks = [ # prepare the github release changelog file "mkdir -p ../../releases", "../../tools/extract_changelog.sh CHANGELOG.md > ../../releases/GITHUB_CHANGELOG-{{package}}.md", - # update the version number to have a .dev0 suffix (when possible, only done for python plugins) + # update the version number to have a `dev0` suffix "../../tools/update_version.sh {{package}} {{version}} --dev", "git commit -m 'chore(version): update {{package}} version to {{version}}'", # push the tag and the commits to main diff --git a/plugins/matplotlib/src/deephaven/plugin/matplotlib/.gitignore b/plugins/matplotlib/src/deephaven/plugin/matplotlib/.gitignore new file mode 100644 index 000000000..fd2ac954b --- /dev/null +++ b/plugins/matplotlib/src/deephaven/plugin/matplotlib/.gitignore @@ -0,0 +1 @@ +_js/ \ No newline at end of file diff --git a/plugins/ui/src/deephaven/ui/.gitignore b/plugins/ui/src/deephaven/ui/.gitignore new file mode 100644 index 000000000..fd2ac954b --- /dev/null +++ b/plugins/ui/src/deephaven/ui/.gitignore @@ -0,0 +1 @@ +_js/ \ No newline at end of file diff --git a/tools/update_version.sh b/tools/update_version.sh index 4f89bdf24..d8bbd62ef 100755 --- a/tools/update_version.sh +++ b/tools/update_version.sh @@ -136,8 +136,7 @@ case "$package" in update_file table-example/src/js/package.json '"version": "' '",' ;; ui) - update_file ui/src/js/package.json '"version": "' '",' - update_file ui/src/setup.cfg 'version = ' '' "$extra" + update_file ui/setup.cfg 'version = ' '' "$extra" ;; utilities) update_file utilities/setup.cfg 'version = ' '' "$extra" @@ -152,4 +151,14 @@ case "$package" in } esac +# We still need to bump these JS packages for Enterprise legacy reasons, even though they're packaged with Python +npm_version="${version}" +[ "$dev" = true ] && npm_version="${version}-dev0" +case "$package" in + matplotlib | plotly | plotly-express | ui) + # The working directory is already `plugins/`, so we just specify workspace as `src/js` and it does the right thing + npm version "$npm_version" --workspace=src/js + ;; +esac + log_info "Done updating $package version to $version${extra}"