fix: enforce via env vars

iFixit · Jun 29, 2023 · 30eeea8 · 30eeea8
1 parent 34d1bdb
commit 30eeea8
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 21 deletions.
diff --git a/.github/actions/build-test-frontend/action.yml b/.github/actions/build-test-frontend/action.yml
@@ -18,7 +18,7 @@ runs:
       - name: Build Next.js
         env:
            NODE_ENV: test
-           NEXT_PUBLIC_STRAPI_ORIGIN: http://127.0.0.1:1337
+           NEXT_PUBLIC_STRAPI_ORIGIN: http://localhost:1337
            ALGOLIA_API_KEY: ${{ inputs.ALGOLIA_API_KEY }}
         run: cd frontend && pnpm build
         shell: bash
diff --git a/.github/workflows/jest.yml b/.github/workflows/jest.yml
@@ -22,5 +22,5 @@ jobs:
          - name: Run Jest tests
            run: pnpm test
            env:
-              NEXT_PUBLIC_STRAPI_ORIGIN: http://127.0.0.1:1337
+              NEXT_PUBLIC_STRAPI_ORIGIN: http://localhost:1337
               ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -49,7 +49,7 @@ jobs:
          - name: Run Playwright Tests
            env:
               NODE_ENV: test
-              NEXT_PUBLIC_STRAPI_ORIGIN: http://127.0.0.1:1337
+              NEXT_PUBLIC_STRAPI_ORIGIN: http://localhost:1337
               ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
            run: cd frontend && pnpm playwright:run --project="${{ matrix.project }}"
 

diff --git a/.github/workflows/stress_test.yml b/.github/workflows/stress_test.yml
@@ -82,7 +82,7 @@ jobs:
          - name: Run Playwright Tests
            env:
               NODE_ENV: test
-              NEXT_PUBLIC_STRAPI_ORIGIN: http://127.0.0.1:1337
+              NEXT_PUBLIC_STRAPI_ORIGIN: http://localhost:1337
               ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
            run: cd frontend && pnpm playwright:run --project="${{ matrix.project }}" ${{ needs.check-diff.outputs.modified-playwright-tests }} --repeat-each=5
 
@@ -117,5 +117,5 @@ jobs:
          - name: Run Jest tests
            run: for i in {1..5}; do pnpm test -- ${{ needs.check-diff.outputs.modified-jest-tests }}; done
            env:
-              NEXT_PUBLIC_STRAPI_ORIGIN: http://127.0.0.1:1337
+              NEXT_PUBLIC_STRAPI_ORIGIN: http://localhost:1337
               ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
diff --git a/frontend/.env.development b/frontend/.env.development
@@ -1,7 +1,7 @@
 NEXT_PUBLIC_ALGOLIA_APP_ID=XQEP3AD9ZT
 NEXT_PUBLIC_IFIXIT_ORIGIN=https://www.cominor.com
-NEXT_PUBLIC_APP_ORIGIN=http://127.0.0.1:3000
-NEXT_PUBLIC_STRAPI_ORIGIN=http://127.0.0.1:1337
+NEXT_PUBLIC_APP_ORIGIN=http://localhost:3000
+NEXT_PUBLIC_STRAPI_ORIGIN=http://localhost:1337
 NEXT_PUBLIC_SHOPIFY_STOREFRONT_VERSION=2022-10
 STRAPI_IMAGE_DOMAIN=ifixit-dev-strapi-uploads.s3.us-west-1.amazonaws.com
 NEXT_PUBLIC_SENTRY_DSN=https://[email protected]/6475315

diff --git a/frontend/.env.test b/frontend/.env.test
@@ -1,6 +1,6 @@
 NEXT_PUBLIC_ALGOLIA_APP_ID=XQEP3AD9ZT
 NEXT_PUBLIC_IFIXIT_ORIGIN=https://www.cominor.com
-NEXT_PUBLIC_APP_ORIGIN=http://127.0.0.1:3000
+NEXT_PUBLIC_APP_ORIGIN=http://localhost:3000
 NEXT_PUBLIC_STRAPI_ORIGIN=https://strapi.cominor.com
 NEXT_PUBLIC_SHOPIFY_STOREFRONT_VERSION=2022-10
 STRAPI_IMAGE_DOMAIN=ifixit-dev-strapi-uploads.s3.us-west-1.amazonaws.com

diff --git a/frontend/codegen/config.ts b/frontend/codegen/config.ts
@@ -4,7 +4,7 @@ const config: CodegenConfig = {
    overwrite: true,
    generates: {
       'lib/strapi-sdk/generated/sdk.ts': {
-         schema: 'http://127.0.0.1:1337/graphql',
+         schema: 'http://localhost:1337/graphql',
          documents: 'lib/strapi-sdk/operations/**/*.graphql',
          plugins: [
             'typescript',

diff --git a/frontend/codegen/strapi-schema-config.ts b/frontend/codegen/strapi-schema-config.ts
@@ -4,7 +4,7 @@ const schemaConfig: CodegenConfig = {
    overwrite: true,
    generates: {
       'lib/strapi-sdk/generated/schema.graphql': {
-         schema: 'http://127.0.0.1:1337/graphql',
+         schema: 'http://localhost:1337/graphql',
          plugins: ['schema-ast'],
       },
    },

diff --git a/frontend/package.json b/frontend/package.json
@@ -9,11 +9,11 @@
    },
    "scripts": {
       "dev": "concurrently -n \"Next,codegen\" -c \"blue,magenta\" \"pnpm run dev:next\" \"pnpm run dev:codegen\"",
-      "dev:next": "next dev",
+      "dev:next": "NODE_OPTIONS=\"--dns-result-order ipv4first\" next dev",
       "dev:codegen": "pnpm run codegen:download-strapi-schema && pnpm run codegen:watch",
-      "codegen:watch": "cross-env DOTENV_CONFIG_PATH=./.env.development graphql-codegen -r dotenv/config --config codegen/config.ts --watch",
-      "codegen:download-strapi-schema": "cross-env DOTENV_CONFIG_PATH=./.env.development graphql-codegen -r dotenv/config --config codegen/strapi-schema-config.ts",
-      "codegen:download-shopify-storefront-schema": "node ./lib/shopify-storefront-sdk/generate-schema.js",
+      "codegen:watch": "cross-env NODE_OPTIONS=\"--dns-result-order ipv4first\" DOTENV_CONFIG_PATH=./.env.development graphql-codegen -r dotenv/config --config codegen/config.ts --watch",
+      "codegen:download-strapi-schema": "cross-env NODE_OPTIONS=\"--dns-result-order ipv4first\" DOTENV_CONFIG_PATH=./.env.development graphql-codegen -r dotenv/config --config codegen/strapi-schema-config.ts",
+      "codegen:download-shopify-storefront-schema": "NODE_OPTIONS=\"--dns-result-order ipv4first\" node ./lib/shopify-storefront-sdk/generate-schema.js",
       "build": "next build",
       "start": "next start",
       "type-check": "tsc --pretty --noEmit",

diff --git a/frontend/playwright.config.ts b/frontend/playwright.config.ts
@@ -55,7 +55,7 @@ const config: PlaywrightTestConfig = {
       /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
       actionTimeout: 0,
       /* Base URL to use in actions like `await page.goto('/')`. */
-      baseURL: 'http://127.0.0.1:3000',
+      baseURL: 'http://localhost:3000',
 
       /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
       trace: 'on-first-retry',

diff --git a/frontend/tests/playwright/fixtures/custom-nextjs-server.ts b/frontend/tests/playwright/fixtures/custom-nextjs-server.ts
@@ -25,7 +25,7 @@ loadEnvConfig('./', process.env.NODE_ENV !== 'production');
  * running the tests.
  */
 const isDev = process.env.NODE_ENV !== 'production' && process.env.CI == null;
-const hostname = '127.0.0.1';
+const hostname = 'localhost';
 
 // Create Next.js instance
 const app = next({ dev: isDev, hostname, quiet: true });

diff --git a/frontend/tests/playwright/test-fixtures.ts b/frontend/tests/playwright/test-fixtures.ts
@@ -66,10 +66,10 @@ export const test = base.extend<
       },
    ],
    productPage: async ({ page, baseURL }, use) => {
-      await use(new ProductPage(page, baseURL ?? 'http://127.0.0.1:3000'));
+      await use(new ProductPage(page, baseURL ?? 'http://localhost:3000'));
    },
    partsPage: async ({ page, baseURL }, use) => {
-      await use(new PartsPage(page, baseURL ?? 'http://127.0.0.1:3000'));
+      await use(new PartsPage(page, baseURL ?? 'http://localhost:3000'));
    },
    cartDrawer: async ({ page }, use) => {
       await use(new CartDrawer(page));
@@ -97,8 +97,8 @@ export const test = base.extend<
     */
    serverRequestInterceptor: [
       async ({ customServer, productPage, partsPage }, use) => {
-         productPage.updateBaseURL(`http://127.0.0.1:${customServer.port}`);
-         partsPage.updateBaseURL(`http://127.0.0.1:${customServer.port}`);
+         productPage.updateBaseURL(`http://localhost:${customServer.port}`);
+         partsPage.updateBaseURL(`http://localhost:${customServer.port}`);
          await use(customServer.serverRequestInterceptor);
       },
       { scope: 'test' },

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
       "install:all": "export $(cat .env.local) && pnpm install && npm run install:backend",
       "install:backend": "cd backend && yarn install:all",
       "dev:backend": "cd backend && pnpm run dev",
-      "dev:frontend": "wait-on http://127.0.0.1:1337/_health && cd frontend && npm run dev",
+      "dev:frontend": "NODE_OPTIONS=\"--dns-result-order ipv4first\" wait-on http://localhost:1337/_health && cd frontend && npm run dev",
       "dev": "cross-env FORCE_COLOR=1 npm-run-all -l -p dev:*",
       "build:backend": "cd backend && pnpm run build",
       "build:frontend": "cd frontend && pnpm run build",