use commonjs compatibility similar to babel

webpack#1788
elastic · Dec 22, 2015 · a1ed89e · a1ed89e
1 parent 0915889
commit a1ed89e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/dependencies/HarmonyImportDependency.js b/lib/dependencies/HarmonyImportDependency.js
@@ -33,8 +33,8 @@ HarmonyImportDependency.makeStatement = function(declare, dep, outputOptions, re
  } else if(dep.importedVar) {
  content = "/* harmony import */ " + declaration + dep.importedVar + " = __webpack_require__(" + comment + JSON.stringify(dep.module.id) + ");\n";
  if(!dep.module.meta.harmonyModule) {
- content += "/* harmony import */ " + declaration + dep.importedVar + "_default = function() { return " + dep.importedVar + " && typeof " + dep.importedVar + " === 'object' && 'default' in " + dep.importedVar + " ? " + dep.importedVar + "['default'] : " + dep.importedVar + "; }\n";
- content += "/* harmony import */ Object.defineProperty(" + dep.importedVar + "_default, 'a', { get: function() { return " + dep.importedVar + "_default(); }});\n";
+ 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";
  }
  } else {
  content = "";

diff --git a/test/cases/parsing/harmony/node_modules/commonjs-trans.js b/test/cases/parsing/harmony/node_modules/commonjs-trans.js