diff --git a/.changeset/config.json b/.changeset/config.json index 314ba2f..e2f34d4 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -7,5 +7,5 @@ "access": "restricted", "baseBranch": "main", "updateInternalDependencies": "patch", - "ignore": ["@acme/docs"] + "ignore": ["@labfaz/docs"] } diff --git a/.env.example b/.env.example index 6e4aafb..2e46188 100644 --- a/.env.example +++ b/.env.example @@ -5,13 +5,13 @@ POSTGRES_DB= POSTGRES_PORT= POSTGRES_HOST=localhost:${POSTGRES_PORT} -## @acme/db +## @labfaz/db DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}/${POSTGRES_DB} -## @acme/api +## @labfaz/api API_URL= -## @acme/client +## @labfaz/client ### Next Auth NEXTAUTH_SECRET= diff --git a/.eslintrc.js b/.eslintrc.js index e89d2c9..a01ec4a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { root: true, - // This tells ESLint to load the config from the package `eslint-config-acme` - extends: ['acme'], + // This tells ESLint to load the config from the package `eslint-config-labfaz` + extends: ['labfaz'], settings: { next: { rootDir: ['apps/*/'], diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index cfa3bc6..9d089a2 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -18,16 +18,18 @@ jobs: - name: 📦 Install dependencies run: | - yarn workspaces focus @acme/e2e - npx playwright install-deps chromium + yarn workspaces focus @labfaz/e2e + npx playwright install --with-deps + - run: sleep 180 - name: Waiting for 200 from the Vercel Preview uses: patrickedqvist/wait-for-vercel-preview@v1.2.0 id: vercelPreview with: token: ${{ secrets.GITHUB_TOKEN }} + max_timeout: 120 - name: 🥒🎭 Run E2E Tests - run: yarn workspace @acme/client test:all + run: yarn workspace @labfaz/e2e test:all env: BROWSER_URL: ${{ steps.vercelPreview.outputs.url }} \ No newline at end of file diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml index 0b1e043..a74cd94 100644 --- a/.github/workflows/lighthouse.yml +++ b/.github/workflows/lighthouse.yml @@ -9,6 +9,7 @@ jobs: - name: Create report directory run: mkdir -p ${{ github.workspace }}/tmp/artifacts + - run: sleep 180 - name: Waiting for 200 from the Vercel Preview uses: patrickedqvist/wait-for-vercel-preview@v1.2.0 id: vercelPreview diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..eedff58 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +nodejs 16.16.0 diff --git a/README.md b/README.md index aa93529..38c1047 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,12 @@ Clone the design system example locally or [from GitHub](https://github.com/TMTe >>> yarn install >>> cp .env.example .env # Configure your env ->>> cp .env packages/acme-db/.env +>>> cp .env packages/labfaz-db/.env >>> cp .env apps/client/.env >>> docker-compose up -d ->>> yarn workspace @acme/db prisma db push +>>> yarn workspace @labfaz/db prisma db push # build core ->>> yarn workspace @acme/core build +>>> yarn workspace @labfaz/core build >>> yarn dev ``` @@ -77,12 +77,12 @@ This Turborepo includes the following packages and applications: - `apps/api`: REST API powered by Express - `apps/client`: Create T3 App starter, customized - `apps/docs`: Component documentation site with Storybook -- `packages/@acme/core`: Core React components -- `packages/@acme/db`: DB Client -- `packages/@acme/routers`: tRPC routers to interact with DB -- `packages/@acme/utils`: Shared React utilities -- `packages/@acme/tsconfig`: Shared `tsconfig.json`s used throughout the Turborepo -- `packages/eslint-config-acme`: ESLint shared config +- `packages/@labfaz/core`: Core React components +- `packages/@labfaz/db`: DB Client +- `packages/@labfaz/routers`: tRPC routers to interact with DB +- `packages/@labfaz/utils`: Shared React utilities +- `packages/@labfaz/tsconfig`: Shared `tsconfig.json`s used throughout the Turborepo +- `packages/eslint-config-labfaz`: ESLint shared config Each package and app is 100% [TypeScript](https://www.typescriptlang.org/). Yarn Workspaces enables us to "hoist" dependencies that are shared between packages to the root `package.json`. This means smaller `node_modules` folders and a better local dev experience. @@ -109,10 +109,10 @@ When you push your code to GitHub, the [GitHub Action](https://github.com/change turbo run build --filter=docs^... && changeset publish ``` -Turborepo runs the `build` script for all publishable packages (excluding docs) and publishes the packages to npm. By default, this example includes `acme` as the npm organization. To change this, do the following: +Turborepo runs the `build` script for all publishable packages (excluding docs) and publishes the packages to npm. By default, this example includes `labfaz` as the npm organization. To change this, do the following: -- Rename folders in `packages/*` to replace `acme` with your desired scope -- Search and replace `acme` with your desired scope +- Rename folders in `packages/*` to replace `labfaz` with your desired scope +- Search and replace `labfaz` with your desired scope - Re-run `yarn install` To publish packages to a public npm organization scope, **add** the following to each of the `package.json`'s @@ -130,13 +130,13 @@ To publish packages to a public npm organization scope, **add** the following to - Override `Build and Output Settings > BUILD COMMAND` ```bash -cd ../.. && yarn dlx turbo run build --scope=client --include-dependencies --no-deps && yarn workspace @acme/db prisma generate +cd ../.. && yarn dlx turbo run build --scope=client --include-dependencies --no-deps && yarn workspace @labfaz/db prisma generate ``` - Override `Build and Output Settings > INSTALL COMMAND` ```bash -yarn workspaces focus @acme/client --production +yarn workspaces focus @labfaz/client --production ``` - Create `Environment Variables`, check `.env` and [`apps/client/.../env-schema.mjs`](apps/client/src/server/env-schema.mjs) for info diff --git a/apps/api/index.ts b/apps/api/index.ts index 9798e22..6a99cc9 100644 --- a/apps/api/index.ts +++ b/apps/api/index.ts @@ -2,7 +2,7 @@ import * as trpcExpress from '@trpc/server/adapters/express'; import cors from 'cors'; import express from 'express'; -import { appRouter, createContext } from '@acme/routers'; +import { appRouter, createContext } from '@labfaz/routers'; async function main() { const app = express(); diff --git a/apps/api/package.json b/apps/api/package.json index a48a854..7a942b5 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -1,15 +1,15 @@ { - "name": "@acme/api", + "name": "@labfaz/api", "version": "0.0.0", "license": "MIT", "private": true, "dependencies": { - "@acme/routers": "0.0.0", + "@labfaz/routers": "0.0.0", "cors": "2.8.5", "express": "4.18.1" }, "devDependencies": { - "@acme/tsconfig": "0.0.0", + "@labfaz/tsconfig": "0.0.0", "@types/cors": "2.8.12", "@types/express": "4.17.13", "@types/node": "18.6.4", diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json index b5de02b..9b29bb4 100644 --- a/apps/api/tsconfig.json +++ b/apps/api/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@acme/tsconfig/node16.json", + "extends": "@labfaz/tsconfig/node16.json", "compilerOptions": { "esModuleInterop": true } diff --git a/apps/client/.eslintrc.json b/apps/client/.eslintrc.json index 6c01d57..ff7d395 100644 --- a/apps/client/.eslintrc.json +++ b/apps/client/.eslintrc.json @@ -1,6 +1,6 @@ { "extends": [ - "acme", + "labfaz", "plugin:tailwindcss/recommended" ], "env": { diff --git a/apps/client/package.json b/apps/client/package.json index f679277..bf7758e 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,13 +1,13 @@ { - "name": "@acme/client", + "name": "@labfaz/client", "version": "0.0.0", "license": "MIT", "private": true, "dependencies": { - "@acme/core": "0.0.0", - "@acme/db": "0.0.0", "@hookform/error-message": "2.0.0", "@hookform/resolvers": "2.9.6", + "@labfaz/core": "0.0.0", + "@labfaz/db": "0.0.0", "@next-auth/prisma-adapter": "1.0.4", "@prisma/client": "4.1.0", "@trpc/client": "9.26.2", @@ -28,14 +28,14 @@ "zod": "3.17.9" }, "devDependencies": { - "@acme/tsconfig": "0.0.0", "@axe-core/react": "4.4.3", + "@labfaz/tsconfig": "0.0.0", "@types/node": "18.6.4", "@types/react": "18.0.17", "@types/react-dom": "18.0.6", "autoprefixer": "10.4.7", "eslint": "8.22.0", - "eslint-config-acme": "0.0.0", + "eslint-config-labfaz": "0.0.0", "eslint-plugin-tailwindcss": "3.6.0", "i18next-typescript": "0.1.0", "postcss": "8.4.14", diff --git a/apps/client/src/pages/index.tsx b/apps/client/src/pages/index.tsx index 4e7adc3..7f6b8b3 100644 --- a/apps/client/src/pages/index.tsx +++ b/apps/client/src/pages/index.tsx @@ -9,7 +9,7 @@ import { useTranslation } from 'next-i18next'; import { serverSideTranslations } from 'next-i18next/serverSideTranslations'; import * as z from 'zod'; -import { Button } from '@acme/core'; +import { Button } from '@labfaz/core'; import { trpc } from '@root/utils/trpc'; const schema = z.object({ @@ -105,7 +105,7 @@ const Home: NextPage = () => {
{hello.data ?

{hello.data.greeting}

:

Loading..

}
-
diff --git a/apps/client/src/server/db/client.ts b/apps/client/src/server/db/client.ts index b026b3a..4b7373c 100644 --- a/apps/client/src/server/db/client.ts +++ b/apps/client/src/server/db/client.ts @@ -1,5 +1,5 @@ // src/server/db/client.ts -import { PrismaClient } from '@acme/db'; +import { PrismaClient } from '@labfaz/db'; import { env } from '@root/server/env.mjs'; declare global { diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json index b7aa74d..62eca55 100644 --- a/apps/client/tsconfig.json +++ b/apps/client/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@acme/tsconfig/next.json", + "extends": "@labfaz/tsconfig/next.json", "compilerOptions": { "baseUrl": "./src", "rootDir": ".", diff --git a/apps/docs/.eslintrc.js b/apps/docs/.eslintrc.js index 2c8d817..221e4a8 100644 --- a/apps/docs/.eslintrc.js +++ b/apps/docs/.eslintrc.js @@ -1,5 +1,5 @@ module.exports = { - extends: ['acme', 'plugin:storybook/recommended'], + extends: ['labfaz', 'plugin:storybook/recommended'], rules: { 'storybook/no-uninstalled-addons': ['off'], }, diff --git a/apps/docs/package.json b/apps/docs/package.json index e25ec0b..e44c45d 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -1,9 +1,9 @@ { - "name": "@acme/docs", + "name": "@labfaz/docs", "version": "0.0.0", "private": true, "dependencies": { - "@acme/core": "0.0.0", + "@labfaz/core": "0.0.0", "react": "18.2.0", "react-dom": "18.2.0" }, @@ -23,7 +23,7 @@ "@vitejs/plugin-react": "2.0.1", "babel-loader": "8.2.5", "eslint": "8.22.0", - "eslint-config-acme": "0.0.0", + "eslint-config-labfaz": "0.0.0", "eslint-plugin-storybook": "0.6.4", "prettier": "2.7.1", "serve": "13.0.2", diff --git a/apps/docs/stories/Button.stories.tsx b/apps/docs/stories/Button.stories.tsx index e7e586c..237aaec 100644 --- a/apps/docs/stories/Button.stories.tsx +++ b/apps/docs/stories/Button.stories.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { ComponentMeta, ComponentStory } from '@storybook/react'; -import { Button } from '@acme/core/src'; +import { Button } from '@labfaz/core/src'; // More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export export default { diff --git a/apps/docs/stories/Header.tsx b/apps/docs/stories/Header.tsx index 3150659..2df7e4a 100644 --- a/apps/docs/stories/Header.tsx +++ b/apps/docs/stories/Header.tsx @@ -1,7 +1,7 @@ /* eslint-disable */ import React from 'react'; -import { Button } from '@acme/core'; +import { Button } from '@labfaz/core'; import './header.css'; @@ -46,7 +46,7 @@ export const Header = ({ /> -

Acme

+

labfaz

{user ? ( diff --git a/apps/docs/stories/button.stories.jsx b/apps/docs/stories/button.stories.jsx new file mode 100644 index 0000000..0a1bbfe --- /dev/null +++ b/apps/docs/stories/button.stories.jsx @@ -0,0 +1,17 @@ +/* eslint-disable i18next/no-literal-string */ +import React from 'react'; +import { Meta, Preview, Props, Story } from '@storybook/addon-docs/blocks'; + +import { Button } from '@labfaz/core/src'; + +<> + + + + + + + + + +; diff --git a/docker-compose.yml b/docker-compose.yml index 8735a40..2214b5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,16 +3,16 @@ version: '3.8' services: postgres: image: postgres:latest - container_name: acme-postgres + container_name: labfaz-postgres restart: always environment: - "POSTGRES_USER=${POSTGRES_USER}" - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD}" - "POSTGRES_DB=${POSTGRES_DB}" volumes: - - acme_postgres:/var/lib/postgresql/data + - labfaz_postgres:/var/lib/postgresql/data ports: - '${POSTGRES_PORT:-5432}:5432' volumes: - acme_postgres: + labfaz_postgres: diff --git a/package.json b/package.json index 03ff020..f135979 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,9 @@ "typesafe" ] }, + "dependencies": { + "@mdx-js/preact": "1" + }, "devDependencies": { "@changesets/cli": "2.22.0", "@commitlint/config-conventional": "17.0.3", @@ -33,8 +36,8 @@ "danger-plugin-lint-report": "1.7.0", "danger-plugin-todos": "1.3.1", "danger-plugin-yarn": "1.5.1", - "eslint": "8.22.0", - "eslint-config-acme": "0.0.0", + "eslint": "8.21.0", + "eslint-config-labfaz": "0.0.0", "husky": "8.0.0", "lint-staged": "13.0.3", "npm-run-all": "4.1.5", @@ -77,8 +80,8 @@ { "range": "*", "dependencies": [ - "@acme/**", - "eslint-config-acme" + "@labfaz/**", + "eslint-config-labfaz" ], "packages": [ "**" diff --git a/packages/acme-e2e/.eslintrc.json b/packages/acme-e2e/.eslintrc.json deleted file mode 100644 index 8807a5d..0000000 --- a/packages/acme-e2e/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["acme"] -} diff --git a/packages/eslint-config-acme/index.js b/packages/eslint-config-labfaz/index.js similarity index 96% rename from packages/eslint-config-acme/index.js rename to packages/eslint-config-labfaz/index.js index 04b0557..05b9937 100644 --- a/packages/eslint-config-acme/index.js +++ b/packages/eslint-config-labfaz/index.js @@ -40,7 +40,7 @@ module.exports = { // Packages `react` related packages come first. ['^react', '^@?\\w'], // Internal packages. - ['^(@|components)(/.*|$)', '@(acme|root|e2e)'], + ['^(@|components)(/.*|$)', '@(labfaz|root|e2e)'], // Side effect imports. ['^\\u0000'], // Parent imports. Put `..` last. diff --git a/packages/eslint-config-acme/package.json b/packages/eslint-config-labfaz/package.json similarity index 89% rename from packages/eslint-config-acme/package.json rename to packages/eslint-config-labfaz/package.json index b5c90d8..2693651 100644 --- a/packages/eslint-config-acme/package.json +++ b/packages/eslint-config-labfaz/package.json @@ -1,11 +1,10 @@ { - "name": "eslint-config-acme", + "name": "eslint-config-labfaz", "version": "0.0.0", "license": "MIT", "private": true, "dependencies": { "@cspell/eslint-plugin": "6.6.1", - "@typescript-eslint/eslint-plugin": "5.30.6", "@typescript-eslint/parser": "5.30.6", "eslint-config-next": "12.2.2", "eslint-config-prettier": "8.3.0", diff --git a/packages/acme-core/.eslintrc.js b/packages/labfaz-core/.eslintrc.js similarity index 61% rename from packages/acme-core/.eslintrc.js rename to packages/labfaz-core/.eslintrc.js index f3e5193..955d501 100644 --- a/packages/acme-core/.eslintrc.js +++ b/packages/labfaz-core/.eslintrc.js @@ -1,4 +1,4 @@ module.exports = { root: true, - extends: ['acme'], + extends: ['labfaz'], }; diff --git a/packages/acme-core/package.json b/packages/labfaz-core/package.json similarity index 79% rename from packages/acme-core/package.json rename to packages/labfaz-core/package.json index d0f582f..0de2149 100644 --- a/packages/acme-core/package.json +++ b/packages/labfaz-core/package.json @@ -1,14 +1,15 @@ { - "name": "@acme/core", + "name": "@labfaz/core", "version": "0.0.0", "license": "MIT", "private": true, "devDependencies": { - "@acme/tsconfig": "0.0.0", - "@types/react": "18.0.17", + "@labfaz/tsconfig": "0.0.0", + "@types/react": "18.0.15", "@types/react-dom": "18.0.6", - "eslint": "8.22.0", - "eslint-config-acme": "0.0.0", + "@typescript-eslint/eslint-plugin": "5.30.6", + "eslint": "8.21.0", + "eslint-config-labfaz": "0.0.0", "react": "18.2.0", "tsup": "5.10.1", "typescript": "4.7.4" diff --git a/packages/acme-core/src/Button.tsx b/packages/labfaz-core/src/Button.tsx similarity index 100% rename from packages/acme-core/src/Button.tsx rename to packages/labfaz-core/src/Button.tsx diff --git a/packages/acme-core/src/button.css b/packages/labfaz-core/src/button.css similarity index 100% rename from packages/acme-core/src/button.css rename to packages/labfaz-core/src/button.css diff --git a/packages/acme-core/src/index.tsx b/packages/labfaz-core/src/index.tsx similarity index 100% rename from packages/acme-core/src/index.tsx rename to packages/labfaz-core/src/index.tsx diff --git a/packages/acme-utils/tsconfig.json b/packages/labfaz-core/tsconfig.json similarity index 57% rename from packages/acme-utils/tsconfig.json rename to packages/labfaz-core/tsconfig.json index 9be70c0..fb3ddd4 100644 --- a/packages/acme-utils/tsconfig.json +++ b/packages/labfaz-core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@acme/tsconfig/react-library.json", + "extends": "@labfaz/tsconfig/react-library.json", "include": ["."], "exclude": ["dist", "build", "node_modules"] } diff --git a/packages/acme-db/.gitignore b/packages/labfaz-db/.gitignore similarity index 100% rename from packages/acme-db/.gitignore rename to packages/labfaz-db/.gitignore diff --git a/packages/acme-db/index.ts b/packages/labfaz-db/index.ts similarity index 100% rename from packages/acme-db/index.ts rename to packages/labfaz-db/index.ts diff --git a/packages/acme-db/package.json b/packages/labfaz-db/package.json similarity index 89% rename from packages/acme-db/package.json rename to packages/labfaz-db/package.json index 41c02c0..5581c73 100644 --- a/packages/acme-db/package.json +++ b/packages/labfaz-db/package.json @@ -1,5 +1,5 @@ { - "name": "@acme/db", + "name": "@labfaz/db", "version": "0.0.0", "license": "MIT", "private": true, diff --git a/packages/acme-db/prisma/migrations/20220723053121_init/migration.sql b/packages/labfaz-db/prisma/migrations/20220723053121_init/migration.sql similarity index 100% rename from packages/acme-db/prisma/migrations/20220723053121_init/migration.sql rename to packages/labfaz-db/prisma/migrations/20220723053121_init/migration.sql diff --git a/packages/acme-db/prisma/migrations/migration_lock.toml b/packages/labfaz-db/prisma/migrations/migration_lock.toml similarity index 100% rename from packages/acme-db/prisma/migrations/migration_lock.toml rename to packages/labfaz-db/prisma/migrations/migration_lock.toml diff --git a/packages/acme-db/prisma/schema.prisma b/packages/labfaz-db/prisma/schema.prisma similarity index 100% rename from packages/acme-db/prisma/schema.prisma rename to packages/labfaz-db/prisma/schema.prisma diff --git a/packages/labfaz-e2e/.eslintrc.json b/packages/labfaz-e2e/.eslintrc.json new file mode 100644 index 0000000..becab79 --- /dev/null +++ b/packages/labfaz-e2e/.eslintrc.json @@ -0,0 +1,3 @@ +{ + "extends": ["labfaz"] +} diff --git a/packages/acme-e2e/.gitignore b/packages/labfaz-e2e/.gitignore similarity index 100% rename from packages/acme-e2e/.gitignore rename to packages/labfaz-e2e/.gitignore diff --git a/packages/acme-e2e/README.md b/packages/labfaz-e2e/README.md similarity index 100% rename from packages/acme-e2e/README.md rename to packages/labfaz-e2e/README.md diff --git a/packages/acme-e2e/cucumber.mjs b/packages/labfaz-e2e/cucumber.mjs similarity index 100% rename from packages/acme-e2e/cucumber.mjs rename to packages/labfaz-e2e/cucumber.mjs diff --git a/packages/acme-e2e/package.json b/packages/labfaz-e2e/package.json similarity index 89% rename from packages/acme-e2e/package.json rename to packages/labfaz-e2e/package.json index 63efde4..ee6f61c 100644 --- a/packages/acme-e2e/package.json +++ b/packages/labfaz-e2e/package.json @@ -1,5 +1,5 @@ { - "name": "@acme/e2e", + "name": "@labfaz/e2e", "version": "0.0.0", "license": "MIT", "private": true, @@ -11,11 +11,11 @@ "fs-extra": "10.1.0" }, "devDependencies": { - "@acme/tsconfig": "0.0.0", + "@labfaz/tsconfig": "0.0.0", "@types/fs-extra": "9.0.13", "@types/node": "18.6.4", - "eslint": "8.22.0", - "eslint-config-acme": "0.0.0", + "eslint": "8.21.0", + "eslint-config-labfaz": "0.0.0", "ts-node": "10.9.1", "tsconfig-paths": "4.0.0", "typescript": "4.7.4" diff --git a/packages/acme-e2e/reports/.gitkeep b/packages/labfaz-e2e/reports/.gitkeep similarity index 100% rename from packages/acme-e2e/reports/.gitkeep rename to packages/labfaz-e2e/reports/.gitkeep diff --git a/packages/acme-e2e/src/features/home.feature b/packages/labfaz-e2e/src/features/home.feature similarity index 100% rename from packages/acme-e2e/src/features/home.feature rename to packages/labfaz-e2e/src/features/home.feature diff --git a/packages/acme-e2e/src/stepDefinitions/general.steps.ts b/packages/labfaz-e2e/src/stepDefinitions/general.steps.ts similarity index 100% rename from packages/acme-e2e/src/stepDefinitions/general.steps.ts rename to packages/labfaz-e2e/src/stepDefinitions/general.steps.ts diff --git a/packages/acme-e2e/src/stepDefinitions/homeContext.ts b/packages/labfaz-e2e/src/stepDefinitions/homeContext.ts similarity index 100% rename from packages/acme-e2e/src/stepDefinitions/homeContext.ts rename to packages/labfaz-e2e/src/stepDefinitions/homeContext.ts diff --git a/packages/acme-e2e/src/support/common-hooks.ts b/packages/labfaz-e2e/src/support/common-hooks.ts similarity index 100% rename from packages/acme-e2e/src/support/common-hooks.ts rename to packages/labfaz-e2e/src/support/common-hooks.ts diff --git a/packages/acme-e2e/src/support/config.ts b/packages/labfaz-e2e/src/support/config.ts similarity index 100% rename from packages/acme-e2e/src/support/config.ts rename to packages/labfaz-e2e/src/support/config.ts diff --git a/packages/acme-e2e/src/support/custom-world.ts b/packages/labfaz-e2e/src/support/custom-world.ts similarity index 100% rename from packages/acme-e2e/src/support/custom-world.ts rename to packages/labfaz-e2e/src/support/custom-world.ts diff --git a/packages/acme-e2e/src/utils/imageHelpers.ts b/packages/labfaz-e2e/src/utils/imageHelpers.ts similarity index 100% rename from packages/acme-e2e/src/utils/imageHelpers.ts rename to packages/labfaz-e2e/src/utils/imageHelpers.ts diff --git a/packages/acme-e2e/tsconfig.json b/packages/labfaz-e2e/tsconfig.json similarity index 89% rename from packages/acme-e2e/tsconfig.json rename to packages/labfaz-e2e/tsconfig.json index b6d9f3c..ea6fde0 100644 --- a/packages/acme-e2e/tsconfig.json +++ b/packages/labfaz-e2e/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@acme/tsconfig/next.json", + "extends": "@labfaz/tsconfig/next.json", "compilerOptions": { "baseUrl": "./src", "rootDir": ".", diff --git a/packages/acme-routers/package.json b/packages/labfaz-routers/package.json similarity index 77% rename from packages/acme-routers/package.json rename to packages/labfaz-routers/package.json index a3279d4..76ee60e 100644 --- a/packages/acme-routers/package.json +++ b/packages/labfaz-routers/package.json @@ -1,10 +1,10 @@ { - "name": "@acme/routers", + "name": "@labfaz/routers", "version": "0.0.0", "license": "MIT", "private": true, "dependencies": { - "@acme/db": "0.0.0", + "@labfaz/db": "0.0.0", "@trpc/server": "9.26.2", "zod": "3.17.9" }, diff --git a/packages/acme-routers/src/context.ts b/packages/labfaz-routers/src/context.ts similarity index 90% rename from packages/acme-routers/src/context.ts rename to packages/labfaz-routers/src/context.ts index 581f1a9..8a0eafe 100644 --- a/packages/acme-routers/src/context.ts +++ b/packages/labfaz-routers/src/context.ts @@ -1,7 +1,7 @@ import * as trpc from '@trpc/server'; import * as trpcExpress from '@trpc/server/adapters/express'; -import { PrismaClient } from '@acme/db'; +import { PrismaClient } from '@labfaz/db'; const prisma = new PrismaClient(); diff --git a/packages/acme-routers/src/index.ts b/packages/labfaz-routers/src/index.ts similarity index 100% rename from packages/acme-routers/src/index.ts rename to packages/labfaz-routers/src/index.ts diff --git a/packages/acme-routers/src/user.ts b/packages/labfaz-routers/src/user.ts similarity index 100% rename from packages/acme-routers/src/user.ts rename to packages/labfaz-routers/src/user.ts diff --git a/packages/acme-tsconfig/base.json b/packages/labfaz-tsconfig/base.json similarity index 100% rename from packages/acme-tsconfig/base.json rename to packages/labfaz-tsconfig/base.json diff --git a/packages/acme-tsconfig/next.json b/packages/labfaz-tsconfig/next.json similarity index 100% rename from packages/acme-tsconfig/next.json rename to packages/labfaz-tsconfig/next.json diff --git a/packages/acme-tsconfig/node16.json b/packages/labfaz-tsconfig/node16.json similarity index 100% rename from packages/acme-tsconfig/node16.json rename to packages/labfaz-tsconfig/node16.json diff --git a/packages/acme-tsconfig/package.json b/packages/labfaz-tsconfig/package.json similarity index 84% rename from packages/acme-tsconfig/package.json rename to packages/labfaz-tsconfig/package.json index 91a00af..def6ad2 100644 --- a/packages/acme-tsconfig/package.json +++ b/packages/labfaz-tsconfig/package.json @@ -1,5 +1,5 @@ { - "name": "@acme/tsconfig", + "name": "@labfaz/tsconfig", "version": "0.0.0", "license": "MIT", "private": true, diff --git a/packages/acme-tsconfig/react-library.json b/packages/labfaz-tsconfig/react-library.json similarity index 100% rename from packages/acme-tsconfig/react-library.json rename to packages/labfaz-tsconfig/react-library.json diff --git a/packages/acme-utils/.eslintrc.js b/packages/labfaz-utils/.eslintrc.js similarity index 61% rename from packages/acme-utils/.eslintrc.js rename to packages/labfaz-utils/.eslintrc.js index f3e5193..955d501 100644 --- a/packages/acme-utils/.eslintrc.js +++ b/packages/labfaz-utils/.eslintrc.js @@ -1,4 +1,4 @@ module.exports = { root: true, - extends: ['acme'], + extends: ['labfaz'], }; diff --git a/packages/acme-utils/package.json b/packages/labfaz-utils/package.json similarity index 81% rename from packages/acme-utils/package.json rename to packages/labfaz-utils/package.json index 99949cd..0a8c686 100644 --- a/packages/acme-utils/package.json +++ b/packages/labfaz-utils/package.json @@ -1,14 +1,14 @@ { - "name": "@acme/utils", + "name": "@labfaz/utils", "version": "0.0.0", "license": "MIT", "private": true, "devDependencies": { - "@acme/tsconfig": "0.0.0", - "@types/react": "18.0.17", + "@labfaz/tsconfig": "0.0.0", + "@types/react": "18.0.15", "@types/react-dom": "18.0.6", - "eslint": "8.22.0", - "eslint-config-acme": "0.0.0", + "eslint": "8.21.0", + "eslint-config-labfaz": "0.0.0", "react": "18.2.0", "tsup": "5.10.1", "typescript": "4.7.4" diff --git a/packages/acme-utils/src/index.tsx b/packages/labfaz-utils/src/index.tsx similarity index 100% rename from packages/acme-utils/src/index.tsx rename to packages/labfaz-utils/src/index.tsx diff --git a/packages/acme-utils/src/toSlug.ts b/packages/labfaz-utils/src/toSlug.ts similarity index 100% rename from packages/acme-utils/src/toSlug.ts rename to packages/labfaz-utils/src/toSlug.ts diff --git a/packages/acme-utils/src/useIsomorphicLayoutEffect.tsx b/packages/labfaz-utils/src/useIsomorphicLayoutEffect.tsx similarity index 100% rename from packages/acme-utils/src/useIsomorphicLayoutEffect.tsx rename to packages/labfaz-utils/src/useIsomorphicLayoutEffect.tsx diff --git a/packages/acme-utils/src/usePrevious.tsx b/packages/labfaz-utils/src/usePrevious.tsx similarity index 100% rename from packages/acme-utils/src/usePrevious.tsx rename to packages/labfaz-utils/src/usePrevious.tsx diff --git a/packages/acme-core/tsconfig.json b/packages/labfaz-utils/tsconfig.json similarity index 57% rename from packages/acme-core/tsconfig.json rename to packages/labfaz-utils/tsconfig.json index 9be70c0..fb3ddd4 100644 --- a/packages/acme-core/tsconfig.json +++ b/packages/labfaz-utils/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@acme/tsconfig/react-library.json", + "extends": "@labfaz/tsconfig/react-library.json", "include": ["."], "exclude": ["dist", "build", "node_modules"] } diff --git a/yarn.lock b/yarn.lock index 045cd88..05621e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,173 +5,6 @@ __metadata: version: 6 cacheKey: 8 -"@acme/api@workspace:apps/api": - version: 0.0.0-use.local - resolution: "@acme/api@workspace:apps/api" - dependencies: - "@acme/routers": 0.0.0 - "@acme/tsconfig": 0.0.0 - "@types/cors": 2.8.12 - "@types/express": 4.17.13 - "@types/node": 18.6.4 - cors: 2.8.5 - express: 4.18.1 - nodemon: 2.0.19 - ts-node: 10.9.1 - typescript: 4.7.4 - languageName: unknown - linkType: soft - -"@acme/client@workspace:apps/client": - version: 0.0.0-use.local - resolution: "@acme/client@workspace:apps/client" - dependencies: - "@acme/core": 0.0.0 - "@acme/db": 0.0.0 - "@acme/tsconfig": 0.0.0 - "@axe-core/react": 4.4.3 - "@hookform/error-message": 2.0.0 - "@hookform/resolvers": 2.9.6 - "@next-auth/prisma-adapter": 1.0.4 - "@prisma/client": 4.1.0 - "@trpc/client": 9.26.2 - "@trpc/next": 9.26.2 - "@trpc/react": 9.26.2 - "@trpc/server": 9.26.2 - "@types/node": 18.6.4 - "@types/react": 18.0.17 - "@types/react-dom": 18.0.6 - autoprefixer: 10.4.7 - clsx: 1.2.1 - daisyui: 2.24.0 - eslint: 8.22.0 - eslint-config-acme: 0.0.0 - eslint-plugin-tailwindcss: 3.6.0 - i18next: 19.7.0 - i18next-typescript: 0.1.0 - next: 12.2.5 - next-auth: 4.10.3 - next-i18next: 11.3.0 - postcss: 8.4.14 - prettier: 2.7.1 - prettier-plugin-tailwindcss: 0.1.13 - react: 18.2.0 - react-dom: 18.2.0 - react-hook-form: 7.33.1 - react-query: 3.39.2 - superjson: 1.9.1 - tailwindcss: 3.1.6 - typescript: 4.7.4 - zod: 3.17.9 - languageName: unknown - linkType: soft - -"@acme/core@0.0.0, @acme/core@workspace:packages/acme-core": - version: 0.0.0-use.local - resolution: "@acme/core@workspace:packages/acme-core" - dependencies: - "@acme/tsconfig": 0.0.0 - "@types/react": 18.0.17 - "@types/react-dom": 18.0.6 - eslint: 8.22.0 - eslint-config-acme: 0.0.0 - react: 18.2.0 - tsup: 5.10.1 - typescript: 4.7.4 - languageName: unknown - linkType: soft - -"@acme/db@0.0.0, @acme/db@workspace:packages/acme-db": - version: 0.0.0-use.local - resolution: "@acme/db@workspace:packages/acme-db" - dependencies: - "@prisma/client": 4.1.0 - prisma: 4.1.0 - languageName: unknown - linkType: soft - -"@acme/docs@workspace:apps/docs": - version: 0.0.0-use.local - resolution: "@acme/docs@workspace:apps/docs" - dependencies: - "@acme/core": 0.0.0 - "@babel/core": 7.18.10 - "@mdx-js/react": 1.6.22 - "@storybook/addon-a11y": 6.5.10 - "@storybook/addon-actions": 6.5.10 - "@storybook/addon-docs": 6.5.10 - "@storybook/addon-essentials": 6.5.10 - "@storybook/addon-interactions": 6.5.10 - "@storybook/builder-vite": 0.2.2 - "@storybook/react": 6.5.10 - "@storybook/testing-library": 0.0.13 - "@types/react": 18.0.17 - "@types/react-dom": 18.0.6 - "@vitejs/plugin-react": 2.0.1 - babel-loader: 8.2.5 - eslint: 8.22.0 - eslint-config-acme: 0.0.0 - eslint-plugin-storybook: 0.6.4 - prettier: 2.7.1 - react: 18.2.0 - react-dom: 18.2.0 - serve: 13.0.2 - typescript: 4.7.4 - vite: 3.0.7 - languageName: unknown - linkType: soft - -"@acme/e2e@workspace:packages/acme-e2e": - version: 0.0.0-use.local - resolution: "@acme/e2e@workspace:packages/acme-e2e" - dependencies: - "@acme/tsconfig": 0.0.0 - "@cucumber/cucumber": 8.5.0 - "@cucumber/messages": 19.1.2 - "@cucumber/pretty-formatter": 1.0.0 - "@playwright/test": 1.24.0 - "@types/fs-extra": 9.0.13 - "@types/node": 18.6.4 - eslint: 8.22.0 - eslint-config-acme: 0.0.0 - fs-extra: 10.1.0 - ts-node: 10.9.1 - tsconfig-paths: 4.0.0 - typescript: 4.7.4 - languageName: unknown - linkType: soft - -"@acme/routers@0.0.0, @acme/routers@workspace:packages/acme-routers": - version: 0.0.0-use.local - resolution: "@acme/routers@workspace:packages/acme-routers" - dependencies: - "@acme/db": 0.0.0 - "@trpc/server": 9.26.2 - zod: 3.17.9 - languageName: unknown - linkType: soft - -"@acme/tsconfig@0.0.0, @acme/tsconfig@workspace:packages/acme-tsconfig": - version: 0.0.0-use.local - resolution: "@acme/tsconfig@workspace:packages/acme-tsconfig" - languageName: unknown - linkType: soft - -"@acme/utils@workspace:packages/acme-utils": - version: 0.0.0-use.local - resolution: "@acme/utils@workspace:packages/acme-utils" - dependencies: - "@acme/tsconfig": 0.0.0 - "@types/react": 18.0.17 - "@types/react-dom": 18.0.6 - eslint: 8.22.0 - eslint-config-acme: 0.0.0 - react: 18.2.0 - tsup: 5.10.1 - typescript: 4.7.4 - languageName: unknown - linkType: soft - "@ampproject/remapping@npm:^2.1.0": version: 2.2.0 resolution: "@ampproject/remapping@npm:2.2.0" @@ -3322,6 +3155,174 @@ __metadata: languageName: node linkType: hard +"@labfaz/api@workspace:apps/api": + version: 0.0.0-use.local + resolution: "@labfaz/api@workspace:apps/api" + dependencies: + "@labfaz/routers": 0.0.0 + "@labfaz/tsconfig": 0.0.0 + "@types/cors": 2.8.12 + "@types/express": 4.17.13 + "@types/node": 18.6.4 + cors: 2.8.5 + express: 4.18.1 + nodemon: 2.0.19 + ts-node: 10.9.1 + typescript: 4.7.4 + languageName: unknown + linkType: soft + +"@labfaz/client@workspace:apps/client": + version: 0.0.0-use.local + resolution: "@labfaz/client@workspace:apps/client" + dependencies: + "@axe-core/react": 4.4.3 + "@hookform/error-message": 2.0.0 + "@hookform/resolvers": 2.9.6 + "@labfaz/core": 0.0.0 + "@labfaz/db": 0.0.0 + "@labfaz/tsconfig": 0.0.0 + "@next-auth/prisma-adapter": 1.0.4 + "@prisma/client": 4.1.0 + "@trpc/client": 9.26.2 + "@trpc/next": 9.26.2 + "@trpc/react": 9.26.2 + "@trpc/server": 9.26.2 + "@types/node": 18.6.4 + "@types/react": 18.0.17 + "@types/react-dom": 18.0.6 + autoprefixer: 10.4.7 + clsx: 1.2.1 + daisyui: 2.24.0 + eslint: 8.22.0 + eslint-config-labfaz: 0.0.0 + eslint-plugin-tailwindcss: 3.6.0 + i18next: 19.7.0 + i18next-typescript: 0.1.0 + next: 12.2.5 + next-auth: 4.10.3 + next-i18next: 11.3.0 + postcss: 8.4.14 + prettier: 2.7.1 + prettier-plugin-tailwindcss: 0.1.13 + react: 18.2.0 + react-dom: 18.2.0 + react-hook-form: 7.33.1 + react-query: 3.39.2 + superjson: 1.9.1 + tailwindcss: 3.1.6 + typescript: 4.7.4 + zod: 3.17.9 + languageName: unknown + linkType: soft + +"@labfaz/core@0.0.0, @labfaz/core@workspace:packages/labfaz-core": + version: 0.0.0-use.local + resolution: "@labfaz/core@workspace:packages/labfaz-core" + dependencies: + "@labfaz/tsconfig": 0.0.0 + "@types/react": 18.0.15 + "@types/react-dom": 18.0.6 + "@typescript-eslint/eslint-plugin": 5.30.6 + eslint: 8.21.0 + eslint-config-labfaz: 0.0.0 + react: 18.2.0 + tsup: 5.10.1 + typescript: 4.7.4 + languageName: unknown + linkType: soft + +"@labfaz/db@0.0.0, @labfaz/db@workspace:packages/labfaz-db": + version: 0.0.0-use.local + resolution: "@labfaz/db@workspace:packages/labfaz-db" + dependencies: + "@prisma/client": 4.1.0 + prisma: 4.1.0 + languageName: unknown + linkType: soft + +"@labfaz/docs@workspace:apps/docs": + version: 0.0.0-use.local + resolution: "@labfaz/docs@workspace:apps/docs" + dependencies: + "@babel/core": 7.18.10 + "@labfaz/core": 0.0.0 + "@mdx-js/react": 1.6.22 + "@storybook/addon-a11y": 6.5.10 + "@storybook/addon-actions": 6.5.10 + "@storybook/addon-docs": 6.5.10 + "@storybook/addon-essentials": 6.5.10 + "@storybook/addon-interactions": 6.5.10 + "@storybook/builder-vite": 0.2.2 + "@storybook/react": 6.5.10 + "@storybook/testing-library": 0.0.13 + "@types/react": 18.0.17 + "@types/react-dom": 18.0.6 + "@vitejs/plugin-react": 2.0.1 + babel-loader: 8.2.5 + eslint: 8.22.0 + eslint-config-labfaz: 0.0.0 + eslint-plugin-storybook: 0.6.4 + prettier: 2.7.1 + react: 18.2.0 + react-dom: 18.2.0 + serve: 13.0.2 + typescript: 4.7.4 + vite: 3.0.7 + languageName: unknown + linkType: soft + +"@labfaz/e2e@workspace:packages/labfaz-e2e": + version: 0.0.0-use.local + resolution: "@labfaz/e2e@workspace:packages/labfaz-e2e" + dependencies: + "@cucumber/cucumber": 8.5.0 + "@cucumber/messages": 19.1.2 + "@cucumber/pretty-formatter": 1.0.0 + "@labfaz/tsconfig": 0.0.0 + "@playwright/test": 1.24.0 + "@types/fs-extra": 9.0.13 + "@types/node": 18.6.4 + eslint: 8.21.0 + eslint-config-labfaz: 0.0.0 + fs-extra: 10.1.0 + ts-node: 10.9.1 + tsconfig-paths: 4.0.0 + typescript: 4.7.4 + languageName: unknown + linkType: soft + +"@labfaz/routers@0.0.0, @labfaz/routers@workspace:packages/labfaz-routers": + version: 0.0.0-use.local + resolution: "@labfaz/routers@workspace:packages/labfaz-routers" + dependencies: + "@labfaz/db": 0.0.0 + "@trpc/server": 9.26.2 + zod: 3.17.9 + languageName: unknown + linkType: soft + +"@labfaz/tsconfig@0.0.0, @labfaz/tsconfig@workspace:packages/labfaz-tsconfig": + version: 0.0.0-use.local + resolution: "@labfaz/tsconfig@workspace:packages/labfaz-tsconfig" + languageName: unknown + linkType: soft + +"@labfaz/utils@workspace:packages/labfaz-utils": + version: 0.0.0-use.local + resolution: "@labfaz/utils@workspace:packages/labfaz-utils" + dependencies: + "@labfaz/tsconfig": 0.0.0 + "@types/react": 18.0.15 + "@types/react-dom": 18.0.6 + eslint: 8.21.0 + eslint-config-labfaz: 0.0.0 + react: 18.2.0 + tsup: 5.10.1 + typescript: 4.7.4 + languageName: unknown + linkType: soft + "@manypkg/find-root@npm:^1.1.0": version: 1.1.0 resolution: "@manypkg/find-root@npm:1.1.0" @@ -3375,6 +3376,15 @@ __metadata: languageName: node linkType: hard +"@mdx-js/preact@npm:1": + version: 1.6.22 + resolution: "@mdx-js/preact@npm:1.6.22" + peerDependencies: + preact: ^10.4.8 + checksum: 0a8bb49319a39d1612ead383120ee308c45f0f3c7e1e2a5308f3c898ee9e23f90f06fff6d16e3cb97fad290af943ac2361da736852ada0fa93430dbc72afeaa7 + languageName: node + linkType: hard + "@mdx-js/react@npm:1.6.22, @mdx-js/react@npm:^1.6.22": version: 1.6.22 resolution: "@mdx-js/react@npm:1.6.22" @@ -5674,7 +5684,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*": +"@types/react@npm:*, @types/react@npm:18.0.15": version: 18.0.15 resolution: "@types/react@npm:18.0.15" dependencies: @@ -11110,12 +11120,11 @@ __metadata: languageName: node linkType: hard -"eslint-config-acme@0.0.0, eslint-config-acme@workspace:packages/eslint-config-acme": +"eslint-config-labfaz@0.0.0, eslint-config-labfaz@workspace:packages/eslint-config-labfaz": version: 0.0.0-use.local - resolution: "eslint-config-acme@workspace:packages/eslint-config-acme" + resolution: "eslint-config-labfaz@workspace:packages/eslint-config-labfaz" dependencies: "@cspell/eslint-plugin": 6.6.1 - "@typescript-eslint/eslint-plugin": 5.30.6 "@typescript-eslint/parser": 5.30.6 eslint: 8.22.0 eslint-config-next: 12.2.2 @@ -11446,6 +11455,55 @@ __metadata: languageName: node linkType: hard +"eslint@npm:8.21.0": + version: 8.21.0 + resolution: "eslint@npm:8.21.0" + dependencies: + "@eslint/eslintrc": ^1.3.0 + "@humanwhocodes/config-array": ^0.10.4 + "@humanwhocodes/gitignore-to-minimatch": ^1.0.2 + ajv: ^6.10.0 + chalk: ^4.0.0 + cross-spawn: ^7.0.2 + debug: ^4.3.2 + doctrine: ^3.0.0 + escape-string-regexp: ^4.0.0 + eslint-scope: ^7.1.1 + eslint-utils: ^3.0.0 + eslint-visitor-keys: ^3.3.0 + espree: ^9.3.3 + esquery: ^1.4.0 + esutils: ^2.0.2 + fast-deep-equal: ^3.1.3 + file-entry-cache: ^6.0.1 + find-up: ^5.0.0 + functional-red-black-tree: ^1.0.1 + glob-parent: ^6.0.1 + globals: ^13.15.0 + globby: ^11.1.0 + grapheme-splitter: ^1.0.4 + ignore: ^5.2.0 + import-fresh: ^3.0.0 + imurmurhash: ^0.1.4 + is-glob: ^4.0.0 + js-yaml: ^4.1.0 + json-stable-stringify-without-jsonify: ^1.0.1 + levn: ^0.4.1 + lodash.merge: ^4.6.2 + minimatch: ^3.1.2 + natural-compare: ^1.4.0 + optionator: ^0.9.1 + regexpp: ^3.2.0 + strip-ansi: ^6.0.1 + strip-json-comments: ^3.1.0 + text-table: ^0.2.0 + v8-compile-cache: ^2.0.3 + bin: + eslint: bin/eslint.js + checksum: 1d39ddb08772ea230cb7d74f7f81f85b9d46965d3600725c7eb39a27bcdaf28cb2a780dacf6cfa1cfbf2da606b57a5e7e3ab373ab474cbcf0ba042076821f501 + languageName: node + linkType: hard + "eslint@npm:8.22.0": version: 8.22.0 resolution: "eslint@npm:8.22.0" @@ -19532,6 +19590,7 @@ __metadata: dependencies: "@changesets/cli": 2.22.0 "@commitlint/config-conventional": 17.0.3 + "@mdx-js/preact": 1 commitizen: 4.2.4 commitizen-emoji: 1.0.5 commitlint: 17.0.3 @@ -19539,8 +19598,8 @@ __metadata: danger-plugin-lint-report: 1.7.0 danger-plugin-todos: 1.3.1 danger-plugin-yarn: 1.5.1 - eslint: 8.22.0 - eslint-config-acme: 0.0.0 + eslint: 8.21.0 + eslint-config-labfaz: 0.0.0 husky: 8.0.0 lint-staged: 13.0.3 npm-run-all: 4.1.5