From fa8aa81840706aec6e61ad147f2c37c3834b30da Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Fri, 10 Sep 2021 13:35:30 +0200 Subject: [PATCH] Continue supporting IE11 in examples and legacy buld --- config/webpack-config-legacy-build.mjs | 20 +---- examples/webpack/config.mjs | 18 +---- package-lock.json | 108 +------------------------ package.json | 2 - 4 files changed, 8 insertions(+), 140 deletions(-) diff --git a/config/webpack-config-legacy-build.mjs b/config/webpack-config-legacy-build.mjs index ffc2aef1a8..1ec7c993d3 100644 --- a/config/webpack-config-legacy-build.mjs +++ b/config/webpack-config-legacy-build.mjs @@ -1,8 +1,5 @@ import TerserPlugin from 'terser-webpack-plugin'; -import path, {dirname} from 'path'; -import {fileURLToPath} from 'url'; - -const baseDir = dirname(fileURLToPath(import.meta.url)); +import path from 'path'; export default { entry: './build/index.js', @@ -12,22 +9,13 @@ export default { module: { rules: [ { - test: /^((?!es2015-)[\s\S])*\.js$/, + test: /\.m?js$/, use: { - loader: 'buble-loader', + loader: 'babel-loader', options: { - transforms: {dangerousForOf: true}, + presets: [['@babel/preset-env', {targets: 'ie 11'}]], }, }, - include: [ - path.join( - baseDir, - '..', - 'node_modules', - '@mapbox', - 'mapbox-gl-style-spec' - ), - ], }, ], }, diff --git a/examples/webpack/config.mjs b/examples/webpack/config.mjs index 81445dc823..1bb2ddd1f1 100644 --- a/examples/webpack/config.mjs +++ b/examples/webpack/config.mjs @@ -28,25 +28,11 @@ export default { { test: /^((?!es2015-)[\s\S])*\.js$/, use: { - loader: 'buble-loader', + loader: 'babel-loader', options: { - transforms: { - dangerousForOf: true, - }, + presets: [['@babel/preset-env', {targets: 'ie 11'}]], }, }, - include: [ - path.join(baseDir, '..', '..', 'src'), - path.join(baseDir, '..'), - path.join( - baseDir, - '..', - '..', - 'node_modules', - '@mapbox', - 'mapbox-gl-style-spec' - ), - ], }, { test: /\.js$/, diff --git a/package-lock.json b/package-lock.json index b469c73f71..c058b5a446 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,8 +27,6 @@ "@types/pbf": "^3.0.2", "@types/topojson-specification": "^1.0.1", "babel-loader": "^8.2.2", - "buble": "^0.20.0", - "buble-loader": "^0.5.1", "chaikin-smooth": "^1.0.4", "clean-css-cli": "5.3.3", "copy-webpack-plugin": "^9.0.0", @@ -2323,6 +2321,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", "dev": true, + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2330,15 +2329,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-dynamic-import": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", - "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0" - } - }, "node_modules/acorn-jsx": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", @@ -2848,54 +2838,6 @@ "url": "https://opencollective.com/browserslist" } }, - "node_modules/buble": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/buble/-/buble-0.20.0.tgz", - "integrity": "sha512-/1gnaMQE8xvd5qsNBl+iTuyjJ9XxeaVxAMF86dQ4EyxFJOZtsgOS8Ra+7WHgZTam5IFDtt4BguN0sH0tVTKrOw==", - "dev": true, - "dependencies": { - "acorn": "^6.4.1", - "acorn-dynamic-import": "^4.0.0", - "acorn-jsx": "^5.2.0", - "chalk": "^2.4.2", - "magic-string": "^0.25.7", - "minimist": "^1.2.5", - "regexpu-core": "4.5.4" - }, - "bin": { - "buble": "bin/buble" - } - }, - "node_modules/buble-loader": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/buble-loader/-/buble-loader-0.5.1.tgz", - "integrity": "sha512-ytp2BqL4NfyImoXQUFcIkM2EgKJI2e8KEc9R5/7MbUmdu952CYkhkwydZcKreuC6VAUBp9R7rxS88TZ7RQq/3A==", - "dev": true, - "dependencies": { - "loader-utils": "^1.1.0" - }, - "peerDependencies": { - "buble": "*", - "webpack": "*" - } - }, - "node_modules/buble/node_modules/regexpu-core": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", - "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", - "dev": true, - "dependencies": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.0.2", - "regjsgen": "^0.5.0", - "regjsparser": "^0.6.0", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", @@ -13225,14 +13167,8 @@ "version": "6.4.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", - "dev": true - }, - "acorn-dynamic-import": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", - "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", "dev": true, - "requires": {} + "peer": true }, "acorn-jsx": { "version": "5.3.1", @@ -13627,46 +13563,6 @@ "node-releases": "^1.1.71" } }, - "buble": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/buble/-/buble-0.20.0.tgz", - "integrity": "sha512-/1gnaMQE8xvd5qsNBl+iTuyjJ9XxeaVxAMF86dQ4EyxFJOZtsgOS8Ra+7WHgZTam5IFDtt4BguN0sH0tVTKrOw==", - "dev": true, - "requires": { - "acorn": "^6.4.1", - "acorn-dynamic-import": "^4.0.0", - "acorn-jsx": "^5.2.0", - "chalk": "^2.4.2", - "magic-string": "^0.25.7", - "minimist": "^1.2.5", - "regexpu-core": "4.5.4" - }, - "dependencies": { - "regexpu-core": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", - "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", - "dev": true, - "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.0.2", - "regjsgen": "^0.5.0", - "regjsparser": "^0.6.0", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.1.0" - } - } - } - }, - "buble-loader": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/buble-loader/-/buble-loader-0.5.1.tgz", - "integrity": "sha512-ytp2BqL4NfyImoXQUFcIkM2EgKJI2e8KEc9R5/7MbUmdu952CYkhkwydZcKreuC6VAUBp9R7rxS88TZ7RQq/3A==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0" - } - }, "buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", diff --git a/package.json b/package.json index 081a86eca4..9a94cbcf01 100644 --- a/package.json +++ b/package.json @@ -63,8 +63,6 @@ "@types/pbf": "^3.0.2", "@types/topojson-specification": "^1.0.1", "babel-loader": "^8.2.2", - "buble": "^0.20.0", - "buble-loader": "^0.5.1", "chaikin-smooth": "^1.0.4", "clean-css-cli": "5.3.3", "copy-webpack-plugin": "^9.0.0",