Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ES6 at Last #8224

Merged
merged 32 commits into from
Oct 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
36cd68c
Get Cesium Viewer working using ES6
mramato Sep 19, 2019
7576e7c
Add rollup plugin to strip pragmas
shehzan10 Sep 20, 2019
c2f20b3
Get ES6 unit tests and coverage running
mramato Sep 20, 2019
b7cc90f
Merge pull request #8186 from shehzan10/es6-playground-strip-pragmas
mramato Sep 20, 2019
4fa71fd
Merge pull request #8199 from AnalyticalGraphicsInc/es6-tests
mramato Sep 20, 2019
9caba82
Merge remote-tracking branch 'origin/es6-staging' into es6-viewer
mramato Sep 21, 2019
8ec945f
Remove requirejs and update packaging for ES6
mramato Sep 21, 2019
57b4102
Merge pull request #8210 from AnalyticalGraphicsInc/es6-build
mramato Sep 21, 2019
6d9a2e4
Can't used const in Cesium yet.
mramato Sep 21, 2019
eb08e42
Sandcastle support for Cesium ES6
mramato Sep 22, 2019
ef1e02d
Merge pull request #8211 from AnalyticalGraphicsInc/es6-sandcastle
mramato Sep 22, 2019
b4ac007
Fix Timeline demo
mramato Sep 22, 2019
0c8e08a
Merge branch 'es6-staging' into es6-viewer
mramato Sep 24, 2019
332fc06
Fixes after merge.
mramato Sep 24, 2019
4d17065
Minor clean-up
mramato Sep 24, 2019
cae2a7e
Merge remote-tracking branch 'origin/es6-staging' into es6-viewer
mramato Sep 24, 2019
7ecc56c
Get specs and travis passing
mramato Sep 25, 2019
fca8740
Merge remote-tracking branch 'origin/es6-staging' into es6-viewer
mramato Sep 25, 2019
47556c3
Workers -> WorkersES6, Workers/Build -> Workers
mramato Sep 25, 2019
c7b295e
Merge pull request #8221 from AnalyticalGraphicsInc/es6-move-workers
mramato Sep 25, 2019
e7efbd2
Fix gallery index on travis
mramato Sep 25, 2019
b2dc8a6
Make rollup-plugin-strip-pragma its own npm module.
mramato Sep 25, 2019
0bd0db5
Ability to run specs against built versions of cesium.
mramato Sep 25, 2019
da62eb2
Merge pull request #8223 from AnalyticalGraphicsInc/built-specs
mramato Sep 25, 2019
ad9f5cb
Merge remote-tracking branch 'origin/es6-staging' into es6-viewer
mramato Sep 25, 2019
5f2bc5b
Remove almond.
mramato Sep 25, 2019
728f85b
Fix cloc, use built version for windows appveyor.
mramato Sep 26, 2019
eb16851
Avoid polluting global namespace in Node.js.
mramato Sep 26, 2019
84a2fbf
Fix convertToModules
mramato Sep 28, 2019
acd123e
Merge remote-tracking branch 'origin/es6-staging' into es6-at-last
mramato Oct 1, 2019
0fd9486
Changes after review.
mramato Oct 3, 2019
b03d680
Fix built Sandcastle open in standalone.
mramato Oct 3, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ install:
- npm install

test_script:
- npm --silent run build
- npm --silent run test -- --browsers IE --webgl-stub --suppressPassed
- npm --silent run minifyRelease
- npm --silent run build-specs
- npm --silent run test -- --browsers IE --webgl-stub --release --suppressPassed

# Don't actually build.
build: off
5 changes: 4 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ Build/**
Documentation/**
Source/Shaders/**
Source/ThirdParty/**
Source/Workers/cesiumWorkerBootstrapper.js
Source/Workers/**
!Source/Workers/transferTypedArrayTest.js
ThirdParty/**
Tools/**
Apps/Sandcastle/jsHintOptions.js
Apps/Sandcastle/gallery/gallery-index.js
Source/Core/buildModuleUrl.js
Specs/spec-main.js
15 changes: 14 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,18 @@
],
"rules": {
"no-unused-vars": ["error", {"vars": "all", "args": "none"}]
}
},
"overrides": [
{
"files": [
"index.js",
"server.js",
"gulpfile.js",
"Source/Workers/transferTypedArrayTest.js"
],
"parserOptions": {
"sourceType": "script"
}
}
]
}
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Thumbs.db

/Source/Cesium.js

/Source/Shaders/*.js
/Source/Shaders/*/*.js
/Source/Shaders/*/*/*.js
/Source/ThirdParty/Shaders/*.js

/Specs/SpecList.js
/Source/Shaders/**/*.js
/Source/ThirdParty/Shaders/**/*.js
/Source/Workers/**
!/Source/Workers/cesiumWorkerBootstrapper.js
!/Source/Workers/transferTypedArrayTest.js

/node_modules
npm-debug.log
Expand Down
4 changes: 2 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
/.travis.yml
/.vscode
/Apps
/Build/Apps
/Build/Coverage
/Build/minifyShaders.state
/Build/Stubs
/Build/Documentation
/Build/Specs
/Cesium-*.zip
/Documentation
/favicon.ico
Expand All @@ -24,7 +25,6 @@
/launches
/server.js
/Source/copyrightHeader.js
/Source/main.js
/Specs
/ThirdParty
/Tools
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ script:
- npm --silent run deploy-s3 -- -b cesium-dev -d cesium/$TRAVIS_BRANCH --confirm -c 'no-cache'
- npm --silent run deploy-status -- --status success --message Deployed

- npm --silent run build-specs
- npm --silent run test -- --browsers ChromeCI --failTaskOnError --webgl-stub --release --suppressPassed

# Various Node.js smoke-screen tests
Expand Down
11 changes: 0 additions & 11 deletions Apps/CesiumViewer/CesiumViewerStartup.js

This file was deleted.

2 changes: 1 addition & 1 deletion Apps/CesiumViewer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<title>Cesium Viewer</title>
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="CesiumViewer.css" media="screen">
<script data-main="CesiumViewerStartup" src="../../ThirdParty/requirejs-2.1.20/require.js"></script>
</head>
<body style="background: #000;">
<div id="cesiumContainer" class="fullWindow"></div>
<div id="loadingIndicator" class="loadingIndicator"></div>
<script src="CesiumViewer.js" type="module"></script>
</body>
</html>
20 changes: 19 additions & 1 deletion Apps/Sandcastle/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,34 @@
{
"extends": "../../.eslintrc.json",
"env": {
"amd": true
},
"globals": {
"JSON": true,
"require": true,
"console": true,
"Sandcastle": true,
"Cesium": true
},
"parserOptions": {
"ecmaVersion": 5,
"sourceType": "script"
},
"rules": {
"no-alert": ["off"],
"no-implicit-globals": "off",
"no-unused-vars": ["off"],
"quotes": "off"
}
},
"overrides": [
{
"files": [
"load-cesium-es6.js"
],
"parserOptions": {
"ecmaVersion": 2015,
"sourceType": "module"
}
}
]
}
Loading