Merge branch 'main' into refactor/email-mfa-service-client-factory

Author: jjarvisp

.github/actions/load-verdaccio-with-amplify-js/action.yml

@@ -6,8 +6,7 @@ runs:
   steps:
     - name: Start verdaccio
       run: |
-        # This version supports Node.js v22
-        npx [email protected] &
+        npx [email protected] &
         while ! nc -z localhost 4873; do
           echo "Verdaccio not running yet"
           sleep 1
@@ -19,30 +18,25 @@ runs:
     - name: Install and run npm-cli-login
       shell: bash
       env:
-        NPM_REGISTRY_HOST: localhost:4873
-        NPM_REGISTRY: http://localhost:4873
+        NPM_REGISTRY: http://localhost:4873/
         NPM_USER: verdaccio
         NPM_PASS: verdaccio
         NPM_EMAIL: [email protected]
       run: |
-        # Make the HTTP request that npm addUser makes to avoid the "Exit handler never called" error
-        TOKEN=$(curl -s \
-        -H "Accept: application/json" \
-        -H "Content-Type:application/json" \
-        -X PUT --data "{\"name\": \"$NPM_USER\", \"password\": \"$NPM_PASS\", \"email\": \"$NPM_EMAIL\"}" \
-        $NPM_REGISTRY/-/user/org.couchdb.user:$NPM_USER 2>&1 | jq -r '.token')
-
-        # Set the Verdaccio registry and set the token for logging in
-        yarn config set registry $NPM_REGISTRY
-        npm set registry $NPM_REGISTRY
-        npm set //"$NPM_REGISTRY_HOST"/:_authToken $TOKEN
-    - name: Configure git
+        npm i -g npm-cli-adduser
+        npm-cli-adduser
+        sleep 1
+    - name: Configure registry and git
       shell: bash
       working-directory: ./amplify-js
       env:
+        NPM_REGISTRY: http://localhost:4873/
         NPM_USER: verdaccio
+        NPM_PASS: verdaccio
         NPM_EMAIL: [email protected]
       run: |
+        yarn config set registry $NPM_REGISTRY
+        npm set registry $NPM_REGISTRY
         git config --global user.email $NPM_EMAIL
         git config --global user.name $NPM_USER
         git status

.github/actions/node-and-build/action.yml

@@ -4,15 +4,13 @@ inputs:
   is-prebuild:
     required: false
     default: false
-  node_version:
-    required: false
 runs:
   using: 'composite'
   steps:
-    - name: Setup Node.js
+    - name: Setup Node.js 18
       uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
       with:
-        node-version: ${{ inputs.node_version || '18.x' }}
+        node-version: 18.20.2
       env:
         SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
     - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0

.github/integ-config/integ-all.yml

@@ -870,13 +870,6 @@ tests:
     spec: ssr-context-isolation
     yarn_script: ci:ssr-context-isolation
     browser: [chrome]
-  - test_name: integ_node_envs
-    desc: 'Node.js environment tests'
-    framework: node
-    category: integration
-    sample_name: auth-gql-storage
-    yarn_script: ci:node-env-test
-    node_versions: ['18.x', '20.x', '22.x']
   - test_name: integ_next_mfa_req_email
     desc: 'mfa required with email sign in attribute'
     framework: next

.github/workflows/callable-e2e-test.yml

@@ -37,9 +37,6 @@ on:
       yarn_script:
         required: false
         type: string
-      node_versions:
-        required: false
-        type: string
       env:
         required: false
         type: string
@@ -60,8 +57,6 @@ jobs:
           - ${{ fromJson(inputs.browser) }}
         sample_name:
           - ${{ fromJson(inputs.sample_name) }}
-        node_version:
-          - ${{ fromJson(inputs.node_versions) }}
       fail-fast: false
     timeout-minutes: ${{ inputs.timeout_minutes }}
 
@@ -72,8 +67,6 @@ jobs:
           path: amplify-js
       - name: Setup node and build the repository
         uses: ./amplify-js/.github/actions/node-and-build
-        with:
-          node_version: ${{ matrix.node_version }}
       - name: Setup samples staging repository
         uses: ./amplify-js/.github/actions/setup-samples-staging
         with:

.github/workflows/callable-e2e-tests.yml

@@ -44,7 +44,6 @@ jobs:
       timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 35 }}
       retry_count: ${{ matrix.integ-config.retry_count || 3 }}
       yarn_script: ${{ matrix.integ-config.yarn_script || '' }}
-      node_versions: ${{ toJSON(matrix.integ-config.node_versions) || '[""]' }}
       env: ${{ matrix.integ-config.env && toJSON(matrix.integ-config.env) || '{}' }}
 
   # e2e-test-runner-headless: