Skip to content

Commit

Permalink
Merge pull request #111 from gisaia/feature/updateAngular
Browse files Browse the repository at this point in the history
chore: upgrade to angular 18
  • Loading branch information
QuCMGisaia authored Dec 19, 2024
2 parents b292920 + 8335d8b commit 246647d
Show file tree
Hide file tree
Showing 26 changed files with 8,729 additions and 8,125 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
steps:
- uses: actions/[email protected]

- name: Use Node 16
- name: Use Node 18
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18

- name: Cache node modules
id: cache-nodemodules
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
### STAGE 1: Build ###

# We label our stage as 'builder'
FROM node:16.19.0 as builder
FROM node:18.20.5 AS builder
WORKDIR /app

COPY ./package.json ./
COPY ./package-lock.json ./

## installing necessary libraries
RUN npm install
RUN npm install --ignore-scripts && npm run postinstall

COPY ./scripts/start.sh ./

Expand Down
28 changes: 15 additions & 13 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,16 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/arlas-wui-iam",
"outputPath": {
"base": "dist/arlas-wui-iam",
"browser": ""
},
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"polyfills": [
"src/polyfills.ts"
],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
Expand All @@ -53,7 +57,8 @@
"src/styles.scss",
"node_modules/ngx-toastr/toastr.css"
],
"scripts": []
"scripts": [],
"browser": "src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -66,7 +71,7 @@
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
"maximumError": "85kb"
}
],
"fileReplacements": [
Expand All @@ -92,8 +97,6 @@
"sourceMap": true,
"namedChunks": true,
"extractLicenses": false,
"vendorChunk": true,
"buildOptimizer": false,
"budgets": []
}
},
Expand All @@ -103,18 +106,18 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "ARLAS-wui-iam:build:production"
"buildTarget": "ARLAS-wui-iam:build:production"
},
"development": {
"browserTarget": "ARLAS-wui-iam:build:development"
"buildTarget": "ARLAS-wui-iam:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ARLAS-wui-iam:build"
"buildTarget": "ARLAS-wui-iam:build"
}
},
"test": {
Expand Down Expand Up @@ -151,6 +154,5 @@
}
}
}
},
"defaultProject": "ARLAS-wui-iam"
}
}
Loading

0 comments on commit 246647d

Please sign in to comment.