From 6813fd2264cc9f3d4bf9e9fdf0efaeb2e7bf3b3e Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 19 Aug 2020 11:27:35 +0200 Subject: [PATCH] upgrade from rollup v1 to v2 so we can use ?. optional chaining --- package.json | 2 +- scripts/build.mjs | 6 +++--- yarn.lock | 24 +++++++++++------------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 9395b831..389fce6f 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "postcss-import": "^12.0.1", "postcss-url": "^8.0.0", "regenerator-runtime": "^0.13.7", - "rollup": "^1.15.6", + "rollup": "^2.26.4", "rollup-plugin-cleanup": "^3.1.1", "serve-static": "^1.13.2", "xxhash": "^0.3.0" diff --git a/scripts/build.mjs b/scripts/build.mjs index fc7e223b..892e27f0 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -20,7 +20,7 @@ import fsRoot from "fs"; const fs = fsRoot.promises; import path from "path"; import XXHash from 'xxhash'; -import rollup from 'rollup'; +import { rollup } from 'rollup'; import postcss from "postcss"; import postcssImport from "postcss-import"; import { fileURLToPath } from 'url'; @@ -174,7 +174,7 @@ async function buildHtml(doc, version, assetPaths, manifestPath) { async function buildJs() { // create js bundle - const bundle = await rollup.rollup({ + const bundle = await rollup({ input: 'src/main.js', plugins: [removeJsComments({comments: "none"})] }); @@ -209,7 +209,7 @@ async function buildJsLegacy() { input: ['src/legacy-polyfill.js', 'src/main.js'], plugins: [multi(), commonjs(), nodeResolve(), babelPlugin, removeJsComments({comments: "none"})] }; - const bundle = await rollup.rollup(rollupConfig); + const bundle = await rollup(rollupConfig); const {output} = await bundle.generate({ format: 'iife', name: `${PROJECT_ID}Bundle` diff --git a/yarn.lock b/yarn.lock index d5ce21eb..dd71d67d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -902,11 +902,6 @@ dependencies: "@types/node" "*" -acorn@^7.1.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" - integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== - ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -1252,6 +1247,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +fsevents@~2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" + integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -1810,14 +1810,12 @@ rollup-pluginutils@^2.3.3: dependencies: estree-walker "^0.6.1" -rollup@^1.15.6: - version "1.32.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4" - integrity sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A== - dependencies: - "@types/estree" "*" - "@types/node" "*" - acorn "^7.1.0" +rollup@^2.26.4: + version "2.26.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.4.tgz#a8350fd6bd56fce9873a7db2bd9547d40de3992b" + integrity sha512-6+qsGuP0MXGd7vlYmk72utm1MrgZj5GfXibGL+cRkKQ9+ZL/BnFThDl0D5bcl7AqlzMjAQXRAwZX1HVm22M/4Q== + optionalDependencies: + fsevents "~2.1.2" safe-buffer@~5.1.1: version "5.1.2"