From 8ac5ebc12b8cf3d76865f0ac9f0212b998c48089 Mon Sep 17 00:00:00 2001 From: TJKoury Date: Wed, 15 Jan 2020 08:13:10 -0500 Subject: [PATCH] unflag es6 Node >= 13.2.0 --- .gulp.json | 5 +++++ Specs/.eslintrc.json | 2 +- Specs/{karma.conf.js => karma.conf.cjs} | 0 gulpfile.js => gulpfile.cjs | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .gulp.json rename Specs/{karma.conf.js => karma.conf.cjs} (100%) rename gulpfile.js => gulpfile.cjs (99%) diff --git a/.gulp.json b/.gulp.json new file mode 100644 index 000000000000..6cdb49a589be --- /dev/null +++ b/.gulp.json @@ -0,0 +1,5 @@ +{ + "flags": { + "gulpfile": "gulpfile.cjs" + } +} diff --git a/Specs/.eslintrc.json b/Specs/.eslintrc.json index 253d3533baa8..b1a827ceac51 100644 --- a/Specs/.eslintrc.json +++ b/Specs/.eslintrc.json @@ -9,7 +9,7 @@ "overrides": [ { "files": [ - "karma.conf.js" + "karma.conf.cjs" ], "parserOptions": { "sourceType": "script" diff --git a/Specs/karma.conf.js b/Specs/karma.conf.cjs similarity index 100% rename from Specs/karma.conf.js rename to Specs/karma.conf.cjs diff --git a/gulpfile.js b/gulpfile.cjs similarity index 99% rename from gulpfile.js rename to gulpfile.cjs index 1bf4729adf95..5c5b202b4b46 100644 --- a/gulpfile.js +++ b/gulpfile.cjs @@ -41,7 +41,7 @@ if (/\.0$/.test(version)) { version = version.substring(0, version.length - 2); } -var karmaConfigFile = path.join(__dirname, 'Specs/karma.conf.js'); +var karmaConfigFile = path.join(__dirname, 'Specs/karma.conf.cjs'); var travisDeployUrl = 'http://cesium-dev.s3-website-us-east-1.amazonaws.com/cesium/'; //Gulp doesn't seem to have a way to get the currently running tasks for setting @@ -101,7 +101,7 @@ var filesToConvertES6 = ['Source/**/*.js', '!Source/Workers/cesiumWorkerBootstrapper.js', '!Source/Workers/transferTypedArrayTest.js', '!Specs/karma-main.js', - '!Specs/karma.conf.js', + '!Specs/karma.conf.cjs', '!Specs/spec-main.js', '!Specs/SpecList.js', '!Specs/TestWorkers/**'