feat(rollup): rollup@2 compat (#733)

tivac · Mar 9, 2020 · 361bd4e · 361bd4e
1 parent 91b6912
commit 361bd4e
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
  "p-defer": "^3.0.0",
  "pegjs": "0.10.0",
  "read-dir-deep": "^7.0.1",
- "rollup": "^1.21.3",
+ "rollup": "^2.0.2",
  "rollup-plugin-hypothetical": "^2.1.0",
  "rollup-plugin-svelte": "^5.0.3",
  "shelljs": "^0.8.3",

diff --git a/packages/rollup-rewriter/rewriter.js b/packages/rollup-rewriter/rewriter.js
@@ -50,9 +50,9 @@ module.exports = (opts = {}) => {
  const graph = new DepGraph({ circular : true });
 
  Object.entries(chunks).forEach(([ entry, chunk ]) => {
- const { isAsset, dynamicImports } = chunk;
+ const { type, dynamicImports } = chunk;
 
- if(isAsset) {
+ if(type === "asset") {
  return;
  }
 

diff --git a/packages/rollup/rollup.js b/packages/rollup/rollup.js
@@ -189,10 +189,10 @@ module.exports = (opts = {}) => {
 
  // Walk all bundle entries and add them to the dependency graph
  Object.entries(bundle).forEach(([ entry, chunk ]) => {
- const { isAsset, modules } = chunk;
+ const { type, modules } = chunk;
 
  /* istanbul ignore if */
- if(isAsset) {
+ if(type === "asset") {
  return;
  }
 
@@ -270,7 +270,7 @@ module.exports = (opts = {}) => {
  });
 
  // Save off the final name of this asset for later use
- const dest = this.getAssetFileName(id);
+ const dest = this.getFileName(id);
 
  names.set(node, dest);
 

diff --git a/packages/rollup/test/__snapshots__/rollup.test.js.snap b/packages/rollup/test/__snapshots__/rollup.test.js.snap
@@ -473,7 +473,7 @@ exports[`/rollup.js should write out empty CSS files by default 1`] = `""`;
 exports[`/rollup.js shouldn't disable sourcemap generation 1`] = `
 SourceMap {
  "file": "simple.js",
- "mappings": ";;;;;AAEA,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC",
+ "mappings": ";;;;;AAEA,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC",
  "names": Array [],
  "sources": Array [
  "packages/rollup/test/specimens/simple.js",

diff --git a/packages/rollup/test/__snapshots__/watch.test.js.snap b/packages/rollup/test/__snapshots__/watch.test.js.snap
@@ -147,16 +147,14 @@ Snapshot Diff:
 + Second value
 
 @@ --- --- @@
- .mc204ad279_one {
- color: red;
- }",
- "assets/shared.css": "/* packages/rollup/test/output/watch/code-splitting/shared.css */
+ Object {
+ "assets/one.css": "/* packages/rollup/test/output/watch/code-splitting/shared.css */
  .mc4002e81f_shared {
 - color: blue;
 + color: seafoam;
- }",
-  "assets/two.css": "/* packages/rollup/test/output/watch/code-splitting/two.css */
- .mc3861d3af_two {
- color: green;
+ }
+ /* packages/rollup/test/output/watch/code-splitting/one.css */
+ .mc204ad279_one {
+ color: red;
  }",
 `;
diff --git a/packages/rollup/test/watch.test.js b/packages/rollup/test/watch.test.js
@@ -392,8 +392,6 @@ describe("/rollup.js", () => {
 
  // Start watching
  watcher = watch({
- experimentalCodeSplitting : true,
-
  input : [
  require.resolve(prefix("./output/watch/code-splitting/one.js")),
  require.resolve(prefix("./output/watch/code-splitting/two.js")),

diff --git a/packages/test-utils/expect/toMatchRollupAssetSnapshot.js b/packages/test-utils/expect/toMatchRollupAssetSnapshot.js
@@ -6,8 +6,8 @@ expect.extend({
  toMatchRollupAssetSnapshot({ output }) {
  const assets = new Map();
 
- output.forEach(({ isAsset, fileName, source }) => {
- if(!isAsset) {
+ output.forEach(({ type, fileName, source }) => {
+ if(type !== "asset") {
  return;
  }
 

diff --git a/packages/test-utils/expect/toMatchRollupCodeSnapshot.js b/packages/test-utils/expect/toMatchRollupCodeSnapshot.js
@@ -6,8 +6,8 @@ expect.extend({
  toMatchRollupCodeSnapshot({ output }) {
  const chunks = new Map();
 
- output.forEach(({ isAsset, name, code }) => {
- if(isAsset) {
+ output.forEach(({ type, name, code }) => {
+ if(type === "asset") {
  return;
  }
 

diff --git a/packages/test-utils/expect/toMatchRollupSnapshot.js b/packages/test-utils/expect/toMatchRollupSnapshot.js
@@ -6,9 +6,9 @@ expect.extend({
  toMatchRollupSnapshot({ output }, name = "") {
  const things = new Map();
 
- output.forEach(({ code, isAsset, fileName, source }) => {
+ output.forEach(({ code, type, fileName, source }) => {
  // Leading newline to make diffs easier to read
- things.set(fileName, `\n${isAsset ? source : code}`);
+ things.set(fileName, `\n${type === "asset" ? source : code}`);
  });
 
  const out = Object.create(null);