[#IOCOM-98] Migrate node 18 (#277)

* node upgrade to 18.13.0 * fix missing node 14 in docker files * fixed build error by adding types node dependency * fixed build error by adding types node dependency * updated express-azure-functions version * fix sed error with mac * revert fix sed error with mac * fix sed error during build with mac
pagopa · Apr 26, 2023 · 41fa8d8 · 41fa8d8
1 parent 472d323
commit 41fa8d8
Show file tree

Hide file tree

Showing 14 changed files with 5,693 additions and 3,001 deletions.
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-14.16.0
+18.13.0
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.16.0
+18.13.0
diff --git a/__integrations__/docker-compose.yml b/__integrations__/docker-compose.yml
@@ -2,11 +2,11 @@ version: "3.2"
 
 services:
 
-  functions-node-14:
-    image: functions-node-14
+  functions-node-18:
+    image: functions-node-18
     build:
       context: ..
-      dockerfile: ./docker/functions-node-14/Dockerfile
+      dockerfile: ./docker/functions-node-18/Dockerfile
     command: /bin/true
 
   cosmosdb:
@@ -42,7 +42,7 @@ services:
       - cosmosdb
       - storage-account
     depends_on:
-      - functions-node-14
+      - functions-node-18
 
   testagent:
     image: node:16-alpine

diff --git a/__integrations__/package.json b/__integrations__/package.json
@@ -20,9 +20,9 @@
   "dependencies": {
     "@azure/cosmos": "^3.7.2",
     "@azure/storage-queue": "^12.7.0",
-    "@pagopa/io-functions-commons": "^23.0.0",
+    "@pagopa/io-functions-commons": "^28.0.0",
     "@types/jest": "^27.0.2",
-    "@types/node": "^13.11.0",
+    "@types/node": "~18.13.0",
     "azure-storage": "^2.10.5",
     "dotenv": "^10.0.0",
     "jest": "^27.3.1",

diff --git a/__integrations__/yarn.lock b/__integrations__/yarn.lock
diff --git a/docker/azurite/Dockerfile b/docker/azurite/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.14.2-alpine as builder
+FROM node:18.13.0-alpine as builder
 
 WORKDIR /opt/azurite
 
@@ -10,7 +10,7 @@ RUN git clone https://github.com/Azure/Azurite /opt/azurite && \
 
 RUN npm install
 
-FROM node:10.14.2-alpine
+FROM node:18.13.0-alpine
 
 COPY --from=builder /opt/azurite /opt/azurite
 

diff --git a/docker/cosmosdb/Dockerfile b/docker/cosmosdb/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.16.0
+FROM node:18.13.0
 
 WORKDIR /opt/cosmosdb
 

diff --git a/docker/fixtures/Dockerfile b/docker/fixtures/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.14.2-alpine
+FROM node:18.13.0-alpine
 
 WORKDIR /opt/cosmosdb
 

diff --git a/docker/functions-node-14/Dockerfile → docker/functions-node-18/Dockerfile b/docker/functions-node-14/Dockerfile → docker/functions-node-18/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.16.0
+FROM node:18.13.0
 
 WORKDIR /usr/src/app
 

diff --git a/docker/functions/Dockerfile b/docker/functions/Dockerfile
@@ -1,4 +1,4 @@
-FROM functions-node-14
+FROM functions-node-18
 
 COPY . /usr/src/app
 

diff --git a/docker/functions/Dockerfile.local b/docker/functions/Dockerfile.local
@@ -1,3 +1,3 @@
-FROM functions-node-14
+FROM functions-node-18
 
 CMD ["func", "start", "--javascript"]
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "generate:backend:api-models": "shx rm -rf generated/backend && shx mkdir -p generated/backend && gen-api-models --strict 0 --api-spec https://raw.githubusercontent.com/pagopa/io-backend/v7.28.0/api_backend.yaml --out-dir generated/backend",
     "generate:backend:notification-models": "shx rm -rf generated/notifications && shx mkdir -p generated/notifications && gen-api-models --strict 0 --api-spec https://raw.githubusercontent.com/pagopa/io-backend/v7.16.0/api_notifications.yaml --out-dir generated/notifications",
     "generate:backend:notification-hub": "shx rm -rf generated/notifications && shx mkdir -p generated/notifications && gen-api-models --strict 0 --api-spec https://raw.githubusercontent.com/pagopa/io-backend/v7.16.0/notification_queue_messages.yaml --out-dir generated/notifications",
-    "generate:templates:mailvalidation": "TARGET=generated/templates/mailvalidation/index && VERSION=v1.0.0 && shx rm -rf generated/templates/mailvalidation && shx mkdir -p generated/templates/mailvalidation && curl -XGET https://raw.githubusercontent.com/pagopa/io-messages-email-templates/$VERSION/MailValidation/index.html -o $TARGET.html && sed -i \"s/\\.\\.\\/assets\\//https:\\/\\/raw.githubusercontent.com\\/pagopa\\/io-messages-email-templates\\/$VERSION\\/assets\\//g\" $TARGET.html && shx echo 'export function apply(title: string, validationUrl: string): string { return `' > $TARGET.ts && shx cat $TARGET.html >> $TARGET.ts && shx echo '`;}' >> $TARGET.ts",
+    "generate:templates:mailvalidation": "TARGET=generated/templates/mailvalidation/index && VERSION=v1.0.0 && shx rm -rf generated/templates/mailvalidation && shx mkdir -p generated/templates/mailvalidation && curl -XGET https://raw.githubusercontent.com/pagopa/io-messages-email-templates/$VERSION/MailValidation/index.html -o $TARGET.html && sed -i --posix \"s/\\.\\.\\/assets\\//https:\\/\\/raw.githubusercontent.com\\/pagopa\\/io-messages-email-templates\\/$VERSION\\/assets\\//g\" $TARGET.html && shx echo 'export function apply(title: string, validationUrl: string): string { return `' > $TARGET.ts && shx cat $TARGET.html >> $TARGET.ts && shx echo '`;}' >> $TARGET.ts",
     "deploy": "npm run build && func azure functionapp publish agid-functions-app-test",
     "dist:modules": "modclean -r -n default:safe && yarn install --production",
     "predeploy": "npm-run-all build dist:modules",
@@ -38,6 +38,7 @@
     "@types/html-to-text": "^1.4.31",
     "@types/jest": "^24.0.15",
     "@types/lolex": "^3.1.1",
+    "@types/node": "~18.13.0",
     "@types/nodemailer": "^4.6.8",
     "auto-changelog": "^2.2.1",
     "dotenv": "^8.2.0",
@@ -57,9 +58,9 @@
   "dependencies": {
     "@azure/cosmos": "^3.17.1",
     "@azure/storage-queue": "^12.4.0",
-    "@pagopa/express-azure-functions": "^2.0.0",
-    "@pagopa/io-functions-commons": "^26.1.0",
-    "@pagopa/ts-commons": "^10.10.0",
+    "@pagopa/express-azure-functions": "^4.0.1",
+    "@pagopa/io-functions-commons": "^28.0.0",
+    "@pagopa/ts-commons": "^11.0.0",
     "abort-controller": "^3.0.0",
     "applicationinsights": "^1.8.10",
     "azure-storage": "^2.10.3",

diff --git a/utils/durable.ts b/utils/durable.ts
@@ -14,7 +14,7 @@ export const consumeGenerator = <TReturn = unknown>(
   while (true) {
     const { done, value } = gen.next(prevValue);
     if (done) {
-      return value as TReturn;
+      return value;
     }
     prevValue = value;
   }