Skip to content

Commit 5ef1a2c

Browse files
Merge pull request #166 from OS2iot/feature/UpdateAngular
IoT-1525: Update Angular to V17
2 parents 6471125 + 14b77c1 commit 5ef1a2c

File tree

57 files changed

+16459
-26608
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+16459
-26608
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Based on https://mherman.org/blog/dockerizing-an-angular-app/
22
# base image
3-
FROM node:16-alpine as DEV
3+
FROM node:18-alpine as DEV
44

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

2222
# add app
2323
COPY . /app

angular.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,18 @@
7171
"serve": {
7272
"builder": "@angular-devkit/build-angular:dev-server",
7373
"options": {
74-
"browserTarget": "OS2IoT-frontend:build"
74+
"buildTarget": "OS2IoT-frontend:build"
7575
},
7676
"configurations": {
7777
"production": {
78-
"browserTarget": "OS2IoT-frontend:build:production"
78+
"buildTarget": "OS2IoT-frontend:build:production"
7979
}
8080
}
8181
},
8282
"extract-i18n": {
8383
"builder": "@angular-devkit/build-angular:extract-i18n",
8484
"options": {
85-
"browserTarget": "OS2IoT-frontend:build"
85+
"buildTarget": "OS2IoT-frontend:build"
8686
}
8787
},
8888
"test": {
@@ -112,7 +112,6 @@
112112
}
113113
}
114114
},
115-
"defaultProject": "OS2IoT-frontend",
116115
"cli": {
117116
"analytics": "5e34252a-5088-421b-bb34-6ef89cd9f167"
118117
}

0 commit comments

Comments
 (0)