Merge branch 'main' into develop

akd-io · Jun 15, 2023 · 30044f4 · 30044f4
2 parents 0422bc2 + 82f428e
commit 30044f4
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 31 deletions.
diff --git a/apps/website/templates/LandingPage/components/TechnologiesForm.tsx b/apps/website/templates/LandingPage/components/TechnologiesForm.tsx
@@ -252,7 +252,7 @@ export const TechnologiesForm: React.FC = () => {
     formData
   ) => {
     const calculateCommand = (formData: TechnologiesFormData) => {
-      const args = ["npx", "[email protected].7"]
+      const args = ["npx", "[email protected].8"]
 
       args.push(`--package-manager=${options[formData.packageManager].value}`)
       args.push(`--styling=${options[formData.styling].value}`)

diff --git a/packages/create-next-stack/package.json b/packages/create-next-stack/package.json
@@ -1,7 +1,7 @@
 {
   "name": "create-next-stack",
   "description": "Create Next Stack is a website and CLI tool used to easily set up the boilerplate of new Next.js apps.",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "author": "Anders Kjær Damgaard @akd-io",
   "bugs": "https://github.com/akd-io/create-next-stack/issues",
   "homepage": "https://github.com/akd-io/create-next-stack",

diff --git a/packages/create-next-stack/src/tests/e2e/helpers/test-args.ts b/packages/create-next-stack/src/tests/e2e/helpers/test-args.ts
@@ -1,7 +1,7 @@
 import { runCommand } from "../../../main/helpers/run-command"
 import { performFinalChecks } from "./perform-final-checks"
 import { prepareE2eTest } from "./prepare-e2e-test"
-import { tenMinutes } from "./timeout"
+import { fifteenMinutes } from "./timeout"
 
 /**
  * Prepare an e2e test and run the CLI with the given arguments.
@@ -13,7 +13,7 @@ export const testArgsWithoutFinalChecks = async (args: string[]) => {
   const { pathToCLI, runDirectory } = await prepareE2eTest()
 
   await runCommand(pathToCLI, args, {
-    timeout: tenMinutes,
+    timeout: fifteenMinutes,
     cwd: runDirectory,
     stdout: "inherit",
     stderr: "inherit",

diff --git a/packages/create-next-stack/src/tests/e2e/helpers/timeout.ts b/packages/create-next-stack/src/tests/e2e/helpers/timeout.ts
@@ -1,2 +1,2 @@
-export const tenMinutes = 1000 * 60 * 10
+export const fifteenMinutes = 1000 * 60 * 15
 export const oneMinute = 1000 * 60
diff --git a/...t-stack/src/tests/e2e/tests/css-modules-with-sass/css-modules-with-sass-all-flags.test.ts b/...t-stack/src/tests/e2e/tests/css-modules-with-sass/css-modules-with-sass-all-flags.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testCssModulesWithSassAllFlags",
@@ -22,5 +22,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/...e-next-stack/src/tests/e2e/tests/css-modules-with-sass/css-modules-with-sass-only.test.ts b/...e-next-stack/src/tests/e2e/tests/css-modules-with-sass/css-modules-with-sass-only.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testCssModulesWithSassOnly",
@@ -12,5 +12,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/packages/create-next-stack/src/tests/e2e/tests/css-modules/css-modules-all-flags.test.ts b/packages/create-next-stack/src/tests/e2e/tests/css-modules/css-modules-all-flags.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testCssModulesAllFlags",
@@ -22,5 +22,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/packages/create-next-stack/src/tests/e2e/tests/css-modules/css-modules-only.test.ts b/packages/create-next-stack/src/tests/e2e/tests/css-modules/css-modules-only.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testCssModulesOnly",
@@ -12,5 +12,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/packages/create-next-stack/src/tests/e2e/tests/emotion/emotion-all-flags.test.ts b/packages/create-next-stack/src/tests/e2e/tests/emotion/emotion-all-flags.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testEmotionAllFlags",
@@ -25,5 +25,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/packages/create-next-stack/src/tests/e2e/tests/emotion/emotion-only.test.ts b/packages/create-next-stack/src/tests/e2e/tests/emotion/emotion-only.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testEmotionOnly",
@@ -12,5 +12,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/packages/create-next-stack/src/tests/e2e/tests/npm.test.ts b/packages/create-next-stack/src/tests/e2e/tests/npm.test.ts
@@ -1,7 +1,7 @@
 import { expect, test } from "@jest/globals"
 import { exists } from "../../../main/helpers/exists"
 import { testArgsWithFinalChecks } from "../helpers/test-args"
-import { tenMinutes } from "../helpers/timeout"
+import { fifteenMinutes } from "../helpers/timeout"
 
 test(
   "testNpm",
@@ -35,5 +35,5 @@ test(
     const pnpmLockExists = await exists(`${runDirectory}/pnpm-lock.yaml`)
     expect(pnpmLockExists).toBe(false)
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/packages/create-next-stack/src/tests/e2e/tests/pnpm.test.ts b/packages/create-next-stack/src/tests/e2e/tests/pnpm.test.ts
@@ -1,7 +1,7 @@
 import { expect, test } from "@jest/globals"
 import { exists } from "../../../main/helpers/exists"
 import { testArgsWithFinalChecks } from "../helpers/test-args"
-import { tenMinutes } from "../helpers/timeout"
+import { fifteenMinutes } from "../helpers/timeout"
 
 test(
   "testPnpm",
@@ -35,5 +35,5 @@ test(
     const pnpmLockExists = await exists(`${runDirectory}/pnpm-lock.yaml`)
     expect(pnpmLockExists).toBe(true)
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/...eate-next-stack/src/tests/e2e/tests/styled-components/styled-components-all-flags.test.ts b/...eate-next-stack/src/tests/e2e/tests/styled-components/styled-components-all-flags.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testStyledComponentsAllFlags",
@@ -22,5 +22,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/...es/create-next-stack/src/tests/e2e/tests/styled-components/styled-components-only.test.ts b/...es/create-next-stack/src/tests/e2e/tests/styled-components/styled-components-only.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testStyledComponentsOnly",
@@ -12,5 +12,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/packages/create-next-stack/src/tests/e2e/tests/tailwind-css/tailwind-css-all-flags.test.ts b/packages/create-next-stack/src/tests/e2e/tests/tailwind-css/tailwind-css-all-flags.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testTailwindCssAllFlags",
@@ -22,5 +22,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/packages/create-next-stack/src/tests/e2e/tests/tailwind-css/tailwind-css-only.test.ts b/packages/create-next-stack/src/tests/e2e/tests/tailwind-css/tailwind-css-only.test.ts
@@ -1,6 +1,6 @@
 import { test } from "@jest/globals"
 import { testArgsWithFinalChecks } from "../../helpers/test-args"
-import { tenMinutes } from "../../helpers/timeout"
+import { fifteenMinutes } from "../../helpers/timeout"
 
 test(
   "testTailwindCssOnly",
@@ -12,5 +12,5 @@ test(
       ".",
     ])
   },
-  tenMinutes
+  fifteenMinutes
 )
diff --git a/packages/create-next-stack/src/tests/e2e/tests/yarn.test.ts b/packages/create-next-stack/src/tests/e2e/tests/yarn.test.ts
@@ -1,7 +1,7 @@
 import { expect, test } from "@jest/globals"
 import { exists } from "../../../main/helpers/exists"
 import { testArgsWithFinalChecks } from "../helpers/test-args"
-import { tenMinutes } from "../helpers/timeout"
+import { fifteenMinutes } from "../helpers/timeout"
 
 test(
   "testYarn",
@@ -35,5 +35,5 @@ test(
     const pnpmLockExists = await exists(`${runDirectory}/pnpm-lock.yaml`)
     expect(pnpmLockExists).toBe(false)
   },
-  tenMinutes
+  fifteenMinutes
 )