Skip to content

Commit

Permalink
feat: make m-n relations explicit (#123)
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeKarow authored Dec 30, 2022
2 parents c1d6a21 + ed16998 commit 9d68bb8
Show file tree
Hide file tree
Showing 51 changed files with 4,236 additions and 3,995 deletions.
7 changes: 1 addition & 6 deletions apps/app/next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// import { env } from './src/env/server.mjs'
import bundleAnalyze from '@next/bundle-analyzer'
import transpiler from 'next-transpile-modules'

import i18nConfig from './next-i18next.config.js'

// const withTM = transpiler(['@weareinreach/ui', '@weareinreach/db'])
/* eslint-disable-next-line turbo/no-undeclared-env-vars */
const withBundleAnalyzer = bundleAnalyze({ enabled: process.env.ANALYZE === 'true' })
/**
Expand All @@ -16,18 +14,15 @@ const withBundleAnalyzer = bundleAnalyze({ enabled: process.env.ANALYZE === 'tru
* @constraint {{import('next').NextConfig}}
*/
function defineNextConfig(config) {
// return withTM(config)
// return withBundleAnalyzer(withTM(config))
return withBundleAnalyzer(config)
}

export default defineNextConfig({
i18n: i18nConfig.i18n,
reactStrictMode: true,
swcMinify: true,
transpilePackages: ['@weareinreach/ui', '@weareinreach/db', '@weareinreach/auth', '@weareinreach/api'],
experimental: {
transpilePackages: ['@weareinreach/ui', '@weareinreach/db', '@weareinreach/auth', '@weareinreach/api'],
// serverComponentsExternalPackages: ['@weareinreach/db'],
fontLoaders: [{ loader: '@next/font/google', options: { subsets: ['latin'] } }],
/**
* OutputFileTracingIgnores will be in a future version
Expand Down
9 changes: 4 additions & 5 deletions apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@crowdin/ota-client": "0.7.0",
"@next/bundle-analyzer": "13.0.7",
"@next/bundle-analyzer": "13.1.1",
"@tanstack/react-query": "4.20.4",
"@trpc/client": "10.6.0",
"@trpc/next": "10.6.0",
Expand All @@ -31,17 +31,16 @@
"@weareinreach/ui": "0.100.0",
"axios": "1.2.1",
"i18next": "22.4.6",
"next": "13.0.7",
"next": "13.1.1",
"next-auth": "4.18.6",
"next-i18next": "13.0.2",
"next-transpile-modules": "10.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-i18next": "12.1.1",
"zod": "3.20.2"
},
"devDependencies": {
"@next/font": "13.0.7",
"@next/font": "13.1.1",
"@types/flat": "5.0.2",
"@types/node": "16.18.10",
"@types/react": "18.0.26",
Expand All @@ -53,7 +52,7 @@
"commander": "9.4.1",
"dotenv": "16.0.3",
"eslint": "8.30.0",
"eslint-config-next": "13.0.7",
"eslint-config-next": "13.1.1",
"eslint-import-resolver-typescript": "3.5.2",
"eslint-plugin-codegen": "0.16.1",
"eslint-plugin-i18next": "6.0.0-6",
Expand Down
4 changes: 2 additions & 2 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@types/react": "18.0.26",
"@types/react-dom": "18.0.9",
"eslint": "8.30.0",
"eslint-config-next": "13.0.7",
"next": "13.0.7",
"eslint-config-next": "13.1.1",
"next": "13.1.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "4.9.4"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
"@badeball/cypress-cucumber-preprocessor": "14.0.0",
"@changesets/cli": "2.26.0",
"@manypkg/cli": "0.19.2",
"@next/eslint-plugin-next": "13.0.7",
"@next/eslint-plugin-next": "13.1.1",
"@trivago/prettier-plugin-sort-imports": "4.0.0",
"@types/eslint": "8.4.10",
"@types/prettier": "2.7.2",
"@typescript-eslint/eslint-plugin": "5.47.0",
"@weareinreach/config": "0.100.0",
"@weareinreach/eslint-config": "0.100.0",
"cypress": "11.2.0",
"eslint-config-next": "13.0.7",
"eslint-config-next": "13.1.1",
"eslint-import-resolver-typescript": "3.5.2",
"eslint-plugin-codegen": "0.16.1",
"eslint-plugin-i18next": "6.0.0-6",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@weareinreach/config": "0.100.0",
"@weareinreach/db": "0.100.0",
"@weareinreach/eslint-config": "0.100.0",
"next": "13.0.7",
"next": "13.1.1",
"next-auth": "4.18.6",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/db/datastore
5 changes: 4 additions & 1 deletion packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"db:migrate": "pnpm with-env prisma migrate dev",
"db:migrate:edit": "pnpm with-env prisma migrate dev --create-only --skip-seed",
"db:mongoexport": "pnpm clean:export && pnpm with-env tsx ./seed/migrate-v1/mongoexport.ts",
"db:repl": "pnpm dlx @prismatools/console@latest",
"db:reset": "pnpm with-env prisma migrate reset",
"db:seed": "pnpm with-env prisma db seed",
"db:studio": "pnpm with-env prisma studio",
Expand Down Expand Up @@ -82,12 +83,14 @@
"recursive-readdir": "2.2.3",
"shoetest": "1.2.1",
"slugify": "1.6.5",
"superjson": "1.12.1",
"tiny-invariant": "1.3.1",
"tsup": "6.5.0",
"tsx": "3.12.1",
"type-fest": "3.4.0",
"typescript": "4.9.4",
"zod-prisma": "0.5.4"
"zod-prisma": "0.5.4",
"zod-prisma-types": "1.5.3"
},
"prisma": {
"seed": "tsx ./seed/starterData.ts"
Expand Down
Loading

0 comments on commit 9d68bb8

Please sign in to comment.