diff --git a/package.json b/package.json index a3b39ffb9d..807a85ec55 100644 --- a/package.json +++ b/package.json @@ -66,8 +66,8 @@ "underscore": "^1.9.1", "webfonts-loader": "^5.0.0", "webpack": "^4.33.0", - "webpack-bundle-tracker": "^0.4.2-beta", "webpack-cli": "^3.3.2", + "webpack4-bundle-tracker": "^0.0.1-beta", "winchan": "^0.2.1", "xdate": "^0.8.2", "zxcvbn": "^4.4.2" diff --git a/requirements/common.in b/requirements/common.in index 07e38593d9..65a4217032 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -106,7 +106,7 @@ tornado==4.* # https://github.com/zulip/zulip/issues/8913 https://github.com/zulip/ultrajson/archive/70ac02becc3e11174cd5072650f885b30daab8a8.zip#egg=ujson==1.35+git # Django extension for serving webpack modules -django-webpack-loader +django-webpack4-loader # Needed for iOS push notifications apns2 diff --git a/requirements/dev.txt b/requirements/dev.txt index c9677002b5..423f4b6f23 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -262,9 +262,9 @@ django-statsd-mozilla==0.4.0 \ django-two-factor-auth==1.9.1 \ --hash=sha256:464c33bcbd2f43470adc5f9b1c1957c8afad7bbada08a92c95031d26e7a8dd73 \ --hash=sha256:df45c2aafce5174c2c0ccc15740f6bb3bb78402b6bd27223d87cb3ba3ee52626 -django-webpack-loader==0.6.0 \ - --hash=sha256:60bab6b9a037a5346fad12d2a70a6bc046afb33154cf75ed640b93d3ebd5f520 \ - --hash=sha256:970b968c2a8975fb7eff56a3bab5d0d90d396740852d1e0c50c5cfe2b824199a +django-webpack4-loader==0.0.5 \ + --hash=sha256:baa043c4601ed763d161490e2888cf6aa93a2fd9b60681e6b19e35dc7fcb155d \ + --hash=sha256:be90257041170f39c025ff674c9064569c9303b464536488b6a6cedd8e3d28be django==1.11.24 \ --hash=sha256:215c27453f775b6b1add83a185f76c2e2ab711d17786a6704bd62eabd93f89e3 \ --hash=sha256:ffd89b89a2ee860ee521f054225044f52676825be4b61168d2842d44fcf457d3 diff --git a/requirements/prod.txt b/requirements/prod.txt index 6ce6e53afb..4f941fbf66 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -178,9 +178,9 @@ django-statsd-mozilla==0.4.0 \ django-two-factor-auth==1.9.1 \ --hash=sha256:464c33bcbd2f43470adc5f9b1c1957c8afad7bbada08a92c95031d26e7a8dd73 \ --hash=sha256:df45c2aafce5174c2c0ccc15740f6bb3bb78402b6bd27223d87cb3ba3ee52626 -django-webpack-loader==0.6.0 \ - --hash=sha256:60bab6b9a037a5346fad12d2a70a6bc046afb33154cf75ed640b93d3ebd5f520 \ - --hash=sha256:970b968c2a8975fb7eff56a3bab5d0d90d396740852d1e0c50c5cfe2b824199a +django-webpack4-loader==0.0.5 \ + --hash=sha256:baa043c4601ed763d161490e2888cf6aa93a2fd9b60681e6b19e35dc7fcb155d \ + --hash=sha256:be90257041170f39c025ff674c9064569c9303b464536488b6a6cedd8e3d28be django==1.11.24 \ --hash=sha256:215c27453f775b6b1add83a185f76c2e2ab711d17786a6704bd62eabd93f89e3 \ --hash=sha256:ffd89b89a2ee860ee521f054225044f52676825be4b61168d2842d44fcf457d3 diff --git a/tools/webpack.config.ts b/tools/webpack.config.ts index 94b0294efb..6e9fea1018 100644 --- a/tools/webpack.config.ts +++ b/tools/webpack.config.ts @@ -1,5 +1,5 @@ import { basename, resolve } from 'path'; -import BundleTracker from 'webpack-bundle-tracker'; +import BundleTracker from 'webpack4-bundle-tracker'; import webpack from 'webpack'; // The devServer member of webpack.Configuration is managed by the // webpack-dev-server package. We are only importing the type here. diff --git a/version.py b/version.py index 5ee7e4eae7..fed823517f 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = '59.2' +PROVISION_VERSION = '60.0' diff --git a/yarn.lock b/yarn.lock index 7d308c1c4a..1451013412 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2573,7 +2573,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@2, commander@2.x.x, commander@^2.10.0, commander@^2.12.2, commander@^2.15.1, commander@^2.19.0, commander@^2.20.0, commander@^2.7.1, commander@~2.20.0, commander@~2.20.3: +commander@2, commander@2.x.x, commander@^2.10.0, commander@^2.12.2, commander@^2.15.1, commander@^2.19.0, commander@^2.20.0, commander@^2.7.1, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -12036,15 +12036,6 @@ webidl-conversions@^4.0.0, webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -webpack-bundle-tracker@^0.4.2-beta: - version "0.4.2-beta" - resolved "https://registry.yarnpkg.com/webpack-bundle-tracker/-/webpack-bundle-tracker-0.4.2-beta.tgz#263c3a3db8722aaab0083763154e5f025e47825d" - integrity sha512-CCyJbCQnRtjR1sk97u/H5DtJibrIcJ79MnntMyjOpc9HCmfIQYgt7ze7i/Z+DStBZ4NC4HxqGDsB///2Na1DTA== - dependencies: - deep-extend "^0.6.0" - mkdirp "^0.5.1" - strip-ansi "^2.0.1" - webpack-cli@^3.3.2: version "3.3.9" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.9.tgz#79c27e71f94b7fe324d594ab64a8e396b9daa91a" @@ -12128,6 +12119,15 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack- source-list-map "^2.0.0" source-map "~0.6.1" +webpack4-bundle-tracker@^0.0.1-beta: + version "0.0.1-beta" + resolved "https://registry.yarnpkg.com/webpack4-bundle-tracker/-/webpack4-bundle-tracker-0.0.1-beta.tgz#f576821ffbce584206e8dd41ba10cf9a7738731a" + integrity sha512-UcCqw8LT2IqqZhZDKPw9FAtWvHarS5iGYmw/aaWupSI1q55qdj7fjGsbiK/O/PxOuaAjfVxMVLq2CBvCbdp+XA== + dependencies: + deep-extend "^0.6.0" + mkdirp "^0.5.1" + strip-ansi "^2.0.1" + webpack@^4.33.0: version "4.40.2" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.40.2.tgz#d21433d250f900bf0facbabe8f50d585b2dc30a7"