Skip to content

Commit

Permalink
js: Fix, and check for, non-ES5 syntax in webpack bundles.
Browse files Browse the repository at this point in the history
Signed-off-by: Anders Kaseorg <anders@zulip.com>
  • Loading branch information
andersk committed Jul 5, 2021
1 parent c56440d commit 99533b4
Show file tree
Hide file tree
Showing 5 changed files with 310 additions and 17 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@uppy/progress-bar": "^1.3.4",
"@uppy/xhr-upload": "^1.4.2",
"autoprefixer": "^10.0.0",
"autosize": "^5.0.0",
"autosize": "^5.0.1",
"babel-loader": "^8.0.6",
"babel-plugin-formatjs": "^10.2.6",
"blueimp-md5": "^2.10.0",
Expand Down Expand Up @@ -97,6 +97,7 @@
"babel-plugin-rewire-ts": "^1.4.0",
"callsites": "^3.1.0",
"difflib": "^0.2.4",
"es-check": "^5.2.3",
"eslint": "^7.2.0",
"eslint-config-prettier": "^8.0.0",
"eslint-import-resolver-webpack": "^0.13.0",
Expand Down
2 changes: 1 addition & 1 deletion static/js/bundles/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "jquery-caret-plugin/dist/jquery.caret";
import "../../third/jquery-idle/jquery.idle";
import "spectrum-colorpicker";
import "jquery-validation";
import "flatpickr";
import "flatpickr/dist/flatpickr";

// Import app JS
import "../setup";
Expand Down
7 changes: 7 additions & 0 deletions tools/ci/production-build
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,10 @@ cp -a \
package.json yarn.lock \
\
/tmp/production-build

# Check that webpack bundles use only ES5 syntax.
tar -C /tmp -xzf /tmp/production-build/zulip-server-test.tar.gz zulip-server-test/prod-static/serve/webpack-bundles
(
GLOBIGNORE=/tmp/zulip-server-test/prod-static/serve/webpack-bundles/katex-cli.js
yarn run es-check es5 /tmp/zulip-server-test/prod-static/serve/webpack-bundles/*.js
)
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@
# historical commits sharing the same major version, in which case a
# minor version bump suffices.

PROVISION_VERSION = "151.0"
PROVISION_VERSION = "151.1"
Loading

0 comments on commit 99533b4

Please sign in to comment.