From c276f0263bf320438aeae7e3efe188b4f5559e02 Mon Sep 17 00:00:00 2001
From: Matthew Amato <matt.amato@gmail.com>
Date: Mon, 2 Mar 2020 09:39:37 -0500
Subject: [PATCH] Make Cesium release server work on Node 12.

While we still can't use Node 12 for Cesium development, this change is
to make sure Cesium release zips can actually work under Node 12.
---
 .eslintrc.json          | 2 +-
 .npmignore              | 2 +-
 .vscode/launch.json     | 4 ++--
 gulpfile.js             | 4 ++--
 package.json            | 6 +++---
 server.js => server.cjs | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename server.js => server.cjs (98%)

diff --git a/.eslintrc.json b/.eslintrc.json
index 6c69dcbf3be5..03dab94dea3a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -10,7 +10,7 @@
         {
             "files": [
                 "index.js",
-                "server.js",
+                "server.cjs",
                 "gulpfile.js",
                 "Source/Workers/transferTypedArrayTest.js"
             ],
diff --git a/.npmignore b/.npmignore
index 98c5270d4a0e..b6218280c65f 100644
--- a/.npmignore
+++ b/.npmignore
@@ -23,7 +23,7 @@
 /index.html
 /index.release.html
 /launches
-/server.js
+/server.cjs
 /Source/copyrightHeader.js
 /Specs
 /ThirdParty
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 85fb445c2db3..98648ed40a0b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,7 +8,7 @@
             "type": "node",
             "request": "launch",
             "name": "Launch Program",
-            "program": "${workspaceRoot}\\server.js",
+            "program": "${workspaceRoot}\\server.cjs",
             "cwd": "${workspaceRoot}"
         },
         {
@@ -18,4 +18,4 @@
             "port": 5858
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/gulpfile.js b/gulpfile.js
index 257d29915a57..4bf30b5db619 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -342,7 +342,7 @@ gulp.task('makeZipFile', gulp.series('release', function() {
         'ThirdParty/**',
         'favicon.ico',
         'gulpfile.js',
-        'server.js',
+        'server.cjs',
         'package.json',
         'LICENSE.md',
         'CHANGES.md',
@@ -460,7 +460,7 @@ function deployCesium(bucketName, uploadDirectory, cacheControl, done) {
                 'gulpfile.js',
                 'index.html',
                 'package.json',
-                'server.js',
+                'server.cjs',
                 'web.config',
                 '*.zip',
                 '*.tgz'
diff --git a/package.json b/package.json
index cab2953f876d..6c5570bf08a6 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "eslint": "^6.4.0",
     "eslint-plugin-html": "^6.0.0",
     "express": "^4.15.0",
-    "globby": "^10.0.0",
+    "globby": "^11.0.0",
     "glsl-strip-comments": "^1.0.0",
     "gulp": "^4.0.0",
     "gulp-clean-css": "^4.2.0",
@@ -82,8 +82,8 @@
   },
   "scripts": {
     "convertToModules": "gulp convertToModules",
-    "start": "node server.js",
-    "startPublic": "node server.js --public",
+    "start": "node server.cjs",
+    "startPublic": "node server.cjs --public",
     "build": "gulp build",
     "build-watch": "gulp build-watch",
     "buildApps": "gulp buildApps",
diff --git a/server.js b/server.cjs
similarity index 98%
rename from server.js
rename to server.cjs
index ff99c406902b..59fa98628478 100644
--- a/server.js
+++ b/server.cjs
@@ -170,7 +170,7 @@
     server.on('error', function (e) {
         if (e.code === 'EADDRINUSE') {
             console.log('Error: Port %d is already in use, select a different port.', argv.port);
-            console.log('Example: node server.js --port %d', argv.port + 1);
+            console.log('Example: node server.cjs --port %d', argv.port + 1);
         } else if (e.code === 'EACCES') {
             console.log('Error: This process does not have permission to listen on port %d.', argv.port);
             if (argv.port < 1024) {