Upgrade Angular, Node.js, and related dependencies

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 <!--When making a new release, remember to update the magic links at the bottom.-->
 ## [Unreleased]
+ - Updated Node.js to version 10
+ - Updated Angular to version 8
+ - The `climate-change-components` library is now a part of this project as the `climate-api` module instead of being installed as an NPM dependency
 
 ## [1.9.0] - 2019-05-14
 ### Added

README.md

@@ -132,10 +132,6 @@ It is easier to download the data using the above script. If you want to update
 - Save each sheet in CSV format
 - Update the CSVs on S3, located in the `s3://azavea-climate-sandbox` folder as `missy_cities.csv` and `missy_strategies_with_weather_events.csv`.
 
-#### Modifying and publishing the climate-change-components repository
-
-See [the wiki](https://github.com/azavea/temperate/wiki/Making-changes-to-the-Climate-Change-Components-library)
-
 ### Using Docker in the VM
 
 The other project scripts are meant to execute in the VM in the `/vagrant` directory.

scripts/test

@@ -68,7 +68,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
         GIT_COMMIT="${GIT_COMMIT}" docker-compose \
                   -f docker-compose.yml \
                   -f docker-compose.test.yml \
-                  run --rm angular run test --sourcemaps=false
+                  run --rm angular run test
 
         echo "Check for missing migrations"
         GIT_COMMIT="${GIT_COMMIT}" docker-compose \

scripts/update

@@ -6,8 +6,6 @@ if [[ -n "${PLANIT_DEBUG}" ]]; then
     set -x
 fi
 
-DIR="$(dirname "$0")/../"
-
 function usage() {
     echo -n \
          "Usage: $(basename "$0")

src/angular/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:6-slim
+FROM node:10-slim
 
 # Install Chrome for running ng test
 RUN set -ex \
@@ -18,12 +18,6 @@ COPY ./planit/yarn.lock /opt/planit/angular/planit/
 RUN yarn install --pure-lockfile \
 	&& yarn cache clean --force
 
-# Install fork of ngx-bootstrap with typeahead improvements
-# Code is at https://github.com/azavea/ngx-bootstrap/commit/77803c8
-# Built using 'npm run build && cd dist && npm pack'
-COPY ./ngx-bootstrap-2.0.3.tgz /opt/planit/angular/planit/
-RUN npm install ngx-bootstrap-2.0.3.tgz
-
 COPY ./planit/ /opt/planit/angular/planit
 
 ENTRYPOINT ["yarn"]

src/angular/planit/angular.json

@@ -0,0 +1,140 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "planit": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "polyfills": "src/polyfills.ts",
+            "assets": [
+              "src/assets",
+              "src/favicon.ico"
+            ],
+            "styles": [
+              "src/assets/sass/main.scss",
+              "src/vendor/loading-bar/loading-bar.css"
+            ],
+            "scripts": [
+              "src/vendor/loading-bar/loading-bar.min.js"
+            ]
+          },
+          "configurations": {
+            "production": {
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "planit:build",
+            "port": 4210,
+            "host": "0.0.0.0"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "planit:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "planit:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "karmaConfig": "./karma.conf.js",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "scripts": [
+              "src/vendor/loading-bar/loading-bar.min.js"
+            ],
+            "styles": [
+              "src/assets/sass/main.scss",
+              "src/vendor/loading-bar/loading-bar.css"
+            ],
+            "assets": [
+              "src/assets",
+              "src/favicon.ico"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**/*"
+            ]
+          }
+        }
+      }
+    },
+    "planit-e2e": {
+      "root": "e2e",
+      "sourceRoot": "e2e",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "planit:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "e2e/tsconfig.e2e.json"
+            ],
+            "exclude": [
+              "**/node_modules/**/*"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "planit",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "app",
+      "styleext": "scss"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "app"
+    }
+  }
+}

src/angular/planit/browserslist

@@ -0,0 +1,12 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.

src/angular/planit/karma.conf.js

@@ -4,24 +4,22 @@
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['jasmine', '@angular/cli'],
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
+      dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
       fixWebpackSourcePaths: true
     },
-    angularCli: {
-      environment: 'dev'
-    },
+
     reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,