Merge pull request #1147 from Shopify/dependabot/npm_and_yarn/minifla…

…re-3.20231218.2 Bump miniflare from 2.14.1 to 3.20231218.2
Shopify · Jan 24, 2024 · 81bc22b · 81bc22b
2 parents 8749da3 + 9fbd0f4
commit 81bc22b
Show file tree

Hide file tree

Showing 9 changed files with 493 additions and 129 deletions.
diff --git a/packages/shopify-api/.gitignore b/packages/shopify-api/.gitignore
@@ -0,0 +1 @@
+.wrangler
diff --git a/packages/shopify-api/adapters/__e2etests__/test_apps/test-web-api-app.ts b/packages/shopify-api/adapters/__e2etests__/test_apps/test-web-api-app.ts
@@ -46,11 +46,8 @@ function setRestClientRetryTime(time: number) {
 
 /* eslint-disable-next-line import/no-anonymous-default-export */
 export default {
-  async fetch(req: any, _env: any, _ctx: any) {
-    const apiServerPort: number = parseInt(
-      (globalThis as any).HTTP_SERVER_PORT || '3000',
-      10,
-    );
+  async fetch(req: any, env: any, _ctx: any) {
+    const apiServerPort: number = parseInt(env.HTTP_SERVER_PORT || '3000', 10);
     const apiServer = `localhost:${apiServerPort}`;
     const client = new RestClient({
       session: new Session({...session, shop: apiServer}),

diff --git a/packages/shopify-api/adapters/__e2etests__/test_environments.ts b/packages/shopify-api/adapters/__e2etests__/test_environments.ts
@@ -32,6 +32,9 @@ function allEnvironmentsReady(environments: E2eTestEnvironment[]): boolean {
 export async function runEnvironments(
   environments: E2eTestEnvironment[],
 ): Promise<boolean> {
+  // Give enough time for the servers to start listening
+  await sleep(2000);
+
   const maxAttempts = 5;
 
   if (allEnvironmentsReady(environments)) return true;

diff --git a/packages/shopify-api/adapters/cf-worker/__tests__/cf-worker.test.ts b/packages/shopify-api/adapters/cf-worker/__tests__/cf-worker.test.ts
@@ -1,11 +1,13 @@
 import {spawn} from 'child_process';
+import path from 'path';
 
 import '..';
 
 import '../../../runtime/__tests__/all.test';
 import {runTests, E2eTestEnvironment} from '../../__e2etests__/e2e-runner.test';
 
 const cfWorkerAppPort = '7777';
+// This value must match the one in ./wrangler.toml
 const dummyServerPort = '7778';
 
 const workerEnvironment: E2eTestEnvironment = {
@@ -15,12 +17,14 @@ const workerEnvironment: E2eTestEnvironment = {
   process: spawn(
     'yarn',
     [
-      'miniflare',
-      '--global',
-      `HTTP_SERVER_PORT=${dummyServerPort}`,
+      'wrangler',
+      'dev',
+      '-c',
+      path.join(__dirname, './wrangler.toml'),
       '--port',
       `${cfWorkerAppPort}`,
-      '--modules',
+      '--inspector-port',
+      '9249',
       'bundle/test-web-api-app.js',
     ],
     {

diff --git a/packages/shopify-api/adapters/cf-worker/__tests__/wrangler.toml b/packages/shopify-api/adapters/cf-worker/__tests__/wrangler.toml
@@ -0,0 +1,7 @@
+name="test_cf_worker"
+compatibility_date="2024-01-22"
+
+send_metrics=false
+
+[vars]
+HTTP_SERVER_PORT=7778
diff --git a/packages/shopify-api/adapters/web-api/__tests__/web-api.test.ts b/packages/shopify-api/adapters/web-api/__tests__/web-api.test.ts
@@ -1,11 +1,13 @@
 import {spawn} from 'child_process';
+import path from 'path';
 
 import '..';
 
 import '../../../runtime/__tests__/all.test';
 import {runTests, E2eTestEnvironment} from '../../__e2etests__/e2e-runner.test';
 
 const webApiAppPort = '8888';
+// This value must match the one in ./wrangler.toml
 const dummyServerPort = '8889';
 
 // We should also try running this on a different environment that implements the Web API for better coverage.
@@ -16,12 +18,14 @@ const webApiEnvironment: E2eTestEnvironment = {
   process: spawn(
     'yarn',
     [
-      'miniflare',
-      '--global',
-      `HTTP_SERVER_PORT=${dummyServerPort}`,
+      'wrangler',
+      'dev',
+      '-c',
+      path.join(__dirname, './wrangler.toml'),
       '--port',
       `${webApiAppPort}`,
-      '--modules',
+      '--inspector-port',
+      '9259',
       'bundle/test-web-api-app.js',
     ],
     {

diff --git a/packages/shopify-api/adapters/web-api/__tests__/wrangler.toml b/packages/shopify-api/adapters/web-api/__tests__/wrangler.toml
@@ -0,0 +1,7 @@
+name="test_web_api"
+compatibility_date="2024-01-22"
+
+send_metrics=false
+
+[vars]
+HTTP_SERVER_PORT=8889
diff --git a/packages/shopify-api/package.json b/packages/shopify-api/package.json
@@ -90,10 +90,11 @@
     "@types/uuid": "^9.0.0",
     "express": "^4.17.13",
     "jest-environment-miniflare": "^2.12.1",
-    "miniflare": "^2.6.0",
+    "miniflare": "^3.20231218.2",
     "rollup": "^2.79.1",
     "rollup-plugin-swc": "^0.2.1",
-    "supertest": "^6.1.3"
+    "supertest": "^6.1.3",
+    "wrangler": "^3.24.0"
   },
   "files": [
     "**/*.d.ts",