diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml index e08de725..d28ab7e8 100644 --- a/.github/workflows/backend-ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -12,12 +12,19 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: oven-sh/setup-bun@v1 + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node }} + + - uses: pnpm/action-setup@v3 + with: + version: 8 - run: | - cd ./backend/v1 - bun install - bun run build + pnpm i -g turbo bun + pnpm i -r + turbo run backend:v1:build backend:v1:docker:build build-v2: name: Build v2 🏗️ @@ -30,7 +37,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: oven-sh/setup-bun@v1 - name: Install Node.js uses: actions/setup-node@v4 @@ -42,9 +48,9 @@ jobs: version: 8 - run: | - cd ./backend/v2 - pnpm install - pnpm run build + pnpm i -g turbo + pnpm i -r + turbo run backend:v2:build publish-v1-docker-image: name: Publish Docker image 🚀 diff --git a/.github/workflows/check-format.yaml b/.github/workflows/check-format.yaml index 97bcbfcc..675968fc 100644 --- a/.github/workflows/check-format.yaml +++ b/.github/workflows/check-format.yaml @@ -34,5 +34,6 @@ jobs: - name: Check JS format run: | - pnpm install - pnpm run check:format + pnpm i -g turbo + pnpm i -r + pnpm run prettier:format:check diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml index 9766494f..5e1c8043 100644 --- a/.github/workflows/docs-ci.yml +++ b/.github/workflows/docs-ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Node.js uses: actions/setup-node@v4 @@ -27,12 +27,12 @@ jobs: - name: Lint continue-on-error: true run: | - cd ./docs - pnpm install - pnpm run lint + pnpm i -g turbo + pnpm i -r + turbo run docs:lint - name: Build run: | - cd ./docs - pnpm install - pnpm run build + pnpm i -g turbo + pnpm i -r + turbo run docs:build diff --git a/.gitignore b/.gitignore index 25b63a97..e54eef9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ **/.DS_Store node_modules -**/.env \ No newline at end of file +**/.env +.turbo \ No newline at end of file diff --git a/README.md b/README.md index fe6fc978..6c9c182b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,25 @@ # METRO NOW ![Apple watch screenshots](https://github.com/krystxf/metro-now/assets/48121710/3ce8f583-c260-4588-b63d-63ecadd22333) + +# Setup + +this project uses [turbo repo](https://turbo.build/repo/docs) + +```bash +pnpm install -r # install dependencies recursively +brew install xcbeautify swiftformat + +# turbo options +turbo run format + +turbo run docs:start + +turbo run backend:v1:start +turbo run backend:v1:build:docker + +turbo run backend:v2:start + +turbo run app:build +turbo run app:test +``` diff --git a/backend/v1/Dockerfile b/backend/v1/Dockerfile index c795c810..be9fa9a7 100644 --- a/backend/v1/Dockerfile +++ b/backend/v1/Dockerfile @@ -7,13 +7,13 @@ WORKDIR /usr/src/app # this will cache them and speed up future builds FROM base AS install RUN mkdir -p /temp/dev -COPY package.json bun.lockb /temp/dev/ -RUN cd /temp/dev && bun install --frozen-lockfile +COPY package.json pnpm-lock.yaml /temp/dev/ +RUN cd /temp/dev && pnpm install --frozen-lockfile # install with --production (exclude devDependencies) RUN mkdir -p /temp/prod COPY package.json bun.lockb /temp/prod/ -RUN cd /temp/prod && bun install --frozen-lockfile --production +RUN cd /temp/prod && pnpm install --frozen-lockfile --production # copy node_modules from temp directory # then copy all (non-ignored) project files into the image diff --git a/backend/v1/bun.lockb b/backend/v1/bun.lockb deleted file mode 100755 index ed0a0156..00000000 Binary files a/backend/v1/bun.lockb and /dev/null differ diff --git a/backend/v1/package.json b/backend/v1/package.json index 48befabb..f9fcd1bc 100644 --- a/backend/v1/package.json +++ b/backend/v1/package.json @@ -5,8 +5,7 @@ "version": "0.0.1", "scripts": { "start": "bun run src/server.ts", - "start:dev": "bun --watch src/server.ts", - "start:build": "bun run src/server.js", + "dev": "bun --watch src/server.ts", "build": "bun build src/server.ts --outdir build --minify", "docker:build": "docker build -t metro-now-server ." }, diff --git a/backend/v1/pnpm-lock.yaml b/backend/v1/pnpm-lock.yaml new file mode 100644 index 00000000..f69a2e5c --- /dev/null +++ b/backend/v1/pnpm-lock.yaml @@ -0,0 +1,79 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + + .: + dependencies: + radash: + specifier: ^12.1.0 + version: 12.1.0 + typescript: + specifier: ^5.0.0 + version: 5.4.5 + zod: + specifier: ^3.22.4 + version: 3.23.8 + devDependencies: + '@types/bun': + specifier: latest + version: 1.1.3 + +packages: + + '@types/bun@1.1.3': + resolution: {integrity: sha512-i+mVz8C/lx+RprDR6Mr402iE1kmajgJPnmSfJ/NvU85sGGXSylYZ/6yc+XhVLr2E/t8o6HmjwV0evtnUOR0CFA==} + + '@types/node@20.12.12': + resolution: {integrity: sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==} + + '@types/ws@8.5.10': + resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==} + + bun-types@1.1.9: + resolution: {integrity: sha512-3YuLiH4Ne/ghk7K6mHiaqCqKOMrtB0Z5p1WAskHSVgi0iMZgsARV4yGkbfi565YsStvUq6GXTWB3ga7M8cznkA==} + + radash@12.1.0: + resolution: {integrity: sha512-b0Zcf09AhqKS83btmUeYBS8tFK7XL2e3RvLmZcm0sTdF1/UUlHSsjXdCcWNxe7yfmAlPve5ym0DmKGtTzP6kVQ==} + engines: {node: '>=14.18.0'} + + typescript@5.4.5: + resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} + engines: {node: '>=14.17'} + hasBin: true + + undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + + zod@3.23.8: + resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} + +snapshots: + + '@types/bun@1.1.3': + dependencies: + bun-types: 1.1.9 + + '@types/node@20.12.12': + dependencies: + undici-types: 5.26.5 + + '@types/ws@8.5.10': + dependencies: + '@types/node': 20.12.12 + + bun-types@1.1.9: + dependencies: + '@types/node': 20.12.12 + '@types/ws': 8.5.10 + + radash@12.1.0: {} + + typescript@5.4.5: {} + + undici-types@5.26.5: {} + + zod@3.23.8: {} diff --git a/backend/v2/src/routes/index.ts b/backend/v2/src/routes/index.ts index 733a32cc..ae32e1de 100644 --- a/backend/v2/src/routes/index.ts +++ b/backend/v2/src/routes/index.ts @@ -5,6 +5,6 @@ export const routes = express.Router(); routes.use("/v1", v1routes); -routes.get("/", (req, res) => { +routes.get("/", (_, res) => { res.send(`Server is running! 🚀`); }); diff --git a/backend/v2/tsconfig.json b/backend/v2/tsconfig.json index 9b18c88e..8591ccae 100644 --- a/backend/v2/tsconfig.json +++ b/backend/v2/tsconfig.json @@ -1,109 +1,18 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - - /* Modules */ - "module": "NodeNext" /* Specify what module code is generated. */, - // "rootDir": "./", /* Specify the root folder within your source files. */ - "moduleResolution": "NodeNext" /* Specify how TypeScript looks up a file from a given module specifier. */, - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - // "types": [], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ - // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ - // "resolvePackageJsonImports": true /* Use the package.json 'imports' field when resolving imports. */, - // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - "resolveJsonModule": true /* Enable importing .json files. */, - // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist" /* Specify an output folder for all emitted files. */, - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, - - /* Type Checking */ - "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ + "target": "ESNext", + "module": "NodeNext", + "allowJs": false, + "resolveJsonModule": true, + "outDir": "./dist", + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitAny": true, + "strictNullChecks": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true, + "allowUnreachableCode": false, + "skipLibCheck": true } } diff --git a/package.json b/package.json index f1aa9ef0..cb2b5aac 100644 --- a/package.json +++ b/package.json @@ -16,11 +16,25 @@ "email": "krystof.kratky2003@gmail.com" }, "scripts": { - "format:all": "pnpm run format && pnpm run format-swift", - "format": "pnpm exec prettier . --write", - "check:format": "pnpm exec prettier . --check", - "format-swift": "swiftformat .", - "check:format-swift": "swiftformat . --lint" + "prettier:format": "pnpm exec prettier . --write", + "prettier:format:check": "pnpm exec prettier . --check", + "app:format": "swiftformat .", + "app:format:check": "swiftformat . --lint", + "docs:build": "cd docs && pnpm run build", + "docs:start": "cd docs && pnpm run start", + "docs:lint": "cd docs && pnpm run lint", + "docs:dev": "cd docs && pnpm run dev", + "backend:v1:dev": "cd backend/v1 && pnpm run dev", + "backend:v1:start": "cd backend/v1 && pnpm run start", + "backend:v1:build": "cd backend/v1 && pnpm run build", + "backend:v1:docker:build": "cd backend/v1 && pnpm run docker:build", + "backend:v2:dev": "cd backend/v2 && pnpm run dev", + "backend:v2:start": "cd backend/v2 && pnpm run start", + "backend:v2:build": "cd backend/v2 && pnpm run build", + "app:ios:build": "xcodebuild -workspace app/metro-now.xcodeproj/project.xcworkspace -scheme metro-now build | xcbeautify", + "app:ios:test": "xcodebuild -workspace app/metro-now.xcodeproj/project.xcworkspace -scheme metro-now test | xcbeautify", + "app:ios:widgets:build": "xcodebuild -workspace app/metro-now.xcodeproj/project.xcworkspace -scheme metro-now-widgetsExtension build | xcbeautify", + "app:watch:build": "xcodebuild -workspace app/metro-now.xcodeproj/project.xcworkspace -scheme \"metro-now-watch Watch App\" build | xcbeautify" }, "devDependencies": { "prettier": "^3.2.5" diff --git a/turbo.json b/turbo.json new file mode 100644 index 00000000..cc88b551 --- /dev/null +++ b/turbo.json @@ -0,0 +1,107 @@ +{ + "$schema": "https://turbo.build/schema.json", + "pipeline": { + "app:format": { + "inputs": ["app/**/*.swift"], + "cache": true + }, + "app:format:check": { + "inputs": ["app/**/*.swift"], + "cache": true + }, + "prettier:format": { + "cache": true + }, + "format": { + "dependsOn": ["app:format", "prettier:format"], + "cache": true + }, + "prettier:format:check": { + "cache": true + }, + "format:check": { + "dependsOn": ["app:format:check", "prettier:format:check"], + "cache": true + }, + "docs:build": { + "outputs": ["docs/.next/**", "!docs/.next/cache/**"], + "cache": true + }, + "docs:start": { + "dependsOn": ["docs:build"], + "persistent": true, + "cache": false + }, + "docs:lint": { + "cache": true + }, + "docs:dev": { + "persistent": true, + "cache": false + }, + "build": { + "dependsOn": ["docs:build"] + }, + "backend:v1:docker:build": { + "cache": true + }, + "backend:v1:build": { + "outputs": ["backend/v1/build/**"], + "cache": true + }, + "backend:v1:start": { + "dependsOn": ["backend:v1:build"], + "persistent": true, + "cache": false + }, + "backend:v1:dev": { "persistent": true, "cache": false }, + "backend:v2:build": { + "outputs": ["backend/v2/dist/**"], + "cache": true + }, + "backend:v2:start": { + "dependsOn": ["backend:v2:build"], + "persistent": true, + "cache": false + }, + "backend:v2:dev": { "persistent": true, "cache": false }, + "app:ios:build": { + "dependsOn": ["app:ios:widgets:build"], + "cache": true + }, + "app:ios:test": { + "dependsOn": ["app:ios:build"], + "cache": true + }, + "app:watch:build": { + "cache": true + }, + "app:ios:widgets:build": { + "cache": true + }, + "app:build": { + "dependsOn": [ + "app:ios:build", + "app:ios:widgets:build", + "app:watch:build" + ], + "cache": true + }, + "app:test": { + "dependsOn": ["app:ios:test"], + "cache": true + }, + "precommit": { + "dependsOn": [ + "format", + "docs:lint", + "docs:build", + "app:build", + "app:test", + "backend:v1:build", + "backend:v2:build" + ], + "cache": true + } + } +}