Upgrade to rollup 1.31 and restore disabled tests

package.json

@@ -57,7 +57,7 @@
     "npm-run-all": "4.1.5",
     "prettier": "1.19.1",
     "rimraf": "3.0.1",
-    "rollup": "1.29.1",
+    "rollup": "1.31.0",
     "sirv-cli": "0.4.5",
     "typescript": "3.7.5"
   },

src/parsing/import-specifiers.ts

@@ -68,6 +68,8 @@ export function FormatSpecifiers(specifiers: Specifiers, name: string): string {
   const hasDefault = specifiers.default !== null;
   const hasNamespace = specifiers.namespace === true;
   const hasSpecifics = !hasNamespace && specifiers.specific.length > 0;
+  const hasLocals = specifiers.local.length > 0;
+  const includesFrom = hasNamespace || hasNamespace || hasSpecifics || hasLocals;
   let formatted: string = 'import';
   let values: Array<string> = [];
 
@@ -82,7 +84,7 @@ export function FormatSpecifiers(specifiers: Specifiers, name: string): string {
   }
   formatted += `${hasDefault || hasNamespace ? ' ' : ''}${values.join(',')}${
     hasSpecifics ? '' : ' '
-  }from'${name}';`;
+  }${includesFrom ? 'from' : ''}'${name}';`;
 
   return formatted;
 }

test/import/fixtures/utf8-3e9ae737.esm.advanced.js

@@ -0,0 +1 @@
+console.log("foo");console.log("baz");import("./utf8-lazy-48cd6a70.js");function ɵɵbar(){console.log("bar")};export{ɵɵbar as ɵ}

test/import/fixtures/utf8-3e9ae737.esm.default.js

@@ -0,0 +1 @@
+console.log("foo");console.log("baz");import("./utf8-lazy-48cd6a70.js");function ɵɵbar(){console.log("bar")};export{ɵɵbar as ɵ}

test/import/fixtures/utf8-3e9ae737.esm.es5.js

@@ -0,0 +1 @@
+console.log("foo");console.log("baz");import("./utf8-lazy-48cd6a70.js");function ɵɵbar(){console.log("bar")};export{ɵɵbar as ɵ}

test/import/fixtures/utf8-3e9ae737.esm.pretty.js

@@ -0,0 +1,7 @@
+
+console.log("foo");
+console.log("baz");
+import("./utf8-lazy-48cd6a70.js");
+function ɵɵbar(){
+  console.log("bar");
+};export{ɵɵbar as ɵ}

test/import/fixtures/utf8-lazy-48cd6a70.esm.advanced.js

@@ -0,0 +1 @@
+import{ɵ as ɵɵbar}from'./utf8-3e9ae737.js';\u0275\u0275bar();

test/import/fixtures/utf8-lazy-48cd6a70.esm.default.js

@@ -0,0 +1 @@
+import{ɵ as ɵɵbar}from'./utf8-3e9ae737.js';\u0275\u0275bar();

test/import/fixtures/utf8-lazy-48cd6a70.esm.es5.js

@@ -0,0 +1 @@
+import{ɵ as ɵɵbar}from'./utf8-3e9ae737.js';\u0275\u0275bar();

test/import/fixtures/utf8-lazy-48cd6a70.esm.pretty.js

@@ -0,0 +1,2 @@
+import{ɵ as ɵɵbar}from'./utf8-3e9ae737.js';
+\u0275\u0275bar();

test/import/fixtures/utf8.esm.advanced.js

@@ -1 +1 @@
-import{ɵ as ɵɵfoo,b as baz}from'./utf8-common-38fdc940.js';\u0275\u0275foo();baz();import("./utf8-lazy-d5bcdc27.js");
+import './utf8-3e9ae737.js';

test/import/fixtures/utf8.esm.default.js

@@ -1 +1 @@
-import{ɵ as ɵɵfoo,b as baz}from'./utf8-common-38fdc940.js';\u0275\u0275foo();baz();import("./utf8-lazy-d5bcdc27.js");
+import './utf8-3e9ae737.js';

test/import/fixtures/utf8.esm.es5.js

@@ -1 +1 @@
-import{ɵ as ɵɵfoo,b as baz}from'./utf8-common-38fdc940.js';\u0275\u0275foo();baz();import("./utf8-lazy-d5bcdc27.js");
+import './utf8-3e9ae737.js';

test/import/fixtures/utf8.esm.pretty.js

@@ -1,4 +1 @@
-import{ɵ as ɵɵfoo,b as baz}from'./utf8-common-38fdc940.js';
-\u0275\u0275foo();
-baz();
-import("./utf8-lazy-d5bcdc27.js");
+import './utf8-3e9ae737.js';

test/import/utf8.test.js

@@ -25,11 +25,11 @@ import {
 
 generator('import', 'utf8', true, undefined, {
   ...DEFAULT_CLOSURE_OPTIONS,
-  // ...PRETTY_PRINT_CLOSURE_OPTIONS,
-  // ...ES5_STRICT_CLOSURE_OPTIONS,
+  ...PRETTY_PRINT_CLOSURE_OPTIONS,
+  ...ES5_STRICT_CLOSURE_OPTIONS,
 });
 
-// // Seperate the Advanced Compilation as we work on it.
-// generator('import', 'utf8', true, undefined, {
-//   ...ADVANCED_CLOSURE_OPTIONS,
-// });
+// Seperate the Advanced Compilation as we work on it.
+generator('import', 'utf8', true, undefined, {
+  ...ADVANCED_CLOSURE_OPTIONS,
+});

yarn.lock

@@ -3530,10 +3530,10 @@ rimraf@^3.0.0:
   dependencies:
     glob "^7.1.3"
 
-rollup@1.29.1:
-  version "1.29.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.29.1.tgz#8715d0a4ca439be3079f8095989ec8aa60f637bc"
-  integrity sha512-dGQ+b9d1FOX/gluiggTAVnTvzQZUEkCi/TwZcax7ujugVRHs0nkYJlV9U4hsifGEMojnO+jvEML2CJQ6qXgbHA==
+rollup@1.31.0:
+  version "1.31.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.31.0.tgz#e2a87212e96aa7850f3eb53fdd02cf89f2d2fe9a"
+  integrity sha512-9C6ovSyNeEwvuRuUUmsTpJcXac1AwSL1a3x+O5lpmQKZqi5mmrjauLeqIjvREC+yNRR8fPdzByojDng+af3nVw==
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"