From e700f7708fc702e4970b48c4f47d731bcc0ec9d8 Mon Sep 17 00:00:00 2001 From: Tommy Yu Date: Wed, 13 Mar 2019 18:03:08 +1300 Subject: [PATCH 1/3] Rename the dummy file appropriately - The dummy is for the calmjs karma, thus call it that instead. --- src/calmjs/webpack/dev.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calmjs/webpack/dev.py b/src/calmjs/webpack/dev.py index 95ff421..aae44c3 100644 --- a/src/calmjs/webpack/dev.py +++ b/src/calmjs/webpack/dev.py @@ -412,7 +412,7 @@ def karma_webpack(spec, toolchain=None): "mode": spec.get(WEBPACK_MODE, DEFAULT_WEBPACK_MODE), "devtool": spec.get(WEBPACK_DEVTOOL, DEFAULT_WEBPACK_DEVTOOL), "output": { - "filename": "dummy.webpack.js", + "filename": "__calmjs_karma__.webpack.js", "library": "__calmjs_karma__", "libraryTarget": "umd", "path": spec[BUILD_DIR], From 5ff573c23e08c5a9bd1917c347ec3042eaa3bad9 Mon Sep 17 00:00:00 2001 From: Tommy Yu Date: Thu, 15 Aug 2019 16:44:19 +1200 Subject: [PATCH 2/3] Preserve comments with calmjs.parse-1.2.0 --- setup.py | 1 + src/calmjs/webpack/toolchain.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 38833f8..39ff71e 100644 --- a/setup.py +++ b/setup.py @@ -69,6 +69,7 @@ include_package_data=True, zip_safe=False, install_requires=[ + 'calmjs.parse>=1.2.0', 'calmjs>=3.3.1', ], extras_require={ diff --git a/src/calmjs/webpack/toolchain.py b/src/calmjs/webpack/toolchain.py index c1d1804..2e62382 100644 --- a/src/calmjs/webpack/toolchain.py +++ b/src/calmjs/webpack/toolchain.py @@ -196,7 +196,7 @@ def __init__(self, *a, **kw): self.binary = self.webpack_bin def setup_transpiler(self): - self.parser = parse + self.parser = partial(parse, with_comments=True) self.transpiler = convert_dynamic_require_unparser() def build_compile_entries(self): From 64205d81b60dcd1be01ff12e96ae39fa16ad6474 Mon Sep 17 00:00:00 2001 From: Tommy Yu Date: Fri, 16 Aug 2019 08:51:11 +1200 Subject: [PATCH 3/3] Bumping to webpack-4 - Also depend on webpack-cli to maintain existing integration. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 39ff71e..a65ea44 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,8 @@ package_json = { "dependencies": {}, "devDependencies": { - "webpack": "~2.7.0", + "webpack": "~4.16.0", + "webpack-cli": "~3.0.0", "karma-webpack": "~3.0.0", "sourcemap-istanbul-instrumenter-loader": "~0.2.0", }