fixed webpack#1833

elastic · Jan 6, 2016 · 987d718 · 987d718
1 parent 5811c57
commit 987d718
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -51,7 +51,7 @@ HarmonyExportImportedSpecifierDependency.Template.prototype.apply = function(dep
  content = "/* unused harmony reexport " + (dep.name || "namespace") + " */";
  } else if(!active) {
  content = "/* inactive harmony reexport " + (dep.name || "namespace") + " */";
- } else if(dep.name === "default" && !dep.importDependency.module.meta.harmonyModule) {
+ } else if(dep.name === "default" && !(dep.importDependency.module.meta && dep.importDependency.module.meta.harmonyModule)) {
  content = "/* harmony reexport */ Object.defineProperty(exports, " + JSON.stringify(dep.name) + ", {configurable: false, enumerable: true, get: function() { return " + comment + name + "_default.a; }});";
  } else if(dep.name && dep.id) {
  content = "/* harmony reexport */ Object.defineProperty(exports, " + JSON.stringify(dep.name) + ", {configurable: false, enumerable: true, get: function() { return " + comment + (name + "[" + JSON.stringify(dep.id) + "]") + "; }});";

diff --git a/lib/dependencies/HarmonyImportDependency.js b/lib/dependencies/HarmonyImportDependency.js
@@ -32,7 +32,7 @@ HarmonyImportDependency.makeStatement = function(declare, dep, outputOptions, re
  content = "throw new Error(" + JSON.stringify("Cannot find module \"" + dep.request + "\"") + ");\n";
  } else if(dep.importedVar) {
  content = "/* harmony import */ " + declaration + dep.importedVar + " = __webpack_require__(" + comment + JSON.stringify(dep.module.id) + ");\n";
- if(!dep.module.meta.harmonyModule) {
+ if(!(dep.module.meta && dep.module.meta.harmonyModule)) {
  content += "/* harmony import */ " + declaration + dep.importedVar + "_default = " + dep.importedVar + " && " + dep.importedVar + ".__esModule ? function() { return " + dep.importedVar + "['default'] } : function() { return " + dep.importedVar + "; }\n";
  content += "/* harmony import */ Object.defineProperty(" + dep.importedVar + "_default, 'a', { get: " + dep.importedVar + "_default });\n";
  }

diff --git a/lib/dependencies/HarmonyImportSpecifierDependency.js b/lib/dependencies/HarmonyImportSpecifierDependency.js
@@ -30,7 +30,7 @@ HarmonyImportSpecifierDependency.Template = function HarmonyImportSpecifierDepen
 
 HarmonyImportSpecifierDependency.Template.prototype.apply = function(dep, source) {
  var content;
- if(dep.id === "default" && !dep.importDependency.module.meta.harmonyModule) {
+ if(dep.id === "default" && !(dep.importDependency.module.meta && dep.importDependency.module.meta.harmonyModule)) {
  content = "/* harmony import */ " + dep.importedVar + "_default.a";
  } else if(dep.id) {
  content = "/* harmony import */ " + dep.importedVar + "[" + JSON.stringify(dep.id) + "]";

diff --git a/test/configCases/externals/harmony/index.js b/test/configCases/externals/harmony/index.js
@@ -0,0 +1,5 @@
+import external from "external";
+
+it("should harmony import a dependency", function() {
+ external.should.be.eql("abc");
+});
diff --git a/test/configCases/externals/harmony/webpack.config.js b/test/configCases/externals/harmony/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+ externals: {
+ external: "var 'abc'"
+ }
+};