From d8c534353573501022bf424eb14ba77738ccbe23 Mon Sep 17 00:00:00 2001 From: Zakaria Mansouri Date: Mon, 10 Apr 2023 15:41:52 +0200 Subject: [PATCH 1/3] removed server code of ./data --- README.md | 9 ++- api/src/data/service.ts | 4 +- data/firebase/.firebaserc | 17 ----- data/firebase/.gitignore | 72 -------------------- data/firebase/firebase.json | 38 ----------- data/package.json | 9 +-- data/src/build.ts | 39 ----------- data/src/{get => }/collection.ts | 3 +- data/src/config/index.ts | 17 ----- data/src/{get => }/entry.ts | 0 data/src/index.ts | 50 -------------- package.json | 6 +- packages/tooling/.prettierignore | 4 ++ web/src/build/pages/dynamic-pages.ts | 2 +- web/src/build/sitemap.ts | 2 +- web/src/redux/actions/articles-page/index.ts | 1 - web/src/utils/fetch/index.ts | 3 - 17 files changed, 20 insertions(+), 256 deletions(-) delete mode 100644 data/firebase/.firebaserc delete mode 100644 data/firebase/.gitignore delete mode 100644 data/firebase/firebase.json delete mode 100644 data/src/build.ts rename data/src/{get => }/collection.ts (96%) delete mode 100644 data/src/config/index.ts rename data/src/{get => }/entry.ts (100%) delete mode 100644 data/src/index.ts diff --git a/README.md b/README.md index 5b86cfc1f..bf9edbe7a 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,10 @@ You can find more about each folder by clicking on the folder name | **Apps** | **Coverage** | **Production URL** | **Staging URL** | **Local URL** | | :-------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------- | -----------------------------------------------: | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | ------------------------------------------------: | -| [web](./web) | [![codecov](https://codecov.io/gh/dzcode-io/dzcode.io/graph/badge.svg?flag=web)](https://codecov.io/gh/dzcode-io/dzcode.io) | [dzcode.io](https://dzcode.io) | [stage.dzcode.io](https://stage.dzcode.io) | [localhost:8080](http://localhost:8080) | -| [data](./data) | [![codecov](https://codecov.io/gh/dzcode-io/dzcode.io/graph/badge.svg?flag=data)](https://codecov.io/gh/dzcode-io/dzcode.io) | [data.dzcode.io](https://data.dzcode.io) | [data.stage.dzcode.io](https://data.stage.dzcode.io) | [localhost:9090](http://localhost:9090) | | [api](./api) | [![codecov](https://codecov.io/gh/dzcode-io/dzcode.io/graph/badge.svg?flag=api)](https://codecov.io/gh/dzcode-io/dzcode.io) | [api.dzcode.io/docs](https://api.dzcode.io/docs) | [api-stage.dzcode.io/docs](https://api-stage.dzcode.io/docs) | [localhost:7070/docs](http://localhost:7070/docs) | +| [web](./web) | [![codecov](https://codecov.io/gh/dzcode-io/dzcode.io/graph/badge.svg?flag=web)](https://codecov.io/gh/dzcode-io/dzcode.io) | [dzcode.io](https://dzcode.io) | [stage.dzcode.io](https://stage.dzcode.io) | [localhost:8080](http://localhost:8080) | | [mobile](./mobile) | [![codecov](https://codecov.io/gh/dzcode-io/dzcode.io/graph/badge.svg?flag=mobile)](https://codecov.io/gh/dzcode-io/dzcode.io) | | [Android](https://play.google.com/store/apps/details?id=io.dzcode.mobile) \| [iOS](https://testflight.apple.com/join/XDcfIqdJ) \| [Expo](https://expo.dev/@zakman.dev/dzcode?release-channel=stage) | run `yarn --cwd=mobile start:expo` | +| [data](./data) | [![codecov](https://codecov.io/gh/dzcode-io/dzcode.io/graph/badge.svg?flag=data)](https://codecov.io/gh/dzcode-io/dzcode.io) | | | | | **Packages** | | | | | | [models](./packages/models) | [![codecov](https://codecov.io/gh/dzcode-io/dzcode.io/graph/badge.svg?flag=models)](https://codecov.io/gh/dzcode-io/dzcode.io) | | | | | [utils](./packages/utils) | [![codecov](https://codecov.io/gh/dzcode-io/dzcode.io/graph/badge.svg?flag=utils)](https://codecov.io/gh/dzcode-io/dzcode.io) | | | | @@ -65,10 +65,9 @@ yarn dev:mobile yarn dev:all ``` -- For web server go to -- For data server go to - For api server go to -- For mobile go to and scan QR code with your phone +- For web server go to +- For mobile run `yarn --cwd=mobile start:expo` and scan QR code with your phone **Note** diff --git a/api/src/data/service.ts b/api/src/data/service.ts index c807dd285..d1efaef20 100644 --- a/api/src/data/service.ts +++ b/api/src/data/service.ts @@ -1,5 +1,5 @@ -import { getCollection } from "@dzcode.io/data/dist/get/collection"; -import { getEntry } from "@dzcode.io/data/dist/get/entry"; +import { getCollection } from "@dzcode.io/data/dist/collection"; +import { getEntry } from "@dzcode.io/data/dist/entry"; import { join } from "path"; import { Service } from "typedi"; diff --git a/data/firebase/.firebaserc b/data/firebase/.firebaserc deleted file mode 100644 index 7b1e87e7b..000000000 --- a/data/firebase/.firebaserc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "projects": { - "default": "dzcode-io" - }, - "targets": { - "dzcode-io": { - "hosting": { - "data.dzcode.io": [ - "data-dzcode-io" - ], - "data.stage.dzcode.io": [ - "data-staging-dzcode-io" - ] - } - } - } -} diff --git a/data/firebase/.gitignore b/data/firebase/.gitignore deleted file mode 100644 index 9371911af..000000000 --- a/data/firebase/.gitignore +++ /dev/null @@ -1,72 +0,0 @@ -# Project -public -data - -# Dependency directories -node_modules/ - -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -firebase-debug.log* - -# Firebase cache -.firebase/ - -# Firebase config - -# Uncomment this if you'd like others to create their own Firebase project. -# For a team working on the same Firebase project(s), it is recommended to leave -# it commented so all members can deploy to the same project(s) in .firebaserc. -# .firebaserc - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env diff --git a/data/firebase/firebase.json b/data/firebase/firebase.json deleted file mode 100644 index 5233f58af..000000000 --- a/data/firebase/firebase.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "hosting": [ - { - "target": "data.dzcode.io", - "public": "public", - "ignore": ["firebase.json", "**/.*", "**/node_modules/**"], - "headers": [ - { - "source": "**/*", - "headers": [ - { - "key": "Access-Control-Allow-Origin", - "value": "https://www.dzcode.io" - }, - { "key": "Cache-Control", "value": "no-cache" } - ] - } - ] - }, - { - "target": "data.stage.dzcode.io", - "public": "public", - "ignore": ["firebase.json", "**/.*", "**/node_modules/**"], - "headers": [ - { - "source": "**/*", - "headers": [ - { - "key": "Access-Control-Allow-Origin", - "value": "https://stage.dzcode.io" - }, - { "key": "Cache-Control", "value": "no-cache" } - ] - } - ] - } - ] -} diff --git a/data/package.json b/data/package.json index 09d22003b..00959b656 100644 --- a/data/package.json +++ b/data/package.json @@ -44,17 +44,14 @@ "build:watch": "lerna run build:alone:watch --scope=@dzcode.io/data --include-dependencies --parallel", "clean": "lerna run clean:alone --scope=@dzcode.io/api --include-dependencies --stream", "clean:alone": "rimraf dist coverage", - "deploy": "yarn generate:data && rimraf ./firebase/public && cpx -u \"./dist/_data/**/*\" ./firebase/public && cd ./firebase && firebase deploy --only hosting:data.dzcode.io --token \"$FIREBASE_TOKEN\"", - "deploy:stg": "yarn generate:data && rimraf ./firebase/public && cpx -u \"./dist/_data/**/*\" ./firebase/public && cd ./firebase && firebase deploy --only hosting:data.stage.dzcode.io --token \"$FIREBASE_TOKEN\"", - "generate:data": "node dist/build.js", "lint": "yarn build && yarn lint:alone", - "lint:alone": "yarn lint:eslint . && yarn lint:prettier --check .", + "lint:alone": "yarn lint:eslint . && yarn lint:prettier --check . && yarn lint:tsc && yarn lint:ts-prune", "lint:eslint": "eslint --config ../packages/tooling/.eslintrc.json --ignore-path ../packages/tooling/.eslintignore --report-unused-disable-directives", "lint:fix": "yarn build && yarn lint:fix:alone", "lint:fix:alone": "yarn lint:eslint --fix . && yarn lint:prettier --write .", "lint:prettier": "prettier --config ../packages/tooling/.prettierrc --ignore-path ../packages/tooling/.prettierignore --loglevel warn", - "start": "node dist/index.js", - "start:dev": "ts-node ../packages/tooling/nodemon.ts @dzcode.io/data && nodemon dist/index.js", + "lint:ts-prune": "ts-prune --error", + "lint:tsc": "tsc --noEmit", "test": "jest src", "test:cov": "jest src --coverage", "test:cov:watch": "jest src --coverage --watchAll", diff --git a/data/src/build.ts b/data/src/build.ts deleted file mode 100644 index 45d3f15d7..000000000 --- a/data/src/build.ts +++ /dev/null @@ -1,39 +0,0 @@ -import fse from "fs-extra"; -import glob from "glob"; -import { join } from "path"; - -import { getCollection } from "./get/collection"; -import { getEntry } from "./get/entry"; - -const outputFolder = "./dist/_data"; - -// Empty output folder -fse.ensureDirSync(outputFolder); -fse.emptyDirSync(outputFolder); - -// Generate individual Entries: -glob("models/**/info.json", {}, (err, files) => { - files.forEach((filePath) => { - const entryInfoPath = filePath.substr(7); - const path = entryInfoPath.slice(0, -"/info.json".length); - const entry = getEntry(join(__dirname, ".."), path); - fse.ensureFileSync(`${outputFolder}/${path}.json`); - fse.writeJSON(`${outputFolder}/${path}.json`, entry); - }); -}); - -// Generate Collections: -glob("models/*/*.json", {}, (err, files) => { - files.forEach((filePath) => { - const collectionPath = filePath.substr(7); - const backslashIndex = collectionPath.indexOf("/"); - const collectionType = collectionPath.slice(0, backslashIndex); - const collectionName = collectionPath.slice(backslashIndex + 1); - console.log(collectionType, collectionName); - - const collection = getCollection(join(__dirname, ".."), collectionType, collectionName); - const collectionFilePath = `${outputFolder}/${collectionPath.slice(0, -5)}.c.json`; - fse.ensureFileSync(collectionFilePath); - fse.writeJSON(collectionFilePath, collection); - }); -}); diff --git a/data/src/get/collection.ts b/data/src/collection.ts similarity index 96% rename from data/src/get/collection.ts rename to data/src/collection.ts index 6c51d59dc..2718584fd 100644 --- a/data/src/get/collection.ts +++ b/data/src/collection.ts @@ -4,11 +4,12 @@ import { join } from "path"; import { getEntry } from "./entry"; -export interface Collection { +interface Collection { items: string[] | "all"; include: string[]; } +// ts-prune-ignore-next export const getCollection = >( dataFolder: string, collectionType: string, diff --git a/data/src/config/index.ts b/data/src/config/index.ts deleted file mode 100644 index faa6ffc8f..000000000 --- a/data/src/config/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Environment, environments } from "@dzcode.io/utils/dist/config/environment"; - -export const getConfig = ( - environment: Environment = (process.env.NODE_ENV as Environment) || "development", - extra?: Record, -) => { - const e = environments.indexOf(environment); - - const hostname = extra?.hostname || "localhost"; - const port = 9090; - return { - port, - url: [`http://${hostname}:${port}`, "https://data.stage.dzcode.io", "https://data.dzcode.io"][ - e - ], - }; -}; diff --git a/data/src/get/entry.ts b/data/src/entry.ts similarity index 100% rename from data/src/get/entry.ts rename to data/src/entry.ts diff --git a/data/src/index.ts b/data/src/index.ts deleted file mode 100644 index 325786465..000000000 --- a/data/src/index.ts +++ /dev/null @@ -1,50 +0,0 @@ -import express from "express"; -import { join } from "path"; - -import { getConfig } from "./config"; -import { getCollection } from "./get/collection"; -import { getEntry } from "./get/entry"; - -const app = express(); - -// Apply headers and logger -app.use((req, res, next) => { - console.log(req.url); - res.header("Access-Control-Allow-Origin", "*"); - next(); -}); - -// Collections -app.get("/:type/:collection(\\S+.c.json$)", (req, res) => { - const collection = getCollection( - join(__dirname, ".."), - req.params.type, - req.params.collection, - req.query.language as string, - ); - - if (typeof collection === "number") { - return res.sendStatus(404); - } - - return res.json(collection); -}); - -// Entries -app.get("/:type/:entry([\\/\\S]+.json$)", (req, res) => { - const entry = getEntry( - join(__dirname, ".."), - `${req.params.type}/${req.params.entry.slice(0, -5)}`, - undefined, - req.query.language as string, - ); - - if (typeof entry === "number") { - return res.sendStatus(404); - } - return res.json(entry); -}); - -// Start the server -const { port, url } = getConfig(); -app.listen(port, () => console.log(`Data server listening at ${url}`)); diff --git a/package.json b/package.json index d28beb7ec..e6726bda2 100644 --- a/package.json +++ b/package.json @@ -62,11 +62,11 @@ "dev": "echo \"Please run one of these commands:\\n\\nyarn dev:web\\nyarn dev:mobile\\nyarn dev:all\n\"", "dev:all": "npm-run-all \"build --include-dependencies {@}\" --parallel \"build:watch --include-dependencies {@}\" \"start:dev {@}\" --", "dev:api": "yarn dev:all --scope=@dzcode.io/api", - "dev:mobile": "yarn dev:all --scope=@dzcode.io/{mobile,api,data}", - "dev:web": "yarn dev:all --scope=@dzcode.io/{web,api,data}", + "dev:mobile": "yarn dev:all --scope=@dzcode.io/{mobile,api}", + "dev:web": "yarn dev:all --scope=@dzcode.io/{web,api}", "e2e:all": "npm-run-all \"build --include-dependencies {@}\" --parallel \"build:watch --include-dependencies {@}\" \"start:dev {@}\" \"e2e:dev --scope=@dzcode.io/web\" --", "e2e:dev": "lerna run e2e:dev --parallel", - "e2e:web": "BROWSER=none yarn e2e:all --scope=@dzcode.io/{web,api,data}", + "e2e:web": "BROWSER=none yarn e2e:all --scope=@dzcode.io/{web,api}", "generate:bundle-info": "lerna run generate:bundle-info --parallel --", "generate:sentry-release": "lerna run generate:sentry-release --concurrency 1 --stream --", "lint": "yarn build && yarn lint:alone", diff --git a/packages/tooling/.prettierignore b/packages/tooling/.prettierignore index d9de82521..7f7f50337 100644 --- a/packages/tooling/.prettierignore +++ b/packages/tooling/.prettierignore @@ -10,6 +10,10 @@ firebase # web bundle +.bundle-info.json + +# mobile +.expo ./.* .gitignore diff --git a/web/src/build/pages/dynamic-pages.ts b/web/src/build/pages/dynamic-pages.ts index bf1e01cb3..d34beaea1 100644 --- a/web/src/build/pages/dynamic-pages.ts +++ b/web/src/build/pages/dynamic-pages.ts @@ -1,4 +1,4 @@ -import { getCollection } from "@dzcode.io/data/dist/get/collection"; +import { getCollection } from "@dzcode.io/data/dist/collection"; import { join } from "path"; import { PageInfo } from "."; diff --git a/web/src/build/sitemap.ts b/web/src/build/sitemap.ts index 93101f788..01deaed40 100644 --- a/web/src/build/sitemap.ts +++ b/web/src/build/sitemap.ts @@ -1,4 +1,4 @@ -import { getCollection } from "@dzcode.io/data/dist/get/collection"; +import { getCollection } from "@dzcode.io/data/dist/collection"; import { allLanguages } from "@dzcode.io/models/dist/language"; import { createWriteStream } from "fs"; import { join } from "path"; diff --git a/web/src/redux/actions/articles-page/index.ts b/web/src/redux/actions/articles-page/index.ts index 900a05b4b..812e8a746 100644 --- a/web/src/redux/actions/articles-page/index.ts +++ b/web/src/redux/actions/articles-page/index.ts @@ -45,7 +45,6 @@ export const fetchArticlesList = async (): Promise => { /** * Fetches the content of the current article */ -// @TODO-ZM: remove this once ./data is migrated to ./api export const fetchCurrentArticle = async (): Promise => { const match = matchPath<{ lang?: LanguageEntity["code"]; slug: string }>( diff --git a/web/src/utils/fetch/index.ts b/web/src/utils/fetch/index.ts index d0c3621d0..572f5fb7b 100644 --- a/web/src/utils/fetch/index.ts +++ b/web/src/utils/fetch/index.ts @@ -32,9 +32,6 @@ export const fetchV2 = async < let baseURL = ""; switch (domain) { - case "data": - baseURL = fullstackConfig.data.url; - break; case "api": baseURL = fullstackConfig.api.url; break; From 877512f5eaaaaf09c9c397c0a773e18afdef6eec Mon Sep 17 00:00:00 2001 From: Zakaria Mansouri Date: Mon, 10 Apr 2023 15:44:36 +0200 Subject: [PATCH 2/3] fixed mismatching expo deps --- mobile/package.json | 9 ++- package.json | 4 +- yarn.lock | 130 ++++++++++---------------------------------- 3 files changed, 34 insertions(+), 109 deletions(-) diff --git a/mobile/package.json b/mobile/package.json index 7642e917f..d96ce2564 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -18,9 +18,9 @@ "expo-constants": "~14.2.1", "expo-device": "~5.2.1", "expo-status-bar": "~1.4.4", - "expo-updates": "~0.16.3", + "expo-updates": "~0.16.4", "react": "18.2.0", - "react-native": "0.71.4", + "react-native": "0.71.6", "react-redux": "^7.2.6", "redux": "^4.1.2", "redux-thunk": "^2.4.1", @@ -37,8 +37,7 @@ "eas-cli": "^3.8.1", "internal-ip": "^6.2.0", "jest-expo": "^48.0.2", - "react-test-renderer": "^18.2.0", - "typescript": "^4.9.4" + "react-test-renderer": "^18.2.0" }, "engines": { "node": ">=16", @@ -93,7 +92,7 @@ "lint:prettier": "prettier --config ../packages/tooling/.prettierrc --ignore-path ../packages/tooling/.prettierignore --loglevel warn", "lint:tsc": "tsc --noEmit", "start:dev": "echo \" \n\\033[0;32mPlease run in a separate terminal session the following command:\n \n\\033[0;32myarn --cwd=mobile start:expo\n \n \"", - "start:expo": "expo start --port 1010", + "start:expo": "rimraf .bundle-info.json && expo start --port 1010", "test": "yarn build && yarn test:alone", "test:alone": "jest --rootDir .", "test:watch": "npm-run-all build --parallel build:watch \"test:alone --watch {@}\" --" diff --git a/package.json b/package.json index e6726bda2..c00b0c41c 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "ts-node": "^10.9.1", "ts-patch": "^2.0.2", "ts-prune": "^0.10.3", - "typescript": "^4.8.2", + "typescript": "^4.9.4", "typescript-transform-paths": "^3.3.1" }, "lint-staged": { @@ -51,7 +51,7 @@ "jest-watch-typeahead": "^0.6.5", "react": "^18.0.1", "ts-jest": "^29.0.5", - "typescript": "^4.8.2" + "typescript": "^4.9.4" }, "scripts": { "build": "lerna run build:alone --stream", diff --git a/yarn.lock b/yarn.lock index 1b9f6ff1d..1273c5da0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5185,7 +5185,7 @@ dependencies: serve-static "^1.13.1" -"@react-native-community/cli-doctor@^10.2.0": +"@react-native-community/cli-doctor@^10.2.2": version "10.2.2" resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-10.2.2.tgz#b1893604fa9fc8971064e7c00042350f96868bfe" integrity sha512-49Ep2aQOF0PkbAR/TcyMjOm9XwBa8VQr+/Zzf4SJeYwiYLCT1NZRAVAVjYRXl0xqvq5S5mAGZZShS4AQl4WsZw== @@ -5229,19 +5229,7 @@ glob "^7.1.3" logkitty "^0.7.1" -"@react-native-community/cli-platform-ios@10.2.0": - version "10.2.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.0.tgz#be21c0e3bbf17358d540cc23e5556bf679f6322e" - integrity sha512-hIPK3iL/mL+0ChXmQ9uqqzNOKA48H+TAzg+hrxQLll/6dNMxDeK9/wZpktcsh8w+CyhqzKqVernGcQs7tPeKGw== - dependencies: - "@react-native-community/cli-tools" "^10.1.1" - chalk "^4.1.2" - execa "^1.0.0" - fast-xml-parser "^4.0.12" - glob "^7.1.3" - ora "^5.4.1" - -"@react-native-community/cli-platform-ios@^10.2.1": +"@react-native-community/cli-platform-ios@10.2.1", "@react-native-community/cli-platform-ios@^10.2.1": version "10.2.1" resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.1.tgz#2e6bd2cb6d48cbb8720d7b7265bb1bab80745f72" integrity sha512-hz4zu4Y6eyj7D0lnZx8Mf2c2si8y+zh/zUTgCTaPPLzQD8jSZNNBtUUiA1cARm2razpe8marCZ1QbTMAGbf3mg== @@ -5253,7 +5241,7 @@ glob "^7.1.3" ora "^5.4.1" -"@react-native-community/cli-plugin-metro@^10.2.0": +"@react-native-community/cli-plugin-metro@^10.2.2": version "10.2.2" resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-10.2.2.tgz#766914e3c8007dfe52b253544c4f6cd8549919ac" integrity sha512-sTGjZlD3OGqbF9v1ajwUIXhGmjw9NyJ/14Lo0sg7xH8Pv4qUd5ZvQ6+DWYrQn3IKFUMfGFWYyL81ovLuPylrpw== @@ -5307,17 +5295,17 @@ dependencies: joi "^17.2.1" -"@react-native-community/cli@10.2.0": - version "10.2.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-10.2.0.tgz#bcb65bb3dcb03b0fc4e49619d51e12d23396b301" - integrity sha512-QH7AFBz5FX2zTZRH/o3XehHrZ0aZZEL5Sh+23nSEFgSj3bLFfvjjZhuoiRSAo7iiBdvAoXrfxQ8TXgg4Xf/7fw== +"@react-native-community/cli@10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-10.2.2.tgz#3fa438ba7f19f83e07bc337765fc1cabdcf2cac2" + integrity sha512-aZVcVIqj+OG6CrliR/Yn8wHxrvyzbFBY9cj7n0MvRw/P54QUru2nNqUTSSbqv0Qaa297yHJbe6kFDojDMSTM8Q== dependencies: "@react-native-community/cli-clean" "^10.1.1" "@react-native-community/cli-config" "^10.1.1" "@react-native-community/cli-debugger-ui" "^10.0.0" - "@react-native-community/cli-doctor" "^10.2.0" + "@react-native-community/cli-doctor" "^10.2.2" "@react-native-community/cli-hermes" "^10.2.0" - "@react-native-community/cli-plugin-metro" "^10.2.0" + "@react-native-community/cli-plugin-metro" "^10.2.2" "@react-native-community/cli-server-api" "^10.1.1" "@react-native-community/cli-tools" "^10.1.1" "@react-native-community/cli-types" "^10.0.0" @@ -11957,10 +11945,10 @@ expo-updates-interface@~0.9.0: resolved "https://registry.yarnpkg.com/expo-updates-interface/-/expo-updates-interface-0.9.1.tgz#e81308d551ed5a4c35c8770ac61434f6ca749610" integrity sha512-wk88LLhseQ7LJvxdN7BTKiryyqALxnrvr+lyHK3/prg76Yy0EGi2Q/oE/rtFyyZ1JmQDRbO/5pdX0EE6QqVQXQ== -expo-updates@~0.16.3: - version "0.16.3" - resolved "https://registry.yarnpkg.com/expo-updates/-/expo-updates-0.16.3.tgz#190f5896f98db2e130b608d61c8359ee4b2c2125" - integrity sha512-uFr2Fvq7IbKwz9xEqWE9GNEs0sBAd6uiUI9McTCKw4BzKhjylRbPAN3zewc7MGLOvhTwBASva79VLQVgzdoBRw== +expo-updates@~0.16.4: + version "0.16.4" + resolved "https://registry.yarnpkg.com/expo-updates/-/expo-updates-0.16.4.tgz#6d05438cf7304add03645a598211ac4ef3cc4f64" + integrity sha512-hEUotP10sBiYn6dvkYC2rIa+kAmsBuaMp32sIVNAYEwKMQJqEwqNAKTU6CpJ4Aoc//BYL2Hv8qNo/UsT4rATRg== dependencies: "@expo/code-signing-certificates" "0.0.5" "@expo/config" "~8.0.0" @@ -16901,16 +16889,6 @@ methods@^1.0.1, methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -metro-babel-transformer@0.73.8: - version "0.73.8" - resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.73.8.tgz#521374cb9234ba126f3f8d63588db5901308b4ed" - integrity sha512-GO6H/W2RjZ0/gm1pIvdO9EP34s3XN6kzoeyxqmfqKfYhJmYZf1SzXbyiIHyMbJNwJVrsKuHqu32+GopTlKscWw== - dependencies: - "@babel/core" "^7.20.0" - hermes-parser "0.8.0" - metro-source-map "0.73.8" - nullthrows "^1.1.1" - metro-babel-transformer@0.73.9: version "0.73.9" resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.73.9.tgz#bec8aaaf1bbdc2e469fde586fde455f8b2a83073" @@ -17092,19 +17070,6 @@ metro-react-native-babel-preset@0.73.9: "@babel/template" "^7.0.0" react-refresh "^0.4.0" -metro-react-native-babel-transformer@0.73.8: - version "0.73.8" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.8.tgz#cbcd4b243216878431dc4311ce46f02a928e3991" - integrity sha512-oH/LCCJPauteAE28c0KJAiSrkV+1VJbU0PwA9UwaWnle+qevs/clpKQ8LrIr33YbBj4CiI1kFoVRuNRt5h4NFg== - dependencies: - "@babel/core" "^7.20.0" - babel-preset-fbjs "^3.4.0" - hermes-parser "0.8.0" - metro-babel-transformer "0.73.8" - metro-react-native-babel-preset "0.73.8" - metro-source-map "0.73.8" - nullthrows "^1.1.1" - metro-react-native-babel-transformer@0.73.9: version "0.73.9" resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.9.tgz#4f4f0cfa5119bab8b53e722fabaf90687d0cbff0" @@ -17125,14 +17090,6 @@ metro-resolver@0.73.9: dependencies: absolute-path "^0.0.0" -metro-runtime@0.73.8: - version "0.73.8" - resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.73.8.tgz#dadae7c154fbbde24390cf7f7e7d934a2768cd18" - integrity sha512-M+Bg9M4EN5AEpJ8NkiUsawD75ifYvYfHi05w6QzHXaqOrsTeaRbbeLuOGCYxU2f/tPg17wQV97/rqUQzs9qEtA== - dependencies: - "@babel/runtime" "^7.0.0" - react-refresh "^0.4.0" - metro-runtime@0.73.9: version "0.73.9" resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.73.9.tgz#0b24c0b066b8629ee855a6e5035b65061fef60d5" @@ -17141,20 +17098,6 @@ metro-runtime@0.73.9: "@babel/runtime" "^7.0.0" react-refresh "^0.4.0" -metro-source-map@0.73.8: - version "0.73.8" - resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.73.8.tgz#5134174e3d43de26ad331b95f637944c6547d441" - integrity sha512-wozFXuBYMAy7b8BCYwC+qoXsvayVJBHWtSTlSLva99t+CoUSG9JO9kg1umzbOz28YYPxKmvb/wbnLMkHdas2cA== - dependencies: - "@babel/traverse" "^7.20.0" - "@babel/types" "^7.20.0" - invariant "^2.2.4" - metro-symbolicate "0.73.8" - nullthrows "^1.1.1" - ob1 "0.73.8" - source-map "^0.5.6" - vlq "^1.0.0" - metro-source-map@0.73.9: version "0.73.9" resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.73.9.tgz#89ca41f6346aeb12f7f23496fa363e520adafebe" @@ -17169,18 +17112,6 @@ metro-source-map@0.73.9: source-map "^0.5.6" vlq "^1.0.0" -metro-symbolicate@0.73.8: - version "0.73.8" - resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.73.8.tgz#96920f607bce484283d822ee5fe18d932f69c03d" - integrity sha512-xkBAcceYYp0GGdCCuMzkCF1ejHsd0lYlbKBkjSRgM0Nlj80VapPaSwumYoAvSaDxcbkvS7/sCjURGp5DsSFgRQ== - dependencies: - invariant "^2.2.4" - metro-source-map "0.73.8" - nullthrows "^1.1.1" - source-map "^0.5.6" - through2 "^2.0.1" - vlq "^1.0.0" - metro-symbolicate@0.73.9: version "0.73.9" resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.73.9.tgz#cb452299a36e5b86b2826e7426d51221635c48bf" @@ -18227,11 +18158,6 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -ob1@0.73.8: - version "0.73.8" - resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.8.tgz#c569f1a15ce2d04da6fd70293ad44b5a93b11978" - integrity sha512-1F7j+jzD+edS6ohQP7Vg5f3yiIk5i3x1uLrNIHOmLHWzWK1t3zrDpjnoXghccdVlsU+UjbyURnDynm4p0GgXeA== - ob1@0.73.9: version "0.73.9" resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.9.tgz#d5677a0dd3e2f16ad84231278d79424436c38c59" @@ -20299,7 +20225,7 @@ react-native-gesture-handler@^2.9.0: lodash "^4.17.21" prop-types "^15.7.2" -react-native-gradle-plugin@^0.71.16: +react-native-gradle-plugin@^0.71.17: version "0.71.17" resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.17.tgz#cf780a27270f0a32dca8184eff91555d7627dd00" integrity sha512-OXXYgpISEqERwjSlaCiaQY6cTY5CH6j73gdkWpK0hedxtiWMWgH+i5TOi4hIGYitm9kQBeyDu+wim9fA8ROFJA== @@ -20358,15 +20284,15 @@ react-native-screens@^3.20.0: react-freeze "^1.0.0" warn-once "^0.1.0" -react-native@0.71.4: - version "0.71.4" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.4.tgz#f03f600efe68f745d19454ab17f9c1a9ef304790" - integrity sha512-3hSYqvWrOdKhpV3HpEKp1/CkWx8Sr/N/miCrmUIAsVTSJUR7JW0VvIsrV9urDhUj/s6v2WF4n7qIEEJsmTCrPw== +react-native@0.71.6: + version "0.71.6" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.6.tgz#e8f07baf55abd1015eaa7040ceaa4aa632c2c04f" + integrity sha512-gHrDj7qaAaiE41JwaFCh3AtvOqOLuRgZtHKzNiwxakG/wvPAYmG73ECfWHGxjxIx/QT17Hp37Da3ipCei/CayQ== dependencies: "@jest/create-cache-key-function" "^29.2.1" - "@react-native-community/cli" "10.2.0" + "@react-native-community/cli" "10.2.2" "@react-native-community/cli-platform-android" "10.2.0" - "@react-native-community/cli-platform-ios" "10.2.0" + "@react-native-community/cli-platform-ios" "10.2.1" "@react-native/assets" "1.0.0" "@react-native/normalize-color" "2.1.0" "@react-native/polyfills" "2.0.0" @@ -20379,16 +20305,16 @@ react-native@0.71.4: jest-environment-node "^29.2.1" jsc-android "^250231.0.0" memoize-one "^5.0.0" - metro-react-native-babel-transformer "0.73.8" - metro-runtime "0.73.8" - metro-source-map "0.73.8" + metro-react-native-babel-transformer "0.73.9" + metro-runtime "0.73.9" + metro-source-map "0.73.9" mkdirp "^0.5.1" nullthrows "^1.1.1" pretty-format "^26.5.2" promise "^8.3.0" react-devtools-core "^4.26.1" react-native-codegen "^0.71.5" - react-native-gradle-plugin "^0.71.16" + react-native-gradle-plugin "^0.71.17" react-refresh "^0.4.0" react-shallow-renderer "^16.15.0" regenerator-runtime "^0.13.2" @@ -23518,10 +23444,10 @@ typescript-transform-paths@^3.3.1: dependencies: minimatch "^3.0.4" -typescript@^4.8.2, typescript@^4.9.4: - version "4.8.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" - integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== +typescript@^4.9.4: + version "4.9.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" + integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== ua-parser-js@^0.7.30: version "0.7.34" From 25de3984d1cb9ea7a30d50dcf75a9742bc549011 Mon Sep 17 00:00:00 2001 From: Zakaria Mansouri Date: Mon, 10 Apr 2023 22:34:53 +0200 Subject: [PATCH 3/3] downgraded typescript back to ^4.8.2 --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c00b0c41c..e6726bda2 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "ts-node": "^10.9.1", "ts-patch": "^2.0.2", "ts-prune": "^0.10.3", - "typescript": "^4.9.4", + "typescript": "^4.8.2", "typescript-transform-paths": "^3.3.1" }, "lint-staged": { @@ -51,7 +51,7 @@ "jest-watch-typeahead": "^0.6.5", "react": "^18.0.1", "ts-jest": "^29.0.5", - "typescript": "^4.9.4" + "typescript": "^4.8.2" }, "scripts": { "build": "lerna run build:alone --stream", diff --git a/yarn.lock b/yarn.lock index 1273c5da0..f4a4daa9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23444,10 +23444,10 @@ typescript-transform-paths@^3.3.1: dependencies: minimatch "^3.0.4" -typescript@^4.9.4: - version "4.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^4.8.2: + version "4.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" + integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== ua-parser-js@^0.7.30: version "0.7.34"