feat: add src directory

packages/create-bison-app/tasks/copyFiles.js

@@ -7,12 +7,14 @@ const { copyDirectoryWithTemplate } = require('../utils/copyDirectoryWithTemplat
 
 const templateFolder = path.join(__dirname, '..', 'template');
 const fromPath = (file) => path.join(templateFolder, file);
+const fromSrcPath = (file) => path.join(templateFolder, 'src', file);
 
 /**
  * Copies files based on variables and a target folder
  */
 async function copyFiles({ variables, targetFolder }) {
   const toPath = (file) => path.join(targetFolder, file);
+  const toSrcPath = (file) => path.join(targetFolder, 'src', file);
 
   // Files to render when using Heroku
   const isHeroku = variables.host.name === 'heroku';
@@ -51,10 +53,10 @@ async function copyFiles({ variables, targetFolder }) {
 
     copyDirectoryWithTemplate(fromPath('.github'), toPath('.github'), variables),
 
-    copyDirectoryWithTemplate(fromPath('pages'), toPath('pages'), variables),
+    copyDirectoryWithTemplate(fromSrcPath('pages'), toSrcPath('pages'), variables),
     copyDirectoryWithTemplate(fromPath('prisma'), toPath('prisma'), variables),
 
-    copyDirectoryWithTemplate(fromPath('server'), toPath('server'), variables),
+    copyDirectoryWithTemplate(fromSrcPath('server'), toSrcPath('server'), variables),
 
     copyDirectoryWithTemplate(fromPath('tests'), toPath('tests'), variables),
 
@@ -65,23 +67,13 @@ async function copyFiles({ variables, targetFolder }) {
         '__mocks__',
         '_templates',
         '.vscode',
-        'components',
-        'context',
-        'hooks',
-        'layouts',
-        'lib',
         'prisma',
         'public',
         'scripts',
-        'services',
-        'styles',
-        'types',
-        'utils',
         '.eslintrc.js',
         '.hygen.js',
         '.nvmrc',
         '.tool-versions',
-        'constants.ts',
         'jest.config.js',
         'playwright.config.ts',
         'next-env.d.ts',
@@ -90,7 +82,6 @@ async function copyFiles({ variables, targetFolder }) {
         'tsconfig.cjs.json',
         'tailwind.config.js',
         'postcss.config.js',
-        'config.ts',
       ],
       targetFolder,
       {
@@ -100,6 +91,29 @@ async function copyFiles({ variables, targetFolder }) {
         parents: true,
       }
     ),
+
+    cpy(
+      [
+        'components',
+        'context',
+        'hooks',
+        'layouts',
+        'lib',
+        'services',
+        'styles',
+        'types',
+        'utils',
+        'config.ts',
+        'constants.ts',
+      ],
+      path.join(targetFolder, 'src'),
+      {
+        cwd: path.join(templateFolder, 'src'),
+        dot: true,
+        // preserve path
+        parents: true,
+      }
+    ),
   ]);
 }
 

packages/create-bison-app/template/prisma/scripts/exampleUserScript.ts

@@ -1,7 +1,7 @@
 import { Prisma, Role } from '@prisma/client';
 
+import { seedUsers } from '~/prisma/seeds/users';
 import { hashPassword } from '@/services/auth';
-import { seedUsers } from '@/prisma/seeds/users';
 import { prisma } from '@/lib/prisma';
 
 // HR: Hey, we've had a few more employees join -- can you create an account for them?!

packages/create-bison-app/template/layouts/LoggedOut.tsx → packages/create-bison-app/template/src/layouts/LoggedOut.tsx

@@ -15,10 +15,8 @@ export function LoggedOutLayout({ children }: Props) {
         <div className="flex justify-between items-center p-4">
           <Logo />
 
-          <Link href="/login" passHref>
-            <a className={buttonVariants({ variant: 'outline' })} href="/login">
-              Login
-            </a>
+          <Link className={buttonVariants({ variant: 'outline' })} href="/login" passHref>
+            Login
           </Link>
         </div>
       </>

packages/create-bison-app/template/tests/e2e/auth.play.ts

@@ -4,7 +4,7 @@ import { Role } from '@prisma/client';
 
 import { loginAs } from './helpers';
 
-import { resetDB } from '@/tests/helpers/db';
+import { resetDB } from '~/tests/helpers/db';
 import { disconnect } from '@/lib/prisma';
 
 test.beforeEach(async () => resetDB());

packages/create-bison-app/template/tests/e2e/global-teardown.ts

@@ -1,7 +1,7 @@
 import { FullConfig } from '@playwright/test';
 
 import { prisma } from '@/lib/prisma';
-import { getSchema } from '@/tests/helpers/db';
+import { getSchema } from '~/tests/helpers/db';
 import { config } from '@/config';
 
 async function globalTeardown(_config: FullConfig) {

packages/create-bison-app/template/tests/e2e/helpers.ts

@@ -4,8 +4,8 @@ import { Role } from '@prisma/client';
 import { encode as encodeJwt } from 'next-auth/jwt';
 import { nanoid } from 'nanoid';
 
-import { UserFactory } from '@/tests/factories/user';
-import playwrightConfig from '@/playwright.config';
+import { UserFactory } from '~/prisma/factories/user';
+import playwrightConfig from '~/playwright.config';
 import { config } from '@/config';
 
 const chance = new Chance();

packages/create-bison-app/template/tests/requests/user/createUser.test.ts

@@ -1,7 +1,7 @@
 import { Role } from '@prisma/client';
 
-import { resetDB, disconnect, trpcRequest } from '@/tests/helpers';
-import { UserFactory } from '@/tests/factories/user';
+import { resetDB, disconnect, trpcRequest } from '~/tests/helpers';
+import { UserFactory } from '~/prisma/factories/user';
 
 beforeEach(async () => resetDB());
 afterAll(async () => disconnect());

packages/create-bison-app/template/tests/requests/user/me.test.ts

@@ -1,5 +1,5 @@
-import { trpcRequest, resetDB, disconnect } from '@/tests/helpers';
-import { UserFactory } from '@/tests/factories/user';
+import { trpcRequest, resetDB, disconnect } from '~/tests/helpers';
+import { UserFactory } from '~/prisma/factories/user';
 
 beforeEach(async () => resetDB());
 afterAll(async () => disconnect());

packages/create-bison-app/template/tests/requests/user/users.test.ts

@@ -1,7 +1,7 @@
 import { Role } from '@prisma/client';
 
-import { resetDB, disconnect, trpcRequest } from '@/tests/helpers';
-import { UserFactory } from '@/tests/factories/user';
+import { resetDB, disconnect, trpcRequest } from '~/tests/helpers';
+import { UserFactory } from '~/prisma/factories/user';
 
 beforeEach(async () => resetDB());
 afterAll(async () => disconnect());

packages/create-bison-app/template/tests/unit/components/CenteredBoxForm.test.tsx

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import { render } from '@/tests/utils';
+import { render } from '~/tests/utils';
 import { CenteredBoxForm } from '@/components/CenteredBoxForm';
 
 describe('CenteredBoxForm', () => {

packages/create-bison-app/template/tests/unit/components/ErrorText.test.tsx

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import { render } from '@/tests/utils';
+import { render } from '~/tests/utils';
 import { ErrorText } from '@/components/ErrorText';
 
 describe('ErrorText', () => {

packages/create-bison-app/template/tests/unit/components/Logo.test.tsx

@@ -2,9 +2,9 @@
  * @jest-environment jsdom
  */
 
-import { render } from '@/tests/utils';
+import { render } from '~/tests/utils';
 import { Logo } from '@/components/Logo';
-import '@/tests/matchMedia.mock';
+import '~/tests/matchMedia.mock';
 
 describe('Logo', () => {
   it('loads', async () => {

packages/create-bison-app/template/tests/unit/components/Nav.test.tsx

@@ -2,8 +2,8 @@
  * @jest-environment jsdom
  */
 
-import { render } from '@/tests/utils';
-import '@/tests/matchMedia.mock';
+import { render } from '~/tests/utils';
+import '~/tests/matchMedia.mock';
 import { Nav } from '@/components/Nav';
 
 describe('Nav', () => {

packages/create-bison-app/template/tests/unit/components/SignupForm.test.tsx

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import { render, waitFor, userEvent, fireEvent, act } from '@/tests/utils';
+import { render, waitFor, userEvent, fireEvent, act } from '~/tests/utils';
 import { SignUpForm } from '@/components/auth/SignUpForm';
 
 // need this in order to use `act`

packages/create-bison-app/template/tests/utils.tsx

@@ -8,7 +8,7 @@ import { NextRouter } from 'next/router';
 import fetch from 'cross-fetch';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import '@testing-library/jest-dom/extend-expect';
-import '@/tests/matchMedia.mock';
+import '~/tests/matchMedia.mock';
 
 import { AllProviders } from '@/components/AllProviders';
 import type { AppRouter } from '@/server/routers/_app';

packages/create-bison-app/template/tsconfig.json

@@ -19,7 +19,8 @@
     "rootDir": ".",
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./*"]
+      "~/*": ["./*"],
+      "@/*": ["./src/*"]
     },
     "incremental": true
   },

packages/create-bison-app/test/cli.test.js

@@ -1,4 +1,4 @@
-describe("cli", () => {
+describe('cli', () => {
   let createBisonApp;
   let originalArgv;
 
@@ -7,8 +7,8 @@ describe("cli", () => {
     // multiple times with different arguments.
     jest.resetModules();
 
-    jest.mock("..");
-    createBisonApp = require("..");
+    jest.mock('..');
+    createBisonApp = require('..');
 
     // Each test overwrites process arguments so store the original arguments
     originalArgv = process.argv;
@@ -19,8 +19,8 @@ describe("cli", () => {
     process.argv = originalArgv;
   });
 
-  it("should create app with default configuration", async () => {
-    await runCreateBisonAppCommand("appName1", "--acceptDefaults");
+  it('should create app with default configuration', async () => {
+    await runCreateBisonAppCommand('appName1', '--acceptDefaults');
 
     expect(createBisonApp).toHaveBeenCalledTimes(1);
     expect(createBisonApp.mock.calls[0][0]).toMatchInlineSnapshot(`
@@ -45,12 +45,8 @@ describe("cli", () => {
     `);
   });
 
-  it("should create app with default configuration and override with any arguments", async () => {
-    await runCreateBisonAppCommand(
-      "appName2",
-      "--acceptDefaults",
-      "--db.dev.name=custom"
-    );
+  it('should create app with default configuration and override with any arguments', async () => {
+    await runCreateBisonAppCommand('appName2', '--acceptDefaults', '--db.dev.name=custom');
 
     expect(createBisonApp).toHaveBeenCalledTimes(1);
     expect(createBisonApp.mock.calls[0][0]).toMatchInlineSnapshot(`
@@ -84,11 +80,11 @@ describe("cli", () => {
  */
 async function runCreateBisonAppCommand(appName, ...options) {
   process.argv = [
-    "node", // Not used but required at this index in the array
-    "../cli.js", // Not used but required at this index in the array
+    'node', // Not used but required at this index in the array
+    '../cli.js', // Not used but required at this index in the array
     appName, // App name positional argument
     ...options, // Any option arguments
   ];
 
-  return require("../cli");
+  return require('../cli');
 }