Merge remote-tracking branch 'origin/next' into 1757-mobx-tm-new-routing-ci

Author: tephenavies

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 14.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm ci
+    - run: npm run gulp lint release

.gitignore

@@ -19,12 +19,8 @@ datasources/00_National_Data_Sets.json
 /error.log
 /output.log
 privateserverconfig.json
-wwwroot/sitemap.xml
 wwwroot/privateconfig.json
 deploy/packages/
 deploy/work/
 packages/
 pancake/
-
-# https://marketplace.visualstudio.com/items?itemName=xyz.local-history
-.history/

.travis.yml

@@ -11,7 +11,8 @@ Change Log
 * 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
-* Added basic prerendering steps
+* Add back updateApplicationOnMessageFromParentWindow
+* Update youtube urls to nocookie version
 
 ### Next Release
 

CHANGES.md

@@ -1,17 +1,11 @@
 'use strict';
 
 /*global require*/
-var fs = require('fs');
 var configureWebpackForTerriaJS = require('terriajs/buildprocess/configureWebpack');
 var MiniCssExtractPlugin = require('mini-css-extract-plugin');
-var generateRoutes = require("./generate-init-routes");
-var generateTerriaSitemap = require("./generate-terria-sitemap");
-var PrerenderSPAPlugin = require("prerender-spa-plugin");
-var Renderer = PrerenderSPAPlugin.PuppeteerRenderer;
 var path = require('path');
-var json5 = require("json5");
 
-module.exports = function(webpack, devMode, hot) {
+module.exports = function(devMode, hot) {
     var config = {
         mode: devMode ? 'development' : 'production',
         entry: './entry.js',

buildprocess/generate-init-routes.js

@@ -2,8 +2,6 @@
 FROM node:8
 
 RUN apt-get update && apt-get install -y gdal-bin
-RUN apt-get -qq -y install gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
-
 
 RUN mkdir -p /usr/src/app && mkdir -p /etc/config/client
 WORKDIR /usr/src/app/component

buildprocess/generate-terria-sitemap.js

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ printf "%s-%s" .Release.Name "terriamap" | trunc 63 | trimSuffix "-" | quote }}
@@ -7,6 +7,9 @@ spec:
   strategy:
     rollingUpdate:
       maxUnavailable: {{ .Values.global.rollingUpdate.maxUnavailable | default 0 }}
+  selector:
+    matchLabels:
+      service: {{ printf "%s-%s" .Release.Name "terriamap" | trunc 63 | trimSuffix "-" | quote }}
   template:
     metadata:
       labels:

buildprocess/webpack.config.js

@@ -1,14 +1,6 @@
 {
     "port": 3001,
 
-    "baseHref": "/",
-
-    // progresive spa options
-    "singlePageRouting": {
-        "resolvePathRelativeToWwwroot": "/index.html",
-        "resolveUnmatchedPathsWithIndexHtml": true
-    },
-
     "allowProxyFor" : [
         "nicta.com.au",
         "gov.au",