Reapply "feat(core): resolve webcrypto from node:crypto for Node18 (#13599)" (#13775)

This reverts commit f8dbc95.

Author: HuiSF

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

@@ -6,7 +6,8 @@ runs:
   steps:
     - name: Start verdaccio
       run: |
-        npx [email protected] &
+        # This version supports Node.js v22
+        npx [email protected] &
         while ! nc -z localhost 4873; do
           echo "Verdaccio not running yet"
           sleep 1
@@ -18,25 +19,30 @@ runs:
     - name: Install and run npm-cli-login
       shell: bash
       env:
-        NPM_REGISTRY: http://localhost:4873/
+        NPM_REGISTRY_HOST: localhost:4873
+        NPM_REGISTRY: http://localhost:4873
         NPM_USER: verdaccio
         NPM_PASS: verdaccio
         NPM_EMAIL: [email protected]
       run: |
-        npm i -g npm-cli-adduser
-        npm-cli-adduser
-        sleep 1
-    - name: Configure registry and git
+        # 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
       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,13 +4,15 @@ inputs:
   is-prebuild:
     required: false
     default: false
+  node_version:
+    required: false
 runs:
   using: 'composite'
   steps:
-    - name: Setup Node.js 18
+    - name: Setup Node.js
       uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
       with:
-        node-version: 18.20.2
+        node-version: ${{ inputs.node_version || '18.x' }}
       env:
         SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
     - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0

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

@@ -870,3 +870,10 @@ 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']

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

@@ -37,6 +37,9 @@ on:
       yarn_script:
         required: false
         type: string
+      node_versions:
+        required: false
+        type: string
 
 env:
   AMPLIFY_DIR: /home/runner/work/amplify-js/amplify-js/amplify-js
@@ -54,6 +57,8 @@ jobs:
           - ${{ fromJson(inputs.browser) }}
         sample_name:
           - ${{ fromJson(inputs.sample_name) }}
+        node_version:
+          - ${{ fromJson(inputs.node_versions) }}
       fail-fast: false
     timeout-minutes: ${{ inputs.timeout_minutes }}
 
@@ -64,6 +69,8 @@ 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,6 +44,7 @@ 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) || '[""]' }}
 
   # e2e-test-runner-headless:
   #   name: E2E test runnner_headless

package.json

@@ -130,6 +130,9 @@
 		"webpack-bundle-analyzer": "^4.7.0",
 		"webpack-cli": "^5.0.0"
 	},
+	"engines": {
+		"node": ">=18"
+	},
 	"resolutions": {
 		"@types/babel__traverse": "7.20.0",
 		"path-scurry": "1.10.0",

packages/core/__tests__/utils/globalHelpers/globalHelpers.test.ts

@@ -44,12 +44,6 @@ describe('getGlobal', () => {
 
 			expect(getCrypto()).toEqual(mockCrypto);
 		});
-
-		it('should throw error if crypto is unavailable globally', () => {
-			mockWindow.mockImplementation(() => undefined);
-
-			expect(() => getCrypto()).toThrow(AmplifyError);
-		});
 	});
 
 	describe('getBtoa()', () => {

packages/core/src/utils/globalHelpers/index.ts

@@ -13,6 +13,16 @@ export const getCrypto = () => {
 		return crypto;
 	}
 
+	try {
+		const crypto = require('node:crypto').webcrypto;
+
+		if (typeof crypto === 'object') {
+			return crypto;
+		}
+	} catch (_) {
+		// no-op
+	}
+
 	throw new AmplifyError({
 		name: 'MissingPolyfill',
 		message: 'Cannot resolve the `crypto` function from the environment.',