Update rollup to version > 1 (#252)

* Update rollup to version > 1
* require node >= 10

Author: kristoferbaxter

package.json

@@ -13,7 +13,7 @@
   },
   "author": "The AMP HTML Authors",
   "engines": {
-    "node": ">=12"
+    "node": ">=10"
   },
   "keywords": [
     "rollup-plugin"
@@ -32,7 +32,7 @@
     "prepublishOnly": "npm-run-all build"
   },
   "peerDependencies": {
-    "rollup": ">= 0.67.4"
+    "rollup": ">=1.27"
   },
   "dependencies": {
     "acorn": "7.1.0",
@@ -57,7 +57,7 @@
     "npm-run-all": "4.1.5",
     "prettier": "1.19.1",
     "rimraf": "3.0.0",
-    "rollup": "0.67.4",
+    "rollup": "1.27.13",
     "sirv-cli": "0.4.5",
     "tslint": "5.20.1",
     "typescript": "3.7.3"

src/index.ts

@@ -18,11 +18,11 @@ import { CompileOptions } from 'google-closure-compiler';
 import { promises as fsPromises } from 'fs';
 import {
   OutputOptions,
-  RawSourceMap,
   Plugin,
   InputOptions,
   PluginContext,
   RenderedChunk,
+  SourceMapInput,
 } from 'rollup';
 import compiler from './compiler';
 import options from './options';
@@ -42,7 +42,7 @@ const renderChunk = async (
   requestedCompileOptions: CompileOptions = {},
   sourceCode: string,
   outputOptions: OutputOptions,
-): Promise<{ code: string; map: RawSourceMap } | void> => {
+): Promise<{ code: string; map: SourceMapInput } | void> => {
   const code = await preCompilation(sourceCode, outputOptions, transforms);
   const [compileOptions, mapFile] = options(
     requestedCompileOptions,
@@ -51,14 +51,14 @@ const renderChunk = async (
     transforms,
   );
 
-  return compiler(compileOptions, transforms).then(
-    async code => {
-      return { code, map: JSON.parse(await fsPromises.readFile(mapFile, 'utf8')) };
-    },
-    (error: Error) => {
-      throw error;
-    },
-  );
+  try {
+    return {
+      code: await compiler(compileOptions, transforms),
+      map: JSON.parse(await fsPromises.readFile(mapFile, 'utf8')),
+    };
+  } catch (error) {
+    throw error;
+  }
 };
 
 export default function closureCompiler(requestedCompileOptions: CompileOptions = {}): Plugin {
@@ -73,16 +73,17 @@ export default function closureCompiler(requestedCompileOptions: CompileOptions
       if (
         'compilation_level' in requestedCompileOptions &&
         requestedCompileOptions.compilation_level === 'ADVANCED_OPTIMIZATIONS' &&
-        inputOptions.experimentalCodeSplitting
+        Array.isArray(inputOptions.input)
       ) {
         context.warn(
-          'Rollup experimentalCodeSplitting with Closure Compiler ADVANCED_OPTIMIZATIONS is not currently supported.',
+          'Code Splitting with Closure Compiler ADVANCED_OPTIMIZATIONS is not currently supported.',
         );
       }
     },
     renderChunk: async (code: string, chunk: RenderedChunk, outputOptions: OutputOptions) => {
       const transforms = createTransforms(context, inputOptions);
-      return await renderChunk(transforms, requestedCompileOptions, code, outputOptions);
+      const output = await renderChunk(transforms, requestedCompileOptions, code, outputOptions);
+      return output || null;
     },
   };
 }

test/export-named/fixtures/multiple.esm.advanced.js

@@ -1 +1 @@
-var foo=1;var bar=function(){console.log(1)};export{foo,bar};
+var bar=function(){console.log(1)};var foo=1;export{bar,foo};

test/export-named/fixtures/multiple.esm.default.js

@@ -1 +1 @@
-var foo=1;var bar=function(){console.log(1)};export{foo,bar};
+var bar=function(){console.log(1)};var foo=1;export{bar,foo};

test/export-named/fixtures/multiple.esm.es5.js

@@ -1 +1 @@
-var foo=1;var bar=function(){console.log(1)};export{foo,bar};
+var bar=function(){console.log(1)};var foo=1;export{bar,foo};

test/generator.js

@@ -50,7 +50,7 @@ const fixtureLocation = (category, name, format, optionsKey, minified = false) =
       : `${name}.js`
   }`;
 
-async function compile(category, name, codeSplit, closureFlags, optionKey, format) {
+async function compile(category, name, codeSplit, closureFlags, optionKey, format, wrapper) {
   const bundle = await rollup.rollup({
     input: fixtureLocation(category, name, format, optionKey, false),
     plugins: [compiler(closureFlags[optionKey])],
@@ -61,6 +61,7 @@ async function compile(category, name, codeSplit, closureFlags, optionKey, forma
 
   const bundles = await bundle.generate({
     format,
+    name: wrapper,
     sourcemap: true,
   });
 
@@ -100,7 +101,7 @@ async function compile(category, name, codeSplit, closureFlags, optionKey, forma
   return output;
 }
 
-function generate(shouldFail, category, name, codeSplit, formats, closureFlags) {
+function generate(shouldFail, category, name, codeSplit, formats, closureFlags, wrapper) {
   const targetLength = longest(formats);
   const optionLength = longest(Object.keys(closureFlags));
 
@@ -110,7 +111,7 @@ function generate(shouldFail, category, name, codeSplit, formats, closureFlags)
       method(
         `${name} – ${format.padEnd(targetLength)} – ${optionKey.padEnd(optionLength)}`,
         async t => {
-          const output = await compile(category, name, codeSplit, closureFlags, optionKey, format);
+          const output = await compile(category, name, codeSplit, closureFlags, optionKey, format, wrapper);
 
           t.plan(output.length);
           for (result of output) {
@@ -128,8 +129,9 @@ function failureGenerator(
   codeSplit = false,
   formats = [ESM_OUTPUT],
   closureFlags = defaultClosureFlags,
+  wrapper = null,
 ) {
-  generate(true, category, name, codeSplit, formats, closureFlags);
+  generate(true, category, name, codeSplit, formats, closureFlags, wrapper);
 }
 
 function generator(
@@ -138,8 +140,9 @@ function generator(
   codeSplit = false,
   formats = [ESM_OUTPUT],
   closureFlags = defaultClosureFlags,
+  wrapper = null,
 ) {
-  generate(false, category, name, codeSplit, formats, closureFlags);
+  generate(false, category, name, codeSplit, formats, closureFlags, wrapper);
 }
 
 module.exports = {

test/iife/fixtures/iife.advanced.minified.js renamed to test/iife/fixtures/iife-wrapped-safely.iife.advanced.js

@@ -0,0 +1,3 @@
+export function greeting(name) {
+  document.body.innerHTML = 'hello ' + name;
+}