From aca28c3ccf1eb5c5bd5e2dd2623cad9ca0d58e02 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 6 Jun 2024 13:49:03 +0200 Subject: [PATCH 1/3] set target es2016 --- .circleci/config.yml | 2 +- .eslintrc | 2 +- package.json | 2 +- stackgl_modules/webpack.config.js | 2 +- tasks/{no_es6_dist.js => no_es2017_dist.js} | 2 +- test/jasmine/karma.conf.js | 2 +- webpack.config.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename tasks/{no_es6_dist.js => no_es2017_dist.js} (97%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 85df3ccb7b2..48e6e075cef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -488,7 +488,7 @@ jobs: command: npm run test-requirejs - run: name: Test plotly bundles against es6 - command: npm run no-es6-dist + command: npm run no-es2017-dist - run: name: Display function constructors in all bundles command: npm run no-new-func diff --git a/.eslintrc b/.eslintrc index 5af89ce0f25..e5cd8d50362 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,7 +4,7 @@ "eslint:recommended" ], "parserOptions": { - "ecmaVersion": 5 + "ecmaVersion": 2016 }, "env": { "commonjs": true diff --git a/package.json b/package.json index 84854a19331..f1a871a243a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "no-new-func": "eslint --no-ignore --no-eslintrc --no-inline-config --rule '{no-new-func: warn}' $(find dist -type f -iname '*.js')", "no-bad-char": "eslint --no-ignore --no-eslintrc --no-inline-config --rule '{no-misleading-character-class: error}' $(find dist -type f -iname '*.js' | grep plotly)", "no-dup-keys": "eslint --no-ignore --no-eslintrc --no-inline-config --rule '{no-dupe-keys: error}' $(find dist -type f -iname '*.js' | grep plotly)", - "no-es6-dist": "node tasks/no_es6_dist.js", + "no-es2017-dist": "node tasks/no_es2017_dist.js", "pretest": "node tasks/pretest.js", "test-jasmine": "karma start test/jasmine/karma.conf.js", "test-mock": "node tasks/test_mock.js", diff --git a/stackgl_modules/webpack.config.js b/stackgl_modules/webpack.config.js index a8adc153ff7..342b6d135b8 100644 --- a/stackgl_modules/webpack.config.js +++ b/stackgl_modules/webpack.config.js @@ -1,7 +1,7 @@ var path = require('path'); module.exports = { - target: ['web', 'es5'], + target: ['web', 'es2016'], entry: './main.js', output: { path: path.resolve('.'), diff --git a/tasks/no_es6_dist.js b/tasks/no_es2017_dist.js similarity index 97% rename from tasks/no_es6_dist.js rename to tasks/no_es2017_dist.js index bfd00fb8ae5..c747bd87519 100644 --- a/tasks/no_es6_dist.js +++ b/tasks/no_es2017_dist.js @@ -16,7 +16,7 @@ function assertES5() { ignore: false, overrideConfig: { parserOptions: { - ecmaVersion: 5 + ecmaVersion: 2016 } } }); diff --git a/test/jasmine/karma.conf.js b/test/jasmine/karma.conf.js index 7ed9a6d0f43..0f36a1ec4b4 100644 --- a/test/jasmine/karma.conf.js +++ b/test/jasmine/karma.conf.js @@ -263,7 +263,7 @@ func.defaultConfig = { }, webpack: { - target: ['web', 'es5'], + target: ['web', 'es2016'], module: { rules: webpackConfig.module.rules }, diff --git a/webpack.config.js b/webpack.config.js index cf24ca8e46b..d4cc8516d8a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,7 +2,7 @@ var path = require('path'); var NodePolyfillPlugin = require('node-polyfill-webpack-plugin'); module.exports = { - target: ['web', 'es5'], + target: ['web', 'es2016'], entry: './lib/index.js', output: { path: path.resolve('./build'), From 9cb2fb2f29b85237701e4c1b233b8515ee8c8226 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 6 Jun 2024 13:58:26 +0200 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 323f200ffce..46032659020 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ To see all merged commits on the master branch that will be part of the next plo where X.Y.Z is the semver of most recent plotly.js release. +## [next-major] + +### Breaking + - Bump build target to 2016, and drop IE support [[#7017](https://github.com/plotly/plotly.js/pull/7017)] + ## [2.33.0] -- 2024-05-29 ### Added From 5304d0d9a6933405c2a60d79bf24ce2b6718c4e7 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 6 Jun 2024 13:58:57 +0200 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46032659020..91bd0cec185 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ where X.Y.Z is the semver of most recent plotly.js release. ## [next-major] ### Breaking - - Bump build target to 2016, and drop IE support [[#7017](https://github.com/plotly/plotly.js/pull/7017)] + - Bump build target from ES5 to ES2016, and drop IE support [[#7017](https://github.com/plotly/plotly.js/pull/7017)] ## [2.33.0] -- 2024-05-29