Skip to content

Commit c276f02

Browse files
committed
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.
1 parent 6048170 commit c276f02

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.eslintrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{
1111
"files": [
1212
"index.js",
13-
"server.js",
13+
"server.cjs",
1414
"gulpfile.js",
1515
"Source/Workers/transferTypedArrayTest.js"
1616
],

.npmignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/index.html
2424
/index.release.html
2525
/launches
26-
/server.js
26+
/server.cjs
2727
/Source/copyrightHeader.js
2828
/Specs
2929
/ThirdParty

.vscode/launch.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"type": "node",
99
"request": "launch",
1010
"name": "Launch Program",
11-
"program": "${workspaceRoot}\\server.js",
11+
"program": "${workspaceRoot}\\server.cjs",
1212
"cwd": "${workspaceRoot}"
1313
},
1414
{
@@ -18,4 +18,4 @@
1818
"port": 5858
1919
}
2020
]
21-
}
21+
}

gulpfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ gulp.task('makeZipFile', gulp.series('release', function() {
342342
'ThirdParty/**',
343343
'favicon.ico',
344344
'gulpfile.js',
345-
'server.js',
345+
'server.cjs',
346346
'package.json',
347347
'LICENSE.md',
348348
'CHANGES.md',
@@ -460,7 +460,7 @@ function deployCesium(bucketName, uploadDirectory, cacheControl, done) {
460460
'gulpfile.js',
461461
'index.html',
462462
'package.json',
463-
'server.js',
463+
'server.cjs',
464464
'web.config',
465465
'*.zip',
466466
'*.tgz'

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"eslint": "^6.4.0",
4444
"eslint-plugin-html": "^6.0.0",
4545
"express": "^4.15.0",
46-
"globby": "^10.0.0",
46+
"globby": "^11.0.0",
4747
"glsl-strip-comments": "^1.0.0",
4848
"gulp": "^4.0.0",
4949
"gulp-clean-css": "^4.2.0",
@@ -82,8 +82,8 @@
8282
},
8383
"scripts": {
8484
"convertToModules": "gulp convertToModules",
85-
"start": "node server.js",
86-
"startPublic": "node server.js --public",
85+
"start": "node server.cjs",
86+
"startPublic": "node server.cjs --public",
8787
"build": "gulp build",
8888
"build-watch": "gulp build-watch",
8989
"buildApps": "gulp buildApps",

server.js server.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
server.on('error', function (e) {
171171
if (e.code === 'EADDRINUSE') {
172172
console.log('Error: Port %d is already in use, select a different port.', argv.port);
173-
console.log('Example: node server.js --port %d', argv.port + 1);
173+
console.log('Example: node server.cjs --port %d', argv.port + 1);
174174
} else if (e.code === 'EACCES') {
175175
console.log('Error: This process does not have permission to listen on port %d.', argv.port);
176176
if (argv.port < 1024) {

0 commit comments

Comments
 (0)