Skip to content

Commit

Permalink
AUS-3784 Merge remote-tracking branch 'origin/master' into runtimecon…
Browse files Browse the repository at this point in the history
…text
  • Loading branch information
vjf committed May 16, 2023
2 parents cd344e3 + 5381e87 commit d73c523
Show file tree
Hide file tree
Showing 26 changed files with 4,681 additions and 28,050 deletions.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
Firefox ESR
not dead
not ie > 1
not op_mini all
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

User Interface component for the [AuScope Discovery Portal](http://portal.auscope.org.au/)

This project was generated with the [Angular CLI](https://github.com/angular/angular-cli). It is now on version 13 of Angular. For best results compile with Angular 13, node 14 and npm 8.
This project was generated with the [Angular CLI](https://github.com/angular/angular-cli). It is now on version 14 of Angular. For best results compile with Angular 14, node 18 and npm 9.

## Prerequisites

Install node v14 https://nodejs.org/en/download/
Install npm v8 `npm install -g npm@8`
install the Angular CLI v13 `npm install -g @angular/cli@13`
Install node v18 https://nodejs.org/en/download/
Install npm v9 `npm install -g npm@8`
install the Angular CLI v14 `npm install -g @angular/cli@13`

## Development server

Expand Down
13 changes: 7 additions & 6 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"cli": {
"analytics": false,
"defaultCollection": "@angular-eslint/schematics"
"schematicCollections": [
"@angular-eslint/schematics"
]
},
"version": 1,
"newProjectRoot": "projects",
Expand Down Expand Up @@ -35,7 +37,7 @@
}
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"./node_modules/@angular/material/prebuilt-themes/purple-green.css",
"src/styles.scss",
"node_modules/rickshaw/rickshaw.min.css",
"src/extension/css/extensions.css",
Expand Down Expand Up @@ -65,7 +67,7 @@
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"maximumWarning": "20kb"
}
],
"fileReplacements": [
Expand All @@ -79,7 +81,7 @@
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"maximumWarning": "20kb"
}
],
"optimization": false,
Expand All @@ -101,7 +103,7 @@
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"maximumWarning": "20kb"
}
],
"optimization": false,
Expand Down Expand Up @@ -217,7 +219,6 @@
}
}
},
"defaultProject": "project",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN ./make_timestamp.sh $BUILDTYPE > ./src/app/menupanel/portal-details-panel/po
RUN npm link @auscope/portal-core-ui && npm run $BUILDTYPE

# Second image, install website
FROM debian:bullseye-20230411
FROM debian:bullseye-20230502

ENV appdir /usr/src/app

Expand Down
Loading

0 comments on commit d73c523

Please sign in to comment.