From 872b65023f1bc9dcb1e6c8ebe41ac191fa56ff94 Mon Sep 17 00:00:00 2001 From: mrevanzak Date: Sun, 29 Oct 2023 07:56:12 +0700 Subject: [PATCH] fix: some errors --- apps/expo/src/utils/api.tsx | 5 ++++- package.json | 6 +++--- pnpm-lock.yaml | 12 ++++++------ tooling/tailwind/tsconfig.json | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/apps/expo/src/utils/api.tsx b/apps/expo/src/utils/api.tsx index b5b718e..91741f2 100644 --- a/apps/expo/src/utils/api.tsx +++ b/apps/expo/src/utils/api.tsx @@ -31,7 +31,10 @@ const getBaseUrl = () => { const localhost = debuggerHost?.split(":")[0]; if (!localhost) { - // return "https://turbo.t3.gg"; + if (process.env.EXPO_PUBLIC_API_URL) { + return process.env.EXPO_PUBLIC_API_URL; + } + throw new Error( "Failed to get localhost. Please point to your production server.", ); diff --git a/package.json b/package.json index 306e6ef..4d7f854 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "db:studio": "pnpm -F db studio", "dev": "turbo dev --parallel", "dev:web": "turbo --filter @vivat/nextjs dev", - "dev:android": "expo start --android", - "dev:ios": "expo start --ios", + "dev:android": "pnpm --filter expo dev:android", + "dev:ios": "pnpm --filter expo dev:ios", "format": "turbo format --continue -- --cache --cache-location='node_modules/.cache/.prettiercache'", "format:fix": "turbo format --continue -- --write --cache --cache-location='node_modules/.cache/.prettiercache'", "lint": "turbo lint --continue -- --cache --cache-location 'node_modules/.cache/.eslintcache' && manypkg check", @@ -36,4 +36,4 @@ "packages/*", "tooling/*" ] -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a57c82d..bee7716 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -678,7 +678,7 @@ packages: resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.0 + '@babel/types': 7.19.0 dev: false /@babel/helper-module-imports@7.22.15: @@ -4147,7 +4147,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.22.1 - caniuse-lite: 1.0.30001555 + caniuse-lite: 1.0.30001557 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -4408,7 +4408,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001555 + caniuse-lite: 1.0.30001557 electron-to-chromium: 1.4.569 node-releases: 2.0.13 update-browserslist-db: 1.0.13(browserslist@4.22.1) @@ -4571,8 +4571,8 @@ packages: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} dev: false - /caniuse-lite@1.0.30001555: - resolution: {integrity: sha512-NzbUFKUnJ3DTcq6YyZB6+qqhfD112uR3uoEnkmfzm2wVzUNsFkU7AwBjKQ654Sp5cau0JxhFyRSn/tQZ+XfygA==} + /caniuse-lite@1.0.30001557: + resolution: {integrity: sha512-91oR7hLNUP3gG6MLU+n96em322a8Xzes8wWdBKhLgUoiJsAF5irZnxSUCbc+qUZXNnPCfUwLOi9ZCZpkvjQajw==} /chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -8593,7 +8593,7 @@ packages: '@next/env': 13.5.6 '@swc/helpers': 0.5.2 busboy: 1.6.0 - caniuse-lite: 1.0.30001555 + caniuse-lite: 1.0.30001557 postcss: 8.4.31 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) diff --git a/tooling/tailwind/tsconfig.json b/tooling/tailwind/tsconfig.json index f9a3fa3..6f6269e 100644 --- a/tooling/tailwind/tsconfig.json +++ b/tooling/tailwind/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@acme/tsconfig/base.json", + "extends": "@vivat/tsconfig/base.json", "compilerOptions": { "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" },