Commit Graph

38 Commits

Author SHA1 Message Date
Frederic Junod 241a27edf8 Update prettier to version ^2.1.1 2020-08-28 10:15:42 +02:00
Matthew Amato 2fd0e8f7e4 Format all code with prettier 2020-04-16 20:31:36 -04:00
Matthew Amato aabd27a760 Migrate Cesium to ES6 Modules
See https://github.com/AnalyticalGraphicsInc/cesium/pull/8224 for details.

eslint
There are a handful of new .eslintrc.json files, mostly to identify the files that are still AMD modules (Sandcastle/Workers). These are needed because you can't change the parser type with a comment directive (since the parser is the thing reading the file). We can finally detect unusued modules! So those have all been cleaned up as well.

requirejs -> rollup & clean-css
requirejs, almond, and karma-requirejs have all been removed. We now use rollup for building and minifying (via uglify) JS code and clean-css for css. These changes are fairly straight-forward and just involve calling rollup instead of requirejs in the build process.

Overall build time is significantly faster. CI is ~11 minutes compared to ~17 in master. Running makeZipFile on my machine takes 69 seconds compared to 112 seconds in master. There's probably plenty of room for additional optimization here too.

We wrote an published a small npm module, rollup-plugin-strip-pragma, for stripping the requirejs pragmas we use out of the release builds. This is maintained in the Tools/rollup-plugin-strip-pragma directory.

As for what we produce. The built version of Cesium is now a UMD module. So it should work anywhere that hasn't made the jump to ES6 yet. For users that were already using the "legacy" combined/minified approach, nothing changes.

One awesome thing about roll-up is that it compiles all of the workers at once and automatically detects shared codes and generates separate bundles under the hood. This means the size of our worker modules shrink dramatically and Cesium itself will load them much faster. The total minified/gzipped size of all workers in master is 2.6 MB compared to 225 KB in this branch! This should be most noticeable on demos like Geometry & Appearances which load lots of workers for the various geometry typs.

roll-up is also used to build Cesium Viewer, which is now an ES6 app.

We use clean-css via gulp and it is also a straightforward change from requirejs that requires no special mention.

Workers
While the spec allows for ES6 Web Workers, no browser actually supports them yet. That means we needed a way to get our workers into non-ES6 form. Thankfully, roll-up can generate AMD modules, which means we now have a build step to compile our Worker source code back into AMD and use the existing TaskProcessor to load and execute them. This build step is part of the standard build task and is called createWorkers. During development, these "built" workers are un-optimized so you can still debug them and read the code.

Since there is a build step, that means if you are changing code that affects a worker, you need to re-run build, or you can use the build-watch task to do it automatically.

The ES6 versions of Worker code has moved into Source/WorkersES6 and we build the workers into their "old home" of Source/Workers. cesiumWorkerBootstrapper and transferTypedArrayTest which were already non-AMD ES5 scripts remain living in the Workers directory.

Surprisingly little was changed about TaskProcessor or the worker system in general, especially considering that I thought this would be one of the major hurdles.

ThirdParty
A lot of our ThirdParty either already had a hand-written wrapper for AMD (which I updated to ES6) or had UMD which created problems when importing the same code in both Node and the browser. I basically had to update the wrapper of every third-party library to fix these problems. In some cases I updated the library version itself (Autolinker, topojson). Nothing to be too concerned about, but future clean-up would be using npm versions of these libraries and auto-generating the wrappers as needed so we don't hand-edit things.

Sandcastle
Sandcastle is eternal and manages to live another day in it's ancient requirejs/dojo 1.x form. Sandcastle now automatically uses the ES6 version of Cesium if it is available and fallsback to the ES5 unminified version if it is now. The built version of Sandcastle always uses CesiumUnminified, just like master. This means Sandcastle still works in IE11 if you run the combine step first (or use the relase zip)

Removed Cesium usage from Sandcastle proper, since it wasn't really needed
Generate a VERSION propertyin the gallery index since Cesium is no longer being included.
Remove requirejs from Sandcastle bucket
Update bucket to use the built version of Cesium if it is available by fallbackto the ES6 version during development.
Standalone.html was also updated
There's a bit of room for further clean-up here, but I think this gets us into master. I did not rename bucket-requirejs.html because I'm pretty sure it would break previously shared demos. We can put in some backwards compatible code later on if we want. (But I'd rather just see a full Sandcastle rewrite).

Specs
Specs are now all ES6, except for TestWorkers, which remain standard JS worker modules. This means you can no longer run the unbuilt unit tests in IE11. No changes for Chrome and Firefox.

Since the specs use ES6 modules and built Cesium is an ES5 UMD, I added a build-specs build step which generates a combined ES5 version of the specs which rely on Cesium as a global variable. We then inject these files into jasmine instead of the standard specs and everything works exactly as it did before. SpecRunner.html has been updated to inject the correct version of the script depending on the build/release query parameters.

The Specs must always use Cesium by importing Source/Cesium.js, this is so we can replace it with the built Cesium as describe above.

There's a bunch of room for clean-up here, such as unifying our two copies of jasmine into a single helper file, but I didn't want to start doing that clean-up as part of this already overly big PR. The important thing is that we can still test the built version and still test on IE/Edge as needed.

I also found and fixed two bugs that were causing failing unit tests, one in BingMapsImageryProviderSpec.js (which was overwriting createImage andnot setting it back) and ShadowVolumeAppearance.js (which had a module level caching bug). I think these may have been the cause of random CI failures in master as well, but only time will tell.

For coverage, we had to switch to karma-coverage-istanbul-instrumenter for native ES6 support, but that's it.

Finally, I updated appveryor to build Cesium and run the built tests under IE. We still don't fail the build for IE, but we should probably fix that if we want to keep it going.

NodeJS
When NODE_ENV is production, we now require in the minified CesiumJS directly, which works great because it's now a UMD module. Otherwise, we use the excellant esmpackage to load individual modules, it was a fairly straightforward swap from our old requirejs usage. We could probably drop esm too if we don't care about debugging or if we provie source maps at some point.
2019-10-03 11:51:23 -04:00
Matthew Amato 7f5cf310eb Update dojo 1.9.3 -> 1.10.4
The version we have is old and until Sandcastle gets its much needed
makeover, we should stay current with dependancies.
2015-11-21 10:46:07 -05:00
Matthew Amato 72dcba6670 Remove remnants of Chrome Frame
Fixes #3065
2015-10-13 19:58:09 -04:00
Matthew Amato 8aab494595 Update Dojo from 1.9.1 to 1.9.3. 2014-05-23 11:45:22 -04:00
Ed Mackey 6ba9516ece Fix #1160, and clear the canvas correctly.
The canvas used to be cleared by "resize" which would write
to the size even if it was unchanged.  Now that this is no
longer the case, it must be cleared manually.
2013-09-23 13:54:00 -04:00
Matthew Amato fee5ebc67c Update dojo to 1.9.1
Fixed #883
2013-07-08 15:55:08 -04:00
mramato 3622248964 Switch to minified version of dojo 1.9.
Delete uncompressed and dojox files.
2013-06-14 13:43:28 -04:00
Ed Mackey abf3a5a57c Change TimelineDemo to reflect proper theme names. 2013-03-21 16:05:58 -04:00
Matthew Amato 80fbe8baec Widget cleanup
1. The first parameter to each widget is now uniformly named and documented.  It can either be an element or string.
2. Each widget exposes a public `container` property, which is the element that was passed into the constructor.
3. `cesium-darker` is now the default theme, deleted `darker.css` files and replaced them with `lighter.css`  For each of use, there is now a `lighter.css` in the Widgets directory which just includes all other `lighter.css` files.

I plan on continuing widget cleanup, but decided it was better to make small, incremental pull requests rather than shoving everything together.
2013-03-21 14:02:25 -04:00
Ed Mackey af0f585ea4 Fix height of widget in Timeline Demo. 2013-02-24 11:43:03 -05:00
Matthew Amato 8734cabd1c Widget reorganization
1. Move widget specific code into subdirectories to make it easy to tell which pieces are shared or widget specific.
2. Break out darker css styling into separate files for Animation and Timeline.
3. Remove Dojo/TimelineWidget files since the dojo version isn't needed.
2013-02-21 13:10:47 -05:00
Matthew Amato f3153c8d98 Get rid of setScale & getScale.
Use the supplied parent elements size instead.  Properly handle non-uniform transforms.
Also fix a test I broken with my last commit.
2013-02-11 16:40:10 -05:00
Matthew Amato d27ead7f0a Merge branch 'master' into playback
Conflicts:
	Apps/TimelineDemo/index.html
2013-01-30 19:19:20 -05:00
Matthew Amato 42607fd268 Update to Dojo 1.8.3
1. Delete `ThirdParty/dojo-release-1.7.2-src`
2. Add `ThirdParty/dojo-release-1.8.3-src`
3. Update source with find and replace.

No other changes
2013-01-28 19:59:41 -05:00
Ed Mackey fc31679535 Rename Playback widget to Animation widget. 2013-01-16 12:13:42 -05:00
Ed Mackey ba3ae3e404 Fix Timeline Demo 2013-01-16 11:45:22 -05:00
Ed Mackey 9bca534e3c Fix after merge. 2013-01-02 16:28:27 -05:00
Ed Mackey 6b1ebd6257 Merge remote-tracking branch 'origin/master' into playback
Conflicts:
	Apps/TimelineDemo/TimelineDemo.js
	Apps/TimelineDemo/index.html
2013-01-02 16:25:10 -05:00
Ed Mackey 48902d6665 Throw an error if the end time comes before the start time. 2013-01-02 15:08:54 -05:00
Ed Mackey c1cea584d8 Started work on themeing the knob, plus minor tweaks. 2012-12-21 11:31:26 -05:00
Ed Mackey 5def181e63 More work on getting CSS values to affect SVG gradients. 2012-12-20 18:03:27 -05:00
Ed Mackey b49a685faf Working on some sample light/dark themes. Work in progress. 2012-12-20 16:48:37 -05:00
Ed Mackey d3189d07ce Playback tooltips, unpause, and ressurect the timeline darker theme. 2012-11-19 16:15:37 -05:00
Ed Mackey aa5e95fa73 Started hookup of Playback widget to animationController. 2012-11-19 14:34:16 -05:00
Ed Mackey e9fe0c46ec Imported buttons from SVG tests. 2012-11-19 13:25:26 -05:00
Ed Mackey 8fb6d7ab78 Add a background behind widgets in TimelineDemo. 2012-11-19 11:13:35 -05:00
Ed Mackey 5b3f15aa00 TimelineDemo tweaks. 2012-10-29 16:02:00 -04:00
Ed Mackey 781899fb30 Experimenting with SVG. 2012-10-23 17:56:16 -04:00
Ed Mackey bee4a0eaff Renamed 'Controls' back to 'Widgets', and moved DojoWidgets to be a subfolder of Widgets. That way, we won't have two different Widgets folders at the same level. 2012-07-26 21:34:46 -04:00
Ed Mackey 1d031a3635 Rename non-Dojo Cesium widgets to "Controls" to keep them separate from Cesium-provided Dojo Widgets. This will be helpful later when we wish to provide demo code that doesn't depend on Dojo, but uses the controls. 2012-07-22 17:18:26 -04:00
Matthew Amato 730f391c4b Tests for CompositeCzmlObjectCollection. 2012-06-25 22:29:30 -04:00
Ed Mackey a3c4097845 Added usage instructions for the timeline. 2012-06-25 16:17:19 -04:00
Matthew Amato adc3be8c72 Some clean up and enhancements to Timeline and its demo. 2012-06-25 14:29:54 -04:00
Matthew Amato daa0ae04f3 Rename Dojo to DojoWidgets and Controls to Widgets 2012-06-13 15:50:37 -04:00
Matthew Amato 28b0bd3738 Move non-app code out of the Apps directory and create two new directories under source. Dojo, for dojo dependant code, and Controls, for non-toolkit specific ui controls. 2012-05-30 10:27:28 -04:00
Matthew Amato d4b6d863cd Submit of original timeline prototype
1. Standalone Timeline in its own directory
2. Wrapper widget for dojo
3. Demo application.

The timeline will be completely refactored after the initial CZML implementation is completed.
2012-05-19 09:16:18 -04:00