Use the @babel/preset-env to select working list of browser

Partially revert 5179ba0#diff-cac2d12981119fd024d4f6ec349cc35509079b5f3601a5ceaf32920535788047
camptocamp · Sep 15, 2023 · f97846f · f97846f
1 parent eabd7c7
commit f97846f
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 22 deletions.
diff --git a/buildtools/webpack.api.js b/buildtools/webpack.api.js
@@ -39,9 +39,13 @@ module.exports = (env, argv) => {
             options: {
               babelrc: false,
               comments: false,
-              plugins: [
-                require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
-                require.resolve('@babel/plugin-proposal-optional-chaining'),
+              presets: [
+                [
+                  '@babel/preset-env',
+                  {
+                    targets: require('./webpack.share').browsers,
+                  },
+                ],
               ],
             },
           },

diff --git a/buildtools/webpack.commons.js b/buildtools/webpack.commons.js
@@ -49,6 +49,15 @@ module.exports = function (config) {
     $: 'jquery',
   });
 
+  const babelPresetEnv = [
+    require.resolve('@babel/preset-env'),
+    {
+      targets: config.browsers || require('./webpack.share').browsers,
+      debug: true,
+      loose: true,
+    },
+  ];
+
   // Expose corejs-typeahead as window.Bloodhound
   const typeaheadRule = {
     test: require.resolve('corejs-typeahead'),
@@ -144,16 +153,14 @@ module.exports = function (config) {
         assumptions: {
           setPublicClassFields: true,
         },
+        presets: [babelPresetEnv],
         plugins: [
           [
             require.resolve('@babel/plugin-transform-typescript'),
             // TODO remove allowDeclareFields with Babel 8
             {allowDeclareFields: true},
           ],
           [require.resolve('@babel/plugin-proposal-decorators'), {decoratorsBeforeExport: true}],
-          require.resolve('@babel/plugin-proposal-class-properties'),
-          require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
-          require.resolve('@babel/plugin-proposal-optional-chaining'),
         ],
       },
     },
@@ -173,11 +180,8 @@ module.exports = function (config) {
       options: {
         babelrc: false,
         comments: false,
-        plugins: [
-          require.resolve('babel-plugin-angularjs-annotate'),
-          require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
-          require.resolve('@babel/plugin-proposal-optional-chaining'),
-        ],
+        presets: [babelPresetEnv],
+        plugins: [require.resolve('babel-plugin-angularjs-annotate')],
       },
     },
   };
@@ -200,10 +204,7 @@ module.exports = function (config) {
       options: {
         babelrc: false,
         comments: false,
-        plugins: [
-          require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
-          require.resolve('@babel/plugin-proposal-optional-chaining'),
-        ],
+        presets: [babelPresetEnv],
       },
     },
   };

diff --git a/buildtools/webpack.config.dll.js b/buildtools/webpack.config.dll.js
@@ -41,9 +41,13 @@ module.exports = {
           options: {
             babelrc: false,
             comments: false,
-            plugins: [
-              require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
-              require.resolve('@babel/plugin-proposal-optional-chaining'),
+            presets: [
+              [
+                require.resolve('@babel/preset-env'),
+                {
+                  targets: require('./webpack.share').browsers,
+                },
+              ],
             ],
           },
         },

diff --git a/buildtools/webpack.share.js b/buildtools/webpack.share.js
@@ -0,0 +1,25 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2018-2023 Camptocamp SA
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module.exports = {
+  // see: npx browserslist '> 0.7% in CH or > 0.7% in FR or Firefox ESR'
+  browsers: 'defaults, > 0.1% in CH, > 0.1% in FR, Firefox ESR and supports es6-class and not iOS < 10',
+};
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2017-2021 Camptocamp SA
+// Copyright (c) 2017-2023 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -32,9 +32,6 @@ module.exports = (env, args) => {
     case 'dist':
       common_config.nodll = true;
       break;
-    case 'ngeo-examples':
-    case 'gmf-examples':
-      common_config.browsers = ['> 0.5% in CH', '> 0.5% in FR', 'Firefox ESR', 'ie 11'];
   }
   let config = require('./buildtools/webpack.commons')(common_config);