Skip to content

Commit 71f31df

Browse files
Upgrade to rollup 1.31 and restore disabled tests
1 parent 19d380c commit 71f31df

20 files changed

+33
-24
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"npm-run-all": "4.1.5",
5858
"prettier": "1.19.1",
5959
"rimraf": "3.0.1",
60-
"rollup": "1.29.1",
60+
"rollup": "1.31.0",
6161
"sirv-cli": "0.4.5",
6262
"typescript": "3.7.5"
6363
},

src/parsing/import-specifiers.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ export function FormatSpecifiers(specifiers: Specifiers, name: string): string {
6868
const hasDefault = specifiers.default !== null;
6969
const hasNamespace = specifiers.namespace === true;
7070
const hasSpecifics = !hasNamespace && specifiers.specific.length > 0;
71+
const hasLocals = specifiers.local.length > 0;
72+
const includesFrom = hasNamespace || hasNamespace || hasSpecifics || hasLocals;
7173
let formatted: string = 'import';
7274
let values: Array<string> = [];
7375

@@ -82,7 +84,7 @@ export function FormatSpecifiers(specifiers: Specifiers, name: string): string {
8284
}
8385
formatted += `${hasDefault || hasNamespace ? ' ' : ''}${values.join(',')}${
8486
hasSpecifics ? '' : ' '
85-
}from'${name}';`;
87+
}${includesFrom ? 'from' : ''}'${name}';`;
8688

8789
return formatted;
8890
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log("foo");console.log("baz");import("./utf8-lazy-48cd6a70.js");function ɵɵbar(){console.log("bar")};export{ɵɵbar as ɵ}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log("foo");console.log("baz");import("./utf8-lazy-48cd6a70.js");function ɵɵbar(){console.log("bar")};export{ɵɵbar as ɵ}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log("foo");console.log("baz");import("./utf8-lazy-48cd6a70.js");function ɵɵbar(){console.log("bar")};export{ɵɵbar as ɵ}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
console.log("foo");
3+
console.log("baz");
4+
import("./utf8-lazy-48cd6a70.js");
5+
function ɵɵbar(){
6+
console.log("bar");
7+
};export{ɵɵbar as ɵ}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import{ɵ as ɵɵbar}from'./utf8-3e9ae737.js';\u0275\u0275bar();
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import{ɵ as ɵɵbar}from'./utf8-3e9ae737.js';\u0275\u0275bar();
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import{ɵ as ɵɵbar}from'./utf8-3e9ae737.js';\u0275\u0275bar();
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import{ɵ as ɵɵbar}from'./utf8-3e9ae737.js';
2+
\u0275\u0275bar();

0 commit comments

Comments
 (0)