Merge branch 'master' into pixelRatioFrustum

.appveyor.yml

@@ -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

.eslintignore

@@ -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

.eslintrc.json

@@ -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"
+            }
+        }
+    ]
 }

.gitignore

@@ -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

.npmignore

@@ -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
@@ -24,7 +25,6 @@
 /launches
 /server.js
 /Source/copyrightHeader.js
-/Source/main.js
 /Specs
 /ThirdParty
 /Tools

.travis.yml

@@ -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

Apps/CesiumViewer/CesiumViewer.js

@@ -1,36 +1,21 @@
-define([
-        'Cesium/Core/Cartesian3',
-        'Cesium/Core/createWorldTerrain',
-        'Cesium/Core/defined',
-        'Cesium/Core/formatError',
-        'Cesium/Core/Math',
-        'Cesium/Core/objectToQuery',
-        'Cesium/Core/queryToObject',
-        'Cesium/DataSources/CzmlDataSource',
-        'Cesium/DataSources/GeoJsonDataSource',
-        'Cesium/DataSources/KmlDataSource',
-        'Cesium/Scene/TileMapServiceImageryProvider',
-        'Cesium/Widgets/Viewer/Viewer',
-        'Cesium/Widgets/Viewer/viewerCesiumInspectorMixin',
-        'Cesium/Widgets/Viewer/viewerDragDropMixin',
-        'domReady!'
-    ], function(
-        Cartesian3,
-        createWorldTerrain,
-        defined,
-        formatError,
-        CesiumMath,
-        objectToQuery,
-        queryToObject,
-        CzmlDataSource,
-        GeoJsonDataSource,
-        KmlDataSource,
-        TileMapServiceImageryProvider,
-        Viewer,
-        viewerCesiumInspectorMixin,
-        viewerDragDropMixin) {
-    'use strict';
-
+import {
+    Cartesian3,
+    createWorldTerrain,
+    defined,
+    formatError,
+    Math as CesiumMath,
+    objectToQuery,
+    queryToObject,
+    CzmlDataSource,
+    GeoJsonDataSource,
+    KmlDataSource,
+    TileMapServiceImageryProvider,
+    Viewer,
+    viewerCesiumInspectorMixin,
+    viewerDragDropMixin
+} from '../../Source/Cesium.js';
+
+function main() {
     /*
      Options parsed from query string:
        source=url          The URL of a CZML/GeoJSON/KML data source to load at startup.
@@ -218,4 +203,6 @@ define([
     }
 
     loadingIndicator.style.display = 'none';
-});
+}
+
+main();

Apps/CesiumViewer/index.html

@@ -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>

Apps/Sandcastle/.eslintrc.json

@@ -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"
+            }
+        }
+    ]
 }