Merge pull request #567 from aws-amplify/node18-support

phani-srikar · web-flow · commit 879e536981b7 · 2023-04-06T10:44:51.000-07:00
Support for NodeJS v18
diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
@@ -9,7 +9,7 @@ machine:
 executors:
   w: &windows-e2e-executor
     machine:
-      image: 'windows-server-2019-vs2019:stable'
+      image: 'windows-server-2022-gui:current'
       resource_class: 'windows.medium'
       shell: bash.exe
     working_directory: ~/repo
@@ -19,7 +19,7 @@ executors:
 
   l: &linux-e2e-executor
     docker:
-      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
     working_directory: ~/repo
     resource_class: large
     environment:
@@ -38,7 +38,7 @@ executors:
 
   a: &android-e2e-executor
     docker:
-      - image: cimg/android:2022.09
+      - image: cimg/android:2023.03
     working_directory: ~/repo
     resource_class: large
     environment:
@@ -78,6 +78,25 @@ jobs:
     executor: << parameters.os >>
     steps:
       - checkout
+      - when:
+          condition:
+            equal: [*windows-e2e-executor, << parameters.os >>]
+          steps:
+            - run:
+                name: Install Node 18
+                command: |
+                  nvm version
+                  nvm install 18.15.0
+                  nvm use 18.15.0
+                  nvm ls
+            - run:
+                name: Install Yarn
+                command: |
+                  npm install -g yarn
+                  yarn --version
+      - run:
+          name: Check node version
+          command: node -v
       - run: yarn config set workspaces-experimental true
       - run: yarn cache clean --force
       - run: yarn run production-build
@@ -103,8 +122,21 @@ jobs:
               - equal: [*windows-e2e-executor, << parameters.os >>]
           steps:
             - checkout
-            - run: nvm install 12.22.7
-            - run: nvm alias default 12.22.7
+            - run:
+                name: Install Node 18
+                command: |
+                  nvm version
+                  nvm install 18.15.0
+                  nvm use 18.15.0
+                  nvm ls
+            - run:
+                name: Install Yarn
+                command: |
+                  npm install -g yarn
+                  yarn --version
+            - run:
+                name: Check node version
+                command: node -v
             - run: yarn config set workspaces-experimental true
             - run: yarn cache clean --force
             - run: yarn run production-build
@@ -234,7 +266,9 @@ jobs:
           key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
       - node/install:
           install-yarn: true
-          node-version: '16.13'
+          node-version: '18.15'
+      - run: yarn config set workspaces-experimental true
+      - run: yarn cache clean --force
       - run: yarn run production-build
       - run: *install_cli
       - run:
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ machine:
 executors:
   w: &ref_1
     machine:
-      image: windows-server-2019-vs2019:stable
+      image: windows-server-2022-gui:current
       resource_class: windows.medium
       shell: bash.exe
     working_directory: ~/repo
@@ -19,7 +19,7 @@ executors:
       AMPLIFY_PATH: C:/home/circleci/repo/out/amplify.exe
   l: &ref_2
     docker:
-      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
     working_directory: ~/repo
     resource_class: large
     environment:
@@ -36,7 +36,7 @@ executors:
       AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux-x64
   a:
     docker:
-      - image: cimg/android:2022.09
+      - image: cimg/android:2023.03
     working_directory: ~/repo
     resource_class: large
     environment:
@@ -73,6 +73,27 @@ jobs:
     executor: << parameters.os >>
     steps:
       - checkout
+      - when:
+          condition:
+            equal:
+              - *ref_1
+              - << parameters.os >>
+          steps:
+            - run:
+                name: Install Node 18
+                command: |
+                  nvm version
+                  nvm install 18.15.0
+                  nvm use 18.15.0
+                  nvm ls
+            - run:
+                name: Install Yarn
+                command: |
+                  npm install -g yarn
+                  yarn --version
+      - run:
+          name: Check node version
+          command: node -v
       - run: yarn config set workspaces-experimental true
       - run: yarn cache clean --force
       - run: yarn run production-build
@@ -100,8 +121,21 @@ jobs:
                   - << parameters.os >>
           steps:
             - checkout
-            - run: nvm install 12.22.7
-            - run: nvm alias default 12.22.7
+            - run:
+                name: Install Node 18
+                command: |
+                  nvm version
+                  nvm install 18.15.0
+                  nvm use 18.15.0
+                  nvm ls
+            - run:
+                name: Install Yarn
+                command: |
+                  npm install -g yarn
+                  yarn --version
+            - run:
+                name: Check node version
+                command: node -v
             - run: yarn config set workspaces-experimental true
             - run: yarn cache clean --force
             - run: yarn run production-build
@@ -235,7 +269,9 @@ jobs:
           key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
       - node/install:
           install-yarn: true
-          node-version: '16.13'
+          node-version: '18.15'
+      - run: yarn config set workspaces-experimental true
+      - run: yarn cache clean --force
       - run: yarn run production-build
       - run: *ref_3
       - run:
diff --git a/packages/amplify-codegen-e2e-core/package.json b/packages/amplify-codegen-e2e-core/package.json
@@ -27,7 +27,7 @@
     "fs-extra": "^8.1.0",
     "jest-environment-node": "^26.6.2",
     "lodash": "^4.17.19",
-    "node-pty-prebuilt-multiarch": "^0.9.0",
+    "node-pty": "beta",
     "retimer": "2.0.0",
     "rimraf": "^3.0.0",
     "strip-ansi": "^6.0.0",
diff --git a/packages/amplify-codegen-e2e-core/src/asciinema-recorder.ts b/packages/amplify-codegen-e2e-core/src/asciinema-recorder.ts
@@ -1,4 +1,4 @@
-import * as pty from 'node-pty-prebuilt-multiarch';
+import * as pty from 'node-pty';
 import chalk from 'chalk';
 
 export type RecordingHeader = {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as pty from 'node-pty-prebuilt-multiarch';`
	`1`	`+import * as pty from 'node-pty';`
`2`	`2`	`import chalk from 'chalk';`
`3`	`3`
`4`	`4`	`export type RecordingHeader = {`