diff --git a/config/webpack-config-legacy-build.mjs b/config/webpack-config-legacy-build.mjs index 386c0eb70f..87e23f58a4 100644 --- a/config/webpack-config-legacy-build.mjs +++ b/config/webpack-config-legacy-build.mjs @@ -2,30 +2,10 @@ import TerserPlugin from 'terser-webpack-plugin'; import path from 'path'; export default { - entry: ['regenerator-runtime/runtime', './build/index.js'], + entry: './build/index.js', devtool: 'source-map', mode: 'production', - target: ['web', 'es5'], - module: { - rules: [ - { - test: /\.m?js$/, - use: { - loader: 'babel-loader', - options: { - presets: [ - [ - '@babel/preset-env', - { - targets: 'last 2 versions, not dead', - }, - ], - ], - }, - }, - }, - ], - }, + target: ['browserslist'], resolve: { fallback: { fs: false, diff --git a/examples/webpack/config.mjs b/examples/webpack/config.mjs index c0ceba7350..395ac2688d 100644 --- a/examples/webpack/config.mjs +++ b/examples/webpack/config.mjs @@ -10,31 +10,20 @@ const root = path.join(src, '..'); export default { context: src, - target: ['web', 'es5'], + target: ['browserslist'], entry: () => { const entry = {}; fs.readdirSync(src) .filter((name) => /^(?!index).*\.html$/.test(name)) .map((name) => name.replace(/\.html$/, '')) .forEach((example) => { - entry[example] = ['regenerator-runtime/runtime', `./${example}.js`]; + entry[example] = `./${example}.js`; }); return entry; }, stats: 'minimal', module: { rules: [ - { - test: /^((?!es2015-)[\s\S])*\.m?js$/, - use: { - loader: 'babel-loader', - options: { - presets: [ - ['@babel/preset-env', {targets: 'last 2 versions, not dead'}], - ], - }, - }, - }, { test: /\.js$/, use: { diff --git a/package.json b/package.json index c0aa632794..0a25b66a1d 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,6 @@ "pngjs": "^6.0.0", "proj4": "2.8.0", "puppeteer": "16.1.0", - "regenerator-runtime": "^0.13.9", "rollup": "^2.42.3", "rollup-plugin-terser": "^7.0.2", "semver": "^7.3.7", @@ -134,6 +133,11 @@ ] } }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not dead" + ], "sideEffects": [ "proj.js", "ol.css" diff --git a/tasks/serialize-workers.cjs b/tasks/serialize-workers.cjs index 5ab7af7ffa..7158697e2e 100644 --- a/tasks/serialize-workers.cjs +++ b/tasks/serialize-workers.cjs @@ -28,7 +28,7 @@ async function build(input, {minify = true} = {}) { '@babel/preset-env', { 'modules': false, - 'targets': 'last 2 versions, not dead', + 'targets': '> 1%, last 2 versions, not dead', }, ], ],