Merge pull request #1097 from stealjs/guard-importspecifiers

Account for modules without importNames

lib/graph/treeshake.js

@@ -97,14 +97,15 @@ function loadFromGraph(getNode, data) {
 				for(let depName of dependants) {
 					let localNode = getNode(depName);
 					let specifiers = localNode.load.metadata.importSpecifiers || {};
+					let importNames = localNode.load.metadata.importNames || {};
 
 					for(let [impSource,] of entries(specifiers)) {
 						let depName = moduleNameFromSpecifier(localNode, impSource);
 						if(depName !== id) {
 							continue;
 						}
 
-						let imported = localNode.load.metadata.importNames[impSource] || [];
+						let imported = importNames[impSource] || [];
 						imported.forEach(imported => {
 							needToExport.add(imported);
 						});

lib/stream/treeshake.js

@@ -1,6 +1,7 @@
 var through = require("through2");
 var prune = require("../graph/prune");
 var treeshake = require("../graph/treeshake");
+var winston = require("winston");
 
 module.exports = function() {
 	return through.obj(function(data, enc, next) {
@@ -17,6 +18,7 @@ module.exports = function() {
 			return;
 		}
 
+		winston.info("Tree shaking...");
 		treeshake(data, options)
 		.then(function(){
 			prune(data);

test/tree_shaking_test.js

@@ -274,6 +274,7 @@ describe("Tree-shaking", function(){
 	});
 
 	describe("import { dep } from 'cjs'", function() {
+		var app;
 		before(function(done){
 			this.timeout(20000);
 			var base = path.join(__dirname, "treeshake", "cjs");

test/treeshake/cjs/file.txt

@@ -0,0 +1 @@
+THIS IS A TEXT FILE HA HA HA.

test/treeshake/cjs/index.js

@@ -1,4 +1,5 @@
 import { assign } from './dep';
 import './other';
+import './file.txt!~/text';
 
 window.APP = { assign };

test/treeshake/cjs/text.js

@@ -0,0 +1,10 @@
+
+exports.translate = function(load) {
+	load.metadata.importSpecifiers = {
+		"./dep": {
+			start: { line: 1, column: 28 },
+			end: { line: 1, column: 30 },
+		}
+	};
+	return "require('./dep'); module.exports = function(){};";
+};