Skip to content

Commit

Permalink
Merge pull request #166 from OS2iot/feature/UpdateAngular
Browse files Browse the repository at this point in the history
IoT-1525: Update Angular to V17
  • Loading branch information
augusthjerrild authored Sep 12, 2024
2 parents 6471125 + 14b77c1 commit 5ef1a2c
Show file tree
Hide file tree
Showing 57 changed files with 16,459 additions and 26,608 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Based on https://mherman.org/blog/dockerizing-an-angular-app/
# base image
FROM node:16-alpine as DEV
FROM node:18-alpine as DEV

# removed this for now
# install chrome for protractor tests
Expand All @@ -17,7 +17,7 @@ ENV PATH /app/node_modules/.bin:$PATH
# install and cache app dependencies
COPY package.json /app/package.json
RUN npm install
RUN npm install -g @angular/cli@14.2.3
RUN npm install -g @angular/cli@17.3.8

# add app
COPY . /app
Expand Down
7 changes: 3 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "OS2IoT-frontend:build"
"buildTarget": "OS2IoT-frontend:build"
},
"configurations": {
"production": {
"browserTarget": "OS2IoT-frontend:build:production"
"buildTarget": "OS2IoT-frontend:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "OS2IoT-frontend:build"
"buildTarget": "OS2IoT-frontend:build"
}
},
"test": {
Expand Down Expand Up @@ -112,7 +112,6 @@
}
}
},
"defaultProject": "OS2IoT-frontend",
"cli": {
"analytics": "5e34252a-5088-421b-bb34-6ef89cd9f167"
}
Expand Down
Loading

0 comments on commit 5ef1a2c

Please sign in to comment.