upgrade to rollup v0.63 (#7024)

package.json

@@ -89,7 +89,7 @@
  "remark-html": "^5.0.1",
  "remark-react": "^4.0.1",
  "request": "^2.79.0",
- "rollup": "^0.57.0",
+ "rollup": "^0.63.4",
  "rollup-plugin-browserify-transform": "^1.0.1",
  "rollup-plugin-buble": "^0.18.0",
  "rollup-plugin-commonjs": "^9.1.3",

rollup.config.js

@@ -21,7 +21,8 @@ const config = [{
  dir: 'rollup/build/mapboxgl',
  format: 'amd',
  sourcemap: 'inline',
- indent: false
+ indent: false,
+ chunkFileNames: 'shared.js'
  },
  experimentalCodeSplitting: true,
  treeshake: production,

rollup/mapboxgl.js

@@ -14,30 +14,30 @@ define(['exports'], function (exports) {
  // names rewritten to avoid collisions, etc.)
 })
 */
-import './build/mapboxgl/chunk1';
+import './build/mapboxgl/shared';
 
 // Worker and its unique dependencies, i.e.:
 /*
-define(['./chunk1.js'], function (__chunk1__js) {
+define(['./shared.js'], function (__shared__js) {
  // Code for worker script and its unique dependencies.
- // Expects the output of 'chunk1' module to be passed in as an argument,
+ // Expects the output of 'shared' module to be passed in as an argument,
  // since all references to common deps look like, e.g.,
- // __chunk1__js.shapeText().
+ // __shared__js.shapeText().
 });
 */
 // When this wrapper function is passed to our custom define() above,
-// it gets stringified, together with the chunk1 wrapper (using
+// it gets stringified, together with the shared wrapper (using
 // Function.toString()), and the resulting string of code is made into a
 // Blob URL that gets used by the main module to create the web workers.
 import './build/mapboxgl/worker';
 
 // Main module and its unique dependencies
 /*
-define(['./chunk1.js'], function (__chunk1__js) {
+define(['./shared.js'], function (__shared__js) {
  // Code for main GL JS module and its unique dependencies.
- // Expects the output of 'chunk1' module to be passed in as an argument,
+ // Expects the output of 'shared' module to be passed in as an argument,
  // since all references to common deps look like, e.g.,
- // __chunk1__js.shapeText().
+ // __shared__js.shapeText().
  //
  // Returns the actual mapboxgl (i.e. src/index.js)
 });

yarn.lock

@@ -241,15 +241,9 @@
  dependencies:
  samsam "1.3.0"
 
-"@types/acorn@^4.0.3":
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.3.tgz#d1f3e738dde52536f9aad3d3380d14e448820afd"
- dependencies:
- "@types/estree" "*"
-
-"@types/estree@*", "@types/estree@0.0.38":
- version "0.0.38"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
+"@types/estree@0.0.39":
+ version "0.0.39"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
 
 "@types/node@*":
  version "9.4.6"
@@ -302,12 +296,6 @@ acorn-dynamic-import@^2.0.0:
  dependencies:
  acorn "^4.0.3"
 
-acorn-dynamic-import@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
- dependencies:
- acorn "^5.0.0"
-
 acorn-globals@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538"
@@ -341,7 +329,7 @@ acorn@^4.0.0, acorn@^4.0.3, acorn@^4.0.4:
  version "4.0.13"
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0, acorn@^5.5.3:
+acorn@^5.0.0:
  version "5.5.3"
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
 
@@ -2974,12 +2962,6 @@ date-now@^0.1.4:
  version "0.1.4"
  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-date-time@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2"
- dependencies:
- time-zone "^1.0.0"
-
 dateformat@^1.0.11, dateformat@^1.0.12:
  version "1.0.12"
  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
@@ -5233,10 +5215,6 @@ ip@^1.1.0:
  version "1.1.5"
  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
 
-irregular-plurals@^1.0.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
-
 is-absolute-url@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -5537,12 +5515,6 @@ is-redirect@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
 
-is-reference@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.1.0.tgz#50e6ef3f64c361e2c53c0416cdc9420037f2685b"
- dependencies:
- "@types/estree" "0.0.38"
-
 is-regex@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -6088,10 +6060,6 @@ localtunnel@1.8.3:
  request "2.81.0"
  yargs "3.29.0"
 
-locate-character@^2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f"
-
 locate-path@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -7414,10 +7382,6 @@ parse-json@^4.0.0:
  error-ex "^1.3.1"
  json-parse-better-errors "^1.0.1"
 
-parse-ms@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
-
 parse-url@^1.3.0:
  version "1.3.11"
  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-1.3.11.tgz#57c15428ab8a892b1f43869645c711d0e144b554"
@@ -7626,12 +7590,6 @@ platform@^1.3.3:
  version "1.3.5"
  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
 
-plur@^2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
- dependencies:
- irregular-plurals "^1.0.0"
-
 pluralize@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-4.0.0.tgz#59b708c1c0190a2f692f1c7618c446b052fd1762"
@@ -7877,13 +7835,6 @@ pretty-hrtime@^1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
-pretty-ms@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.1.0.tgz#e9cac9c76bf6ee52fe942dd9c6c4213153b12881"
- dependencies:
- parse-ms "^1.0.0"
- plur "^2.1.2"
-
 prismjs@^1.8.1:
  version "1.11.0"
  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.11.0.tgz#297aef33eb79421bfdb19273a5092ca515970d29"
@@ -8652,10 +8603,6 @@ require-main-filename@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
-require-relative@^0.8.7:
- version "0.8.7"
- resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
-
 require-uncached@^1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -8825,21 +8772,12 @@ rollup-pluginutils@^2.0.1:
  estree-walker "^0.3.0"
  micromatch "^2.3.11"
 
-rollup@^0.57.0:
- version "0.57.1"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.57.1.tgz#0bb28be6151d253f67cf4a00fea48fb823c74027"
- dependencies:
- "@types/acorn" "^4.0.3"
- acorn "^5.5.3"
- acorn-dynamic-import "^3.0.0"
- date-time "^2.1.0"
- is-reference "^1.1.0"
- locate-character "^2.0.5"
- pretty-ms "^3.1.0"
- require-relative "^0.8.7"
- rollup-pluginutils "^2.0.1"
- signal-exit "^3.0.2"
- sourcemap-codec "^1.4.1"
+rollup@^0.63.4:
+ version "0.63.4"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.63.4.tgz#cb58bf6c2a6c38542cae250684c962799ad7c00c"
+ dependencies:
+ "@types/estree" "0.0.39"
+ "@types/node" "*"
 
 run-async@^2.2.0:
  version "2.3.0"
@@ -9280,10 +9218,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-sourcemap-codec@^1.4.1:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
-
 space-separated-tokens@^1.0.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.1.tgz#9695b9df9e65aec1811d4c3f9ce52520bc2f7e4d"
@@ -9962,10 +9896,6 @@ time-stamp@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
 
-time-zone@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
-
 timed-out@^4.0.0, timed-out@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"