Skip to content
This repository was archived by the owner on Jan 3, 2019. It is now read-only.

Commit 240de3c

Browse files
committed
Support Webpack 4
Hack around webpack/webpack#7057 Fixes #5
1 parent 58c24f5 commit 240de3c

3 files changed

Lines changed: 27 additions & 5 deletions

File tree

‎example/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
"description": "Small example for messageformat-loader",
55
"scripts": {
66
"build": "webpack",
7-
"postinstall": "cd .. && npm install && npm install --no-save messageformat",
7+
"postinstall": "cd .. && npm install && npm install --no-save 'file:./example/node_modules/messageformat' 'file:./example/node_modules/webpack'",
88
"prepare": "npm run build"
99
},
1010
"main": "src/index.js",
11-
"repository": "https://github.com/eemeli/messageformat-loader",
11+
"repository": "https://github.com/messageformat/loader",
1212
"author": "Eemeli Aro <[email protected]>",
1313
"license": "MIT",
1414
"dependencies": {
15-
"messageformat": "^1.0.2",
15+
"messageformat": "^2.0.2",
1616
"messageformat-loader": "file:../",
17-
"webpack": "^3.8.1"
17+
"webpack": "^4.10.1",
18+
"webpack-cli": "^2.1.4"
1819
}
1920
}

‎index.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
var loaderUtils = require('loader-utils');
22
var MessageFormat = require('messageformat');
33

4+
var JavascriptParser;
5+
var JavascriptGenerator;
6+
try {
7+
JavascriptParser = require('webpack/lib/Parser');
8+
JavascriptGenerator = require('webpack/lib/JavascriptGenerator');
9+
} catch (error) {
10+
if (error.code !== 'MODULE_NOT_FOUND') {
11+
throw e;
12+
}
13+
}
14+
415
module.exports = function(content) {
516
var options = loaderUtils.getOptions(this);
617
var locale = options.locale;
@@ -27,5 +38,14 @@ module.exports = function(content) {
2738
this.cacheable && this.cacheable();
2839
this.value = [ messageFunctions ];
2940

41+
// BEGIN HACK
42+
// for https://github.com/webpack/webpack/issues/7057
43+
if (JavascriptParser && JavascriptGenerator) {
44+
this._module.type = 'javascript/auto';
45+
this._module.parser = new JavascriptParser();
46+
this._module.generator = new JavascriptGenerator();
47+
}
48+
// END HACK
49+
3050
return messageFunctions.toString('module.exports');
3151
};

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
},
3030
"homepage": "https://github.com/messageformat/loader#readme",
3131
"peerDependencies": {
32-
"messageformat": ">=1.0.0"
32+
"messageformat": ">=1.0.0",
33+
"webpack": ">=1.0.0"
3334
},
3435
"dependencies": {
3536
"loader-utils": "^1.1.0"

0 commit comments

Comments
 (0)