Merge pull request #13995 from tschaub/browserslist

Remove IE workarounds for legacy build, examples, and workers
This commit is contained in:
Tim Schaub
2022-08-18 06:55:18 -06:00
committed by GitHub
4 changed files with 10 additions and 37 deletions

View File

@@ -2,30 +2,10 @@ import TerserPlugin from 'terser-webpack-plugin';
import path from 'path'; import path from 'path';
export default { export default {
entry: ['regenerator-runtime/runtime', './build/index.js'], entry: './build/index.js',
devtool: 'source-map', devtool: 'source-map',
mode: 'production', mode: 'production',
target: ['web', 'es5'], target: ['browserslist'],
module: {
rules: [
{
test: /\.m?js$/,
use: {
loader: 'babel-loader',
options: {
presets: [
[
'@babel/preset-env',
{
targets: 'last 2 versions, not dead',
},
],
],
},
},
},
],
},
resolve: { resolve: {
fallback: { fallback: {
fs: false, fs: false,

View File

@@ -10,31 +10,20 @@ const root = path.join(src, '..');
export default { export default {
context: src, context: src,
target: ['web', 'es5'], target: ['browserslist'],
entry: () => { entry: () => {
const entry = {}; const entry = {};
fs.readdirSync(src) fs.readdirSync(src)
.filter((name) => /^(?!index).*\.html$/.test(name)) .filter((name) => /^(?!index).*\.html$/.test(name))
.map((name) => name.replace(/\.html$/, '')) .map((name) => name.replace(/\.html$/, ''))
.forEach((example) => { .forEach((example) => {
entry[example] = ['regenerator-runtime/runtime', `./${example}.js`]; entry[example] = `./${example}.js`;
}); });
return entry; return entry;
}, },
stats: 'minimal', stats: 'minimal',
module: { module: {
rules: [ rules: [
{
test: /^((?!es2015-)[\s\S])*\.m?js$/,
use: {
loader: 'babel-loader',
options: {
presets: [
['@babel/preset-env', {targets: 'last 2 versions, not dead'}],
],
},
},
},
{ {
test: /\.js$/, test: /\.js$/,
use: { use: {

View File

@@ -99,7 +99,6 @@
"pngjs": "^6.0.0", "pngjs": "^6.0.0",
"proj4": "2.8.0", "proj4": "2.8.0",
"puppeteer": "16.1.0", "puppeteer": "16.1.0",
"regenerator-runtime": "^0.13.9",
"rollup": "^2.42.3", "rollup": "^2.42.3",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"semver": "^7.3.7", "semver": "^7.3.7",
@@ -134,6 +133,11 @@
] ]
} }
}, },
"browserslist": [
"> 1%",
"last 2 versions",
"not dead"
],
"sideEffects": [ "sideEffects": [
"proj.js", "proj.js",
"ol.css" "ol.css"

View File

@@ -28,7 +28,7 @@ async function build(input, {minify = true} = {}) {
'@babel/preset-env', '@babel/preset-env',
{ {
'modules': false, 'modules': false,
'targets': 'last 2 versions, not dead', 'targets': '> 1%, last 2 versions, not dead',
}, },
], ],
], ],