Skip to content

Commit 64d249f

Browse files
authored
Upgrade angular to 19.2.15 and ngx-monaco-editor-v2 to 19.0.2 (#49)
* Upgrade editor to 19.2.15 * update path for server.js * update path for docker files
1 parent 5e9b2d8 commit 64d249f

File tree

14 files changed

+6607
-4087
lines changed

14 files changed

+6607
-4087
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# Stage 1, based on Node.js, to build and compile Angular
1313

14-
FROM node:16.10.0-alpine as builder
14+
FROM node:20.19.5-alpine as builder
1515

1616
WORKDIR /ng-app
1717

@@ -27,4 +27,4 @@ FROM nginx:1.19.8-alpine
2727
COPY ./nginx.conf /etc/nginx/conf.d/default.conf
2828

2929
## From ‘builder’ stage copy over the artifacts in dist folder to default nginx public folder
30-
COPY --from=builder /ng-app/dist /usr/share/nginx/html
30+
COPY --from=builder /ng-app/dist/browser /usr/share/nginx/html

Dockerfile-nas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# Stage 1, based on Node.js, to build and compile Angular
1010

11-
FROM node:16.10.0-alpine as builder
11+
FROM node:20.19.5-alpine as builder
1212

1313
WORKDIR /ng-app
1414

@@ -24,4 +24,4 @@ FROM nginx:1.19.8-alpine
2424
COPY ./nginx.conf /etc/nginx/conf.d/default.conf
2525

2626
## From ‘builder’ stage copy over the artifacts in dist folder to default nginx public folder
27-
COPY --from=builder /ng-app/dist /usr/share/nginx/html
27+
COPY --from=builder /ng-app/dist/browser /usr/share/nginx/html

Dockerfile-prod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# Stage 1, based on Node.js, to build and compile Angular
1010

11-
FROM node:16.10.0-alpine as builder
11+
FROM node:20.19.5-alpine as builder
1212

1313
WORKDIR /ng-app
1414

@@ -24,4 +24,4 @@ FROM nginx:1.19.8-alpine
2424
COPY ./nginx.conf /etc/nginx/conf.d/default.conf
2525

2626
## From ‘builder’ stage copy over the artifacts in dist folder to default nginx public folder
27-
COPY --from=builder /ng-app/dist /usr/share/nginx/html
27+
COPY --from=builder /ng-app/dist/browser /usr/share/nginx/html

Dockerfile2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# Stage 1, based on Node.js, to build and compile Angular
1313

14-
FROM node:9.4.0-alpine as builder
14+
FROM node:20.19.5-alpine as builder
1515

1616
COPY package.json ./
1717

@@ -29,11 +29,11 @@ RUN npm run build:aot:prod
2929
FROM nginx:1.13.12-alpine
3030

3131
COPY ./config/nginx-custom.conf /etc/nginx/conf.d/default.conf
32-
32+
3333
## Remove default nginx website
3434
RUN rm -rf /usr/share/nginx/html/*
3535

3636
## From ‘builder’ stage copy over the artifacts in dist folder to default nginx public folder
37-
COPY --from=builder /ng-app/dist /usr/share/nginx/html
37+
COPY --from=builder /ng-app/dist/browser /usr/share/nginx/html
3838

3939
CMD ["nginx", "-g", "daemon off;"]

angular.json

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
"projectType": "application",
1010
"architect": {
1111
"build": {
12-
"builder": "@angular-devkit/build-angular:browser",
12+
"builder": "@angular-devkit/build-angular:application",
1313
"options": {
14-
"outputPath": "dist",
14+
"outputPath": {
15+
"base": "dist"
16+
},
1517
"index": "src/index.html",
16-
"main": "src/main.ts",
1718
"tsConfig": "src/tsconfig.app.json",
18-
"polyfills": "src/polyfills.ts",
19+
"polyfills": [
20+
"src/polyfills.ts"
21+
],
1922
"assets": [
2023
{
2124
"glob": "**/*",
@@ -30,12 +33,11 @@
3033
"src/styles.css"
3134
],
3235
"scripts": [],
33-
"vendorChunk": true,
3436
"extractLicenses": false,
35-
"buildOptimizer": false,
3637
"sourceMap": true,
3738
"optimization": false,
38-
"namedChunks": true
39+
"namedChunks": true,
40+
"browser": "src/main.ts"
3941
},
4042
"configurations": {
4143
"nas": {
@@ -50,8 +52,6 @@
5052
"sourceMap": false,
5153
"namedChunks": false,
5254
"extractLicenses": true,
53-
"vendorChunk": false,
54-
"buildOptimizer": true,
5555
"fileReplacements": [
5656
{
5757
"replace": "src/environments/environment.ts",
@@ -71,8 +71,6 @@
7171
"sourceMap": false,
7272
"namedChunks": false,
7373
"extractLicenses": true,
74-
"vendorChunk": false,
75-
"buildOptimizer": true,
7674
"fileReplacements": [
7775
{
7876
"replace": "src/environments/environment.ts",

0 commit comments

Comments
 (0)