Skip to content

Commit 39bcb81

Browse files
authored
Merge pull request #17 from ondewo/library_upgrade_protobuf_grpc
Library upgrade protobuf grpc
2 parents 9c141d5 + bf725d8 commit 39bcb81

File tree

5 files changed

+38
-34
lines changed

5 files changed

+38
-34
lines changed

angular/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM node:18.12-buster-slim as debugging_image
1+
FROM node:18.12-buster-slim
22

33
RUN apt update && apt install -y parallel gnupg gnupg2 wget sed vim tmux curl unzip tree
44

55
# --------------- Installing protoc (Protobuf compiler binary)
6-
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.11/protoc-21.11-linux-x86_64.zip -O /tmp/protoc.zip &&\
6+
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip -O /tmp/protoc.zip &&\
77
unzip -o /tmp/protoc.zip -d /tmp/protoc/ &&\
88
cp /tmp/protoc/bin/protoc /usr/local/bin/protoc &&\
99
cp -r /tmp/protoc/include/* /usr/local/include &&\
@@ -17,6 +17,7 @@ ADD image-data /image-data
1717
RUN npm run reinstall
1818

1919
# --------------- Entrypoint when the docker container is executed
20+
# CMD ["bash","compile-proto-2-angular.sh"]
2021
ENTRYPOINT ["bash","compile-proto-2-angular.sh"]
2122

2223
# -----------------------------------------------------------------------------------------------------

angular/image-data/angular.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
"root": "./src",
1111
"sourceRoot": "./src",
1212
"prefix": "lib",
13-
"optimization": {
14-
"scripts": true,
15-
"styles": {
16-
"minify": true,
17-
"inlineCritical": true
18-
},
19-
"fonts": true
20-
},
2113
"architect": {
2214
"build": {
2315
"builder": "@angular-devkit/build-angular:ng-packagr",

angular/image-data/compile-proto-2-angular.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ CURRENT_DIR=$(pwd)
3737
shopt -s extglob # needed to allow pattern matching on rm
3838
cd $OUTPUT_VOLUME_FS
3939
# rm -r !(".*"|"src")
40-
rm -r bundles
41-
rm -r esm2015
42-
rm -r fesm2015
43-
rm -r node_modules
44-
rm -r npm
45-
rm -r src/node_modules
46-
rm -r ondewo-vtsi-client-angular.d.ts
47-
rm -r ondewo-vtsi-client-angular.metadata.json
48-
rm -r ondewo-vtsi-client-angular.d.ts.map
49-
rm -r package.json
50-
rm -r public-api.d.ts
40+
rm -rf bundles
41+
rm -rf esm2015
42+
rm -rf fesm2015
43+
rm -rf node_modules
44+
rm -rf npm
45+
rm -rf src/node_modules
46+
rm -rf ondewo-vtsi-client-angular.d.ts
47+
rm -rf ondewo-vtsi-client-angular.metadata.json
48+
rm -rf ondewo-vtsi-client-angular.d.ts.map
49+
rm -rf package.json
50+
rm -rf public-api.d.ts
5151
cd $CURRENT_DIR
5252

5353
#Create lib dir for output if no output specified

angular/image-data/default-lib-files/tsconfig.json

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,38 @@
33
"compilerOptions": {
44
"baseUrl": "./",
55
"outDir": "./lib/out-tsc",
6+
"forceConsistentCasingInFileNames": true,
7+
"strict": true,
8+
"noImplicitOverride": true,
9+
"noPropertyAccessFromIndexSignature": true,
10+
"noImplicitReturns": true,
11+
"noFallthroughCasesInSwitch": true,
612
"sourceMap": true,
713
"declaration": false,
8-
"module": "es2020",
9-
"moduleResolution": "node",
14+
"downlevelIteration": true,
1015
"experimentalDecorators": true,
16+
"moduleResolution": "node",
17+
"importHelpers": true,
18+
"target": "ES2022",
19+
"module": "ES2022",
20+
"useDefineForClassFields": false,
1121
"skipLibCheck": true,
12-
"target": "es2020",
1322
"allowSyntheticDefaultImports": true,
1423
"resolveJsonModule": true,
1524
"esModuleInterop": true,
1625
"typeRoots": [
1726
"node_modules/@types"
1827
],
1928
"lib": [
20-
"es2020",
29+
"ES2022",
2130
"dom"
2231
]
2332
},
2433
"angularCompilerOptions": {
25-
"strictTemplates": true,
34+
"enableI18nLegacyMessageIdFormat": false,
2635
"strictInjectionParameters": true,
36+
"strictInputAccessModifiers": true,
37+
"strictTemplates": true,
2738
"compilationMode": "partial"
2839
}
2940
}

angular/image-data/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66
"scripts": {
77
"build": "ng build --configuration production",
88
"clean": "rm -rf node_modules",
9-
"reinstall": "npm run clean && npm install -g npm@latest && npm install"
9+
"reinstall": "npm run clean && npm install -y -g npm@latest && npm install"
1010
},
1111
"author": "ONDEWO GmbH <office@ondewo.com>",
1212
"homepage": "https://ondewo.com/",
1313
"license": "Apache-2.0",
1414
"devDependencies": {
15-
"@angular-devkit/build-angular": ">=14.1.3",
16-
"@angular/cli": ">=14.1.3",
17-
"@angular/common": ">=14.1.3",
18-
"@angular/compiler": ">=14.1.3",
19-
"@angular/compiler-cli": ">=14.1.3",
20-
"@angular/core": ">=14.1.3",
15+
"@angular-devkit/build-angular": "~14.2.12",
16+
"@angular/cli": "~14.2.12",
17+
"@angular/common": "~14.3.0",
18+
"@angular/compiler": "~14.3.0",
19+
"@angular/compiler-cli": "~14.3.0",
20+
"@angular/core": "~14.3.0",
2121
"@ngx-grpc/common": ">=3.0.2",
2222
"@ngx-grpc/core": ">=3.0.2",
2323
"@ngx-grpc/protoc-gen-ng": ">=3.0.2",
2424
"@ngx-grpc/well-known-types": ">=3.0.2",
2525
"@babel/plugin-transform-unicode-regex": ">=7.18.6",
2626
"google-protobuf": ">=3.21.0",
27-
"ng-packagr": ">=14.1.0",
27+
"ng-packagr": "~14.2.2",
2828
"tslib": ">=2.4.0",
2929
"typescript": ">=4.7.4",
3030
"zone.js": ">=0.11.8"

0 commit comments

Comments
 (0)