Skip to content

Commit 9e8d7cc

Browse files
committed
Fixed turbo
1 parent 68f463a commit 9e8d7cc

File tree

5 files changed

+59
-3
lines changed

5 files changed

+59
-3
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
node_modules
22
build
3+
./apps/web/.env
4+
./packages/db/.env

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
},
77
"scripts": {
88
"build": "turbo build",
9+
"start": "cd apps/web && yarn run start",
910
"dev": "turbo dev",
1011
"lint": "turbo lint",
1112
"lint:fix": "turbo lint:fix",

packages/ui/turbo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://turbo.build/schema.json",
33
"extends": ["//"],
4-
"pipeline": {
4+
"tasks": {
55
"build": {
66
"outputs": ["dist/**"]
77
}

turbo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"CACHE_EXPIRE"
1616
],
1717
"globalDependencies": ["**/.env.*local", "**/.env", ".env", ".env.local", "tsconfig.json"],
18-
"pipeline": {
18+
"tasks": {
1919
"build": {
2020
"dependsOn": ["^build"],
2121
"outputs": [".next/**", "!.next/cache/**"]

yarn.lock

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,16 @@
982982
version "1.1.0"
983983
resolved "https://registry.yarnpkg.com/@radix-ui/react-separator/-/react-separator-1.1.0.tgz#ee0f4d86003b0e3ea7bc6ccab01ea0adee32663e"
984984
integrity sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==
985+
<<<<<<< Updated upstream
986+
=======
987+
dependencies:
988+
"@radix-ui/react-primitive" "2.0.0"
989+
990+
"@radix-ui/[email protected]", "@radix-ui/react-slot@^1.0.2":
991+
version "1.0.2"
992+
resolved "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz"
993+
integrity sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==
994+
>>>>>>> Stashed changes
985995
dependencies:
986996
"@radix-ui/react-primitive" "2.0.0"
987997

@@ -2440,6 +2450,7 @@ data-uri-to-buffer@^6.0.2:
24402450
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz#8a58bb67384b261a38ef18bea1810cb01badd28b"
24412451
integrity sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==
24422452

2453+
<<<<<<< Updated upstream
24432454
data-view-buffer@^1.0.1:
24442455
version "1.0.1"
24452456
resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
@@ -2467,15 +2478,24 @@ data-view-byte-offset@^1.0.0:
24672478
es-errors "^1.3.0"
24682479
is-data-view "^1.0.1"
24692480

2481+
=======
2482+
>>>>>>> Stashed changes
24702483
date-fns@^3.6.0:
24712484
version "3.6.0"
24722485
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf"
24732486
integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==
24742487

2488+
<<<<<<< Updated upstream
24752489
debug@4, debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@~4.3.6:
24762490
version "4.3.6"
24772491
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
24782492
integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
2493+
=======
2494+
debug@4, [email protected], debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
2495+
version "4.3.4"
2496+
resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
2497+
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
2498+
>>>>>>> Stashed changes
24792499
dependencies:
24802500
ms "2.1.2"
24812501

@@ -5339,7 +5359,7 @@ notion-utils@^6.16.0:
53395359
mem "^9.0.2"
53405360
normalize-url "^7.0.3"
53415361
notion-types "^6.16.0"
5342-
p-queue "^7.2.0"
5362+
p-queue "6.6.2"
53435363

53445364
npm-run-path@^4.0.1:
53455365
version "4.0.1"
@@ -5598,6 +5618,7 @@ p-map@^5.3.0:
55985618
dependencies:
55995619
aggregate-error "^4.0.0"
56005620

5621+
<<<<<<< Updated upstream
56015622
p-queue@^7.2.0:
56025623
version "7.4.1"
56035624
resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-7.4.1.tgz#7f86f853048beca8272abdbb7cec1ed2afc0f265"
@@ -5606,6 +5627,8 @@ p-queue@^7.2.0:
56065627
eventemitter3 "^5.0.1"
56075628
p-timeout "^5.0.2"
56085629

5630+
=======
5631+
>>>>>>> Stashed changes
56095632
p-timeout@^5.0.2:
56105633
version "5.1.0"
56115634
resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b"
@@ -6828,6 +6851,18 @@ string-argv@~0.3.2:
68286851
integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
68296852

68306853
"string-width-cjs@npm:string-width@^4.2.0":
6854+
<<<<<<< Updated upstream
6855+
=======
6856+
version "4.2.3"
6857+
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
6858+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
6859+
dependencies:
6860+
emoji-regex "^8.0.0"
6861+
is-fullwidth-code-point "^3.0.0"
6862+
strip-ansi "^6.0.1"
6863+
6864+
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
6865+
>>>>>>> Stashed changes
68316866
version "4.2.3"
68326867
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
68336868
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6941,6 +6976,16 @@ stringify-entities@^4.0.0:
69416976
character-entities-legacy "^3.0.0"
69426977

69436978
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
6979+
<<<<<<< Updated upstream
6980+
=======
6981+
version "6.0.1"
6982+
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
6983+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
6984+
dependencies:
6985+
ansi-regex "^5.0.1"
6986+
6987+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
6988+
>>>>>>> Stashed changes
69446989
version "6.0.1"
69456990
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
69466991
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -7776,7 +7821,11 @@ wrap-ansi@^6.0.1:
77767821

77777822
wrap-ansi@^7.0.0:
77787823
version "7.0.0"
7824+
<<<<<<< Updated upstream
77797825
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
7826+
=======
7827+
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
7828+
>>>>>>> Stashed changes
77807829
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
77817830
dependencies:
77827831
ansi-styles "^4.0.0"
@@ -7861,5 +7910,9 @@ yocto-queue@^0.1.0:
78617910

78627911
zwitch@^2.0.0, zwitch@^2.0.4:
78637912
version "2.0.4"
7913+
<<<<<<< Updated upstream
78647914
resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"
7915+
=======
7916+
resolved "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz"
7917+
>>>>>>> Stashed changes
78657918
integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==

0 commit comments

Comments
 (0)