Skip to content

Commit e74e777

Browse files
authored
Merge pull request #22 from NeoScript/upgrade_to_angular18
Upgrade to angular18
2 parents 0fedea1 + 742cc35 commit e74e777

39 files changed

+11179
-18342
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ FROM nginx:alpine as serve
99
COPY scripts/docker/docker_nginx.conf /etc/nginx/conf.d/default.conf
1010

1111
WORKDIR /usr/share/nginx/html
12-
COPY --from=build /app/dist/webapp .
12+
COPY --from=build /app/dist/webapp/browser .
1313
EXPOSE 80

package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webapp/angular.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@
1818
"prefix": "app",
1919
"architect": {
2020
"build": {
21-
"builder": "@angular-devkit/build-angular:browser-esbuild",
21+
"builder": "@angular-devkit/build-angular:application",
2222
"options": {
23-
"outputPath": "dist/webapp",
23+
"outputPath": {
24+
"base": "dist/webapp"
25+
},
2426
"index": "src/index.html",
25-
"main": "src/main.ts",
26-
"polyfills": "src/polyfills.ts",
27+
"polyfills": [
28+
"src/polyfills.ts"
29+
],
2730
"tsConfig": "tsconfig.app.json",
2831
"inlineStyleLanguage": "scss",
2932
"assets": [
@@ -34,7 +37,8 @@
3437
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
3538
"src/styles.scss"
3639
],
37-
"scripts": []
40+
"scripts": [],
41+
"browser": "src/main.ts"
3842
},
3943
"configurations": {
4044
"production": {

0 commit comments

Comments
 (0)