Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency updates #2107

Merged
merged 14 commits into from
Nov 29, 2023
Merged

Dependency updates #2107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
35677cd
update typescript and zone
TheSlimvReal Nov 28, 2023
7ac02d8
updated angular
TheSlimvReal Nov 28, 2023
3ca1c9f
updated all dependencies
TheSlimvReal Nov 28, 2023
7e04dc3
fixed marked renderer
TheSlimvReal Nov 28, 2023
c37e805
fixed style paths
TheSlimvReal Nov 28, 2023
5295292
fixed renderer
TheSlimvReal Nov 28, 2023
95a7f96
fixed styles in tests
TheSlimvReal Nov 28, 2023
9aad15f
fixed date adapter test
TheSlimvReal Nov 28, 2023
df407dc
updated node in docker
TheSlimvReal Nov 28, 2023
1e450fb
replaced deprecated command
TheSlimvReal Nov 28, 2023
26c9dd0
fixed prettier
TheSlimvReal Nov 28, 2023
8221813
undone prettier update
TheSlimvReal Nov 28, 2023
423437a
Merge branch 'master' into dep_update
sleidig Nov 29, 2023
54f15b2
fixed fab color overwrite
TheSlimvReal Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
],
"stylePreprocessorOptions": {
"includePaths": [
"node_modules/"
"node_modules/",
"src/styles"
]
},
"vendorChunk": true,
Expand Down Expand Up @@ -87,18 +88,18 @@
"options": {},
"configurations": {
"production": {
"browserTarget": "ndb-core:build:production"
"buildTarget": "ndb-core:build:production"
},
"development": {
"browserTarget": "ndb-core:build:development"
"buildTarget": "ndb-core:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ndb-core:build"
"buildTarget": "ndb-core:build"
}
},
"test": {
Expand All @@ -116,7 +117,8 @@
],
"stylePreprocessorOptions": {
"includePaths": [
"node_modules/"
"node_modules/",
"src/styles"
]
},
"assets": [
Expand Down
4 changes: 2 additions & 2 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# Run the following commands from the root folder to build, run and kill the application
# >> docker build -f build/Dockerfile -t aam-digital .
# >> docker run -p=80:80 aam-digital
FROM node:16.14.2-alpine3.15 AS builder
FROM node:18.16.1-alpine3.18 AS builder
WORKDIR /app

COPY package*.json ./
RUN npm ci --no-progress

RUN $(npm bin)/ng version
RUN npm run-script ng version

COPY . .

Expand Down
Loading