Migration to v8 *DO NOT MERGE*

.gitignore

@@ -23,3 +23,4 @@ wwwroot/privateconfig.json
 deploy/packages/
 deploy/work/
 packages/
+pancake/

.travis.yml

@@ -1,9 +1,10 @@
 language: node_js
 node_js:
-- '8'
+- '10'
+- '14'
 install:
 - npm ci
 script:
 - gulp lint release
 env:
-- NODE_OPTIONS=--max_old_space_size=2048
+- NODE_OPTIONS=--max_old_space_size=4096

CHANGES.md

@@ -3,6 +3,17 @@ Change Log
 
 ### 2019-09-17
 * Fix manifest.json start_url
+### MobX Development
+
+* Fix manifest.json start_url 
+* Move About & Related Maps to left hand side
+* Default to console analytics in development
+* Allow translation overrides via gulp
+* Re-enabled disclaimer via newly ported disclaimer component
+* Re-enabled measure tool
+* Development builds sped up by 3~20x - ts-loader is now optional & TypeScript being transpiled by babel-loader, keeping type check safety on a separate thread
+* Added default help content & `languageOverrides.json` for i18n
+* Add back updateApplicationOnMessageFromParentWindow
 
 ### Next Release
 

buildprocess/webpack.config.js

@@ -17,7 +17,7 @@ module.exports = function(devMode, hot) {
             sourcePrefix: '', // to avoid breaking multi-line string literals by inserting extra tabs.
             globalObject: '(self || window)' // to avoid breaking in web worker (https://github.com/webpack/webpack/issues/6642)
         },
-        devtool: devMode ? 'cheap-inline-source-map' : 'source-map',
+        devtool: devMode ? 'eval-cheap-module-source-map' : 'source-map',
         module: {
             rules: [
                 {
@@ -26,22 +26,60 @@ module.exports = function(devMode, hot) {
                     loader: 'raw-loader'
                 },
                 {
-                    test: /\.(js|jsx)$/,
+                    test: /\.(ts|js)x?$/,
                     include: [
                         path.resolve(__dirname, '..', 'index.js'),
                         path.resolve(__dirname, '..', 'entry.js'),
                         path.resolve(__dirname, '..', 'lib')
-
                     ],
-                    loader: 'babel-loader',
-                    options: {
-                        sourceMap: false, // generated sourcemaps are currently bad, see https://phabricator.babeljs.io/T7257
-                        presets: ['@babel/preset-env', '@babel/preset-react'],
-                        plugins: [
-                            'babel-plugin-jsx-control-statements',
-                            '@babel/plugin-transform-modules-commonjs'
-                        ]
-                    }
+                    use: [
+                        {
+                            // Replace Babel's super.property getter with one that is MobX aware.
+                            loader: require.resolve('string-replace-loader'),
+                            options: {
+                                search: 'function _get\\(target, property, receiver\\).*',
+                                replace: 'var _get = require(\'terriajs/lib/Core/superGet\').default;',
+                                flags: 'g'
+                            }
+                        },
+                        {
+                            loader: 'babel-loader',
+                            options: {
+                                cacheDirectory: true,
+                                presets: [
+                                  [
+                                    '@babel/preset-env',
+                                    {
+                                      corejs: 3,
+                                      useBuiltIns: "usage"
+                                    }
+                                  ],
+                                  '@babel/preset-react',
+                                  ['@babel/typescript', {allowNamespaces: true}]
+                                ],
+                                plugins: [
+                                    'babel-plugin-jsx-control-statements',
+                                    '@babel/plugin-transform-modules-commonjs',
+                                    ["@babel/plugin-proposal-decorators", { "legacy": true }],
+                                    '@babel/proposal-class-properties',
+                                    '@babel/proposal-object-rest-spread',
+                                    'babel-plugin-styled-components',
+                                    require.resolve('@babel/plugin-syntax-dynamic-import')
+                                ]
+                            }
+                        },
+                        // Re-enable this if we need to observe any differences in the
+                        // transpilation via ts-loader, & babel's stripping of types,
+                        // or if TypeScript has newer features that babel hasn't
+                        // caught up with
+                        // {
+                        //     loader: require.resolve('ts-loader'),
+                        //     options: {
+                        //          transpileOnly: true
+                        //         // configFile: path.resolve(__dirname, '..', 'node_modules', 'terriajs', 'tsconfig.json')
+                        //     }
+                        // }
+                    ]
                 },
                 {
                     test: /\.(png|jpg|svg|gif)$/,
@@ -79,7 +117,12 @@ module.exports = function(devMode, hot) {
                                 importLoaders: 2
                             }
                         },
-                        'resolve-url-loader?sourceMap',
+                        {                                                                                                                                                                                                                                                                                           
+                            loader: 'resolve-url-loader',                                                                                                                                                                                                                                                             
+                            options: {                                                                                                                                                                                                                                                                                
+                                sourceMap: false                                                                                                                                                                                                                                                                        
+                            }                                                                                                                                                                                                                                                                                         
+                        },
                         'sass-loader?sourceMap'
                     ] : [
                         MiniCssExtractPlugin.loader,
@@ -93,7 +136,12 @@ module.exports = function(devMode, hot) {
                                 importLoaders: 2
                             }
                         },
-                        'resolve-url-loader?sourceMap',
+                        {                                                                                                                                                                                                                                                                                           
+                            loader: 'resolve-url-loader',                                                                                                                                                                                                                                                             
+                            options: {                                                                                                                                                                                                                                                                                
+                                sourceMap: false                                                                                                                                                                                                                                                                        
+                            }                                                                                                                                                                                                                                                                                         
+                        },
                         'sass-loader?sourceMap'
                     ]
                 }

devserverconfig.json

@@ -1,6 +1,5 @@
 {
   "port": 3001,
-  "proxyPostSizeLimit": "5mb",
   "allowProxyFor": [
     "130.56.242.7",
     "arcgis.com",

entry.js

@@ -1,14 +1,17 @@
 const globeGif = require('./lib/Styles/globe.gif');
+const polyfill = require("terriajs/lib/Core/polyfill");
+
 require('./lib/Styles/loader.css');
 
 function loadMainScript() {
     // load the main chunk
     return new Promise((resolve, reject) => {
+      require.ensure(['terriajs/lib/Core/prerequisites'], function(require) {
+        require('terriajs/lib/Core/prerequisites');
         require.ensure(['./index'], function(require) {
-            resolve(require('./index'));
-        }, function(error) {
-            reject(error);
-        }, 'index'); 
+          resolve(require('./index'));
+        }, reject, 'index');
+      }, reject, 'index');
     });
 }
 
@@ -23,24 +26,24 @@ function createLoader() {
     loaderGrabber.classList.add('loader-ui-grabber');
     const loaderRight = document.createElement('div');
     loaderRight.classList.add("loader-ui-right");
-    loaderRight.append(loaderGif);
+    loaderRight.appendChild(loaderGif);
 
-    loaderDiv.append(loaderLeft);
-    loaderDiv.append(loaderRight);
-    loaderDiv.append(loaderGrabber);
+    loaderDiv.appendChild(loaderLeft);
+    loaderDiv.appendChild(loaderRight);
+    loaderDiv.appendChild(loaderGrabber);
     loaderDiv.style.backgroundColor ='#383F4D';
     document.body.appendChild(loaderDiv);
 
-    loadMainScript().catch(() => {
-        // Ignore errors and try to show the map anyway
-    }).then(() => {
-        loaderDiv.classList.add('loader-ui-hide');
-        setTimeout(()=> {
-            document.body.removeChild(loaderDiv);
-        }, 2000);
+    polyfill(function() {
+        loadMainScript().catch(() => {
+            // Ignore errors and try to show the map anyway
+        }).then(() => {
+            loaderDiv.classList.add('loader-ui-hide');
+            setTimeout(()=> {
+                document.body.removeChild(loaderDiv);
+            }, 2000);
+        });
     });
 }
 
 createLoader();
-
-

gulpfile.js

@@ -251,6 +251,16 @@ gulp.task('render-datasource-templates', function(done) {
     var ejs = require('ejs');
     var JSON5 = require('json5');
     var templateDir = 'datasources';
+
+    // until https://github.com/TerriaJS/terriajs/pull/4227 is ready,
+    // merge in translation overrides via this task
+    var json5 = require('json5');
+    var translationFromLibPath = path.join(getPackageRoot('terriajs'), 'lib', 'Language', 'en', 'translation.json');
+    var translationFromLib = json5.parse(fs.readFileSync(translationFromLibPath, 'utf8')) || {};
+    var translationFromMap = json5.parse(fs.readFileSync(path.resolve(__dirname, 'lib', 'Language', 'en', 'translation.json'), 'utf8')) || {};
+    var translation = {...translationFromLib, ...translationFromMap};
+    fs.writeFileSync(translationFromLibPath, JSON.stringify(translation, null, 2));
+
     try {
         fs.accessSync(templateDir);
     } catch (e) {
@@ -284,7 +294,7 @@ gulp.task('render-datasource-templates', function(done) {
 });
 
 gulp.task('watch-datasource-templates', gulp.series('render-datasource-templates', function watchDatasourceTemplates() {
-    return gulp.watch(['datasources/**/*.ejs','datasources/*.json'], watchOptions, gulp.series('render-datasource-templates'));
+    return gulp.watch(['lib/Language/**/*.json', 'datasources/**/*.ejs','datasources/*.json'], watchOptions, gulp.series('render-datasource-templates'));
 }));
 
 gulp.task('sync-terriajs-dependencies', function(done) {