Skip to content

Commit

Permalink
Bump posthog-react-native from 3.3.9 to 3.6.1 in /client (#6439)
Browse files Browse the repository at this point in the history
  • Loading branch information
gewfy authored Dec 30, 2024
2 parents c6c3d4d + 4d957d1 commit a89e880
Show file tree
Hide file tree
Showing 170 changed files with 4,225 additions and 1,134 deletions.
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"intl-pluralrules": "^2.0.1",
"lodash.throttle": "^4.1.1",
"lottie-react-native": "^6.7.2",
"posthog-react-native": "^3.3.9",
"posthog-react-native": "^3.6.1",
"ramda": "^0.30.1",
"react": "18.2.0",
"react-i18next": "^15.0.1",
Expand Down
5 changes: 4 additions & 1 deletion client/src/lib/components/VideoLooper/VideoLooper.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ import React, {
import {VideoLooperProperties} from './VideoLooper';
import styled from 'styled-components';

const useCanvasColorCorrection = !(
const useCanvasColorCorrection = false; // Currently disabled because of rendering issues on Windows
/*
!(
typeof window !== 'undefined' &&
/^((?!chrome|android).)*safari/i.test(navigator.userAgent)
); // Not Safari
*/

const Wrapper = styled.div({
position: 'relative',
Expand Down
8 changes: 4 additions & 4 deletions client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9539,10 +9539,10 @@ [email protected]:
picocolors "^1.0.0"
source-map-js "^1.2.0"

posthog-react-native@^3.3.9:
version "3.3.9"
resolved "https://registry.yarnpkg.com/posthog-react-native/-/posthog-react-native-3.3.9.tgz#bb551d3858430ca686a1b459f15bde20e9033948"
integrity sha512-Gb7Hc0HKMGc9T3bWXF1IfAOYkBlzIOKl71CVveEdNEzUkxvN3bfsq5CQ2TXNpzz31q2BMvfVEt0SIN9JQZCeKA==
posthog-react-native@^3.6.1:
version "3.6.1"
resolved "https://registry.yarnpkg.com/posthog-react-native/-/posthog-react-native-3.6.1.tgz#a0a7189761013fac3ef46582b5e3b279067ba7ca"
integrity sha512-IRGfLEranh+8nTvUsyw97XeqhGwi0ine/F6tMGrdT+RmlsRFA9eRYLwupkdCviRL9mMVugBY6J4v1R1MvBw+1w==

prelude-ls@^1.2.1:
version "1.2.1"
Expand Down
4 changes: 2 additions & 2 deletions cms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"prettier": "^3.4.1",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5.6.3",
"vite": "^5.4.10"
"typescript": "^5.7.2",
"vite": "^6.0.3"
}
}
551 changes: 290 additions & 261 deletions cms/yarn.lock

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions content/fixContentIds.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import {writeFileSync} from 'fs';
import {getContentByType} from './src/utils/utils';
import path from 'path';

const typesWithIds = ['categories', 'collections', 'exercises', 'tags'];

typesWithIds.forEach(type => {
const content = getContentByType(type, false);
Object.entries(content).forEach(([fileKey, translations]) => {
Object.entries(translations).forEach(([languageTag, translation]) => {
if (translation.id !== fileKey) {
const filePath = path.resolve('src', type, `${fileKey}.json`);
console.log(
`🚨 Fixing ID ${translation.id} for ${type}/${fileKey}/${languageTag}`,
);

translations = {
...translations,
[languageTag]: {
...translation,
id: fileKey,
},
};

writeFileSync(filePath, JSON.stringify(translations, null, 2));
}
});
});
});

console.log('Done!');
7 changes: 4 additions & 3 deletions content/importFromCsv.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {mergeDeepLeft, uniq} from 'ramda';
import {mergeDeepWith, uniq} from 'ramda';
import {unflatten} from 'safe-flat';
import * as csv from '@fast-csv/parse';
import {getContentByType} from './src/utils/utils';
import {getContentByType, mergeWithArrays} from './src/utils/utils';
import {DEFAULT_LANGUAGE_TAG, LANGUAGE_TAG} from '../shared/src/i18n/constants';
import fs from 'fs';
import path from 'path';
Expand Down Expand Up @@ -65,7 +65,8 @@ const main = async () => {
const filePath = path.resolve('src', type, `${fileKey}.json`);
const fileContent = {
...content,
[TO_LANGUAGE_TAG]: mergeDeepLeft(
[TO_LANGUAGE_TAG]: mergeDeepWith(
mergeWithArrays,
unflatten(fileTranslations),
skipLanguageMergeForTypes.includes(type)
? {}
Expand Down
12 changes: 9 additions & 3 deletions content/src/categories/07c58365-832b-4b3f-b926-c09682632441.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,15 @@
"source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1702302654/Lottie/deal_with_stress_kodv1x.json"
}
},
"da": {},
"cs": {},
"nl": {},
"da": {
"id": "07c58365-832b-4b3f-b926-c09682632441"
},
"cs": {
"id": "07c58365-832b-4b3f-b926-c09682632441"
},
"nl": {
"id": "07c58365-832b-4b3f-b926-c09682632441"
},
"es": {
"name": "Gestionar el estrés",
"id": "07c58365-832b-4b3f-b926-c09682632441",
Expand Down
14 changes: 10 additions & 4 deletions content/src/categories/4fba05de-cc63-4613-9c84-a34f4cbbc58e.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,17 @@
"source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1702302654/Lottie/working_on_your.._yedzqe.json"
}
},
"da": {},
"cs": {},
"nl": {},
"da": {
"id": "4fba05de-cc63-4613-9c84-a34f4cbbc58e"
},
"cs": {
"id": "4fba05de-cc63-4613-9c84-a34f4cbbc58e"
},
"nl": {
"id": "4fba05de-cc63-4613-9c84-a34f4cbbc58e"
},
"es": {
"name": "Trabajar en tus relaciones",
"name": "Trabajar las relaciones",
"id": "4fba05de-cc63-4613-9c84-a34f4cbbc58e",
"collections": [
"716c2b31-612c-40c4-8e85-90f0a2af380e"
Expand Down
14 changes: 10 additions & 4 deletions content/src/categories/b7257c0a-f180-405f-8aff-05f9f75bddbd.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,17 @@
"source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1702302654/Lottie/understand_myself_qeibfi.json"
}
},
"da": {},
"cs": {},
"nl": {},
"da": {
"id": "b7257c0a-f180-405f-8aff-05f9f75bddbd"
},
"cs": {
"id": "b7257c0a-f180-405f-8aff-05f9f75bddbd"
},
"nl": {
"id": "b7257c0a-f180-405f-8aff-05f9f75bddbd"
},
"es": {
"name": "Conocerse a uno/a mismo/a",
"name": "Conocerte",
"id": "b7257c0a-f180-405f-8aff-05f9f75bddbd",
"collections": [
"1d35e981-4b8e-47f0-887a-0c90d21fb991",
Expand Down
12 changes: 9 additions & 3 deletions content/src/categories/e2d46c10-77c3-4784-a9ea-4e7b4939711d.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,15 @@
"source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1702302654/Lottie/find_meaning_wta8nc.json"
}
},
"da": {},
"cs": {},
"nl": {},
"da": {
"id": "e2d46c10-77c3-4784-a9ea-4e7b4939711d"
},
"cs": {
"id": "e2d46c10-77c3-4784-a9ea-4e7b4939711d"
},
"nl": {
"id": "e2d46c10-77c3-4784-a9ea-4e7b4939711d"
},
"es": {
"name": "Encontrar sentido",
"id": "e2d46c10-77c3-4784-a9ea-4e7b4939711d",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@
"b7f8731c-64d7-4c0f-9bc8-a3e50ec2eaf7",
"1e96f73b-8193-4aa6-a52c-31355eac3c08",
"12f448d2-39bc-4232-b8cf-b6cb570c7e00"
]
],
"id": "0eda04e3-4b45-44d6-b779-7b40f43f966c"
},
"cs": {
"tags": [
Expand All @@ -136,7 +137,8 @@
"b7f8731c-64d7-4c0f-9bc8-a3e50ec2eaf7",
"1e96f73b-8193-4aa6-a52c-31355eac3c08",
"12f448d2-39bc-4232-b8cf-b6cb570c7e00"
]
],
"id": "0eda04e3-4b45-44d6-b779-7b40f43f966c"
},
"nl": {
"tags": [
Expand All @@ -151,10 +153,11 @@
"b7f8731c-64d7-4c0f-9bc8-a3e50ec2eaf7",
"1e96f73b-8193-4aa6-a52c-31355eac3c08",
"12f448d2-39bc-4232-b8cf-b6cb570c7e00"
]
],
"id": "0eda04e3-4b45-44d6-b779-7b40f43f966c"
},
"es": {
"description": "Este es un punto de partida para una aventura hacia tu naturaleza interior y exterior.",
"description": "Este es el punto de partida para una aventura hacia tu naturaleza interior y exterior.",
"name": "Adéntrate en la naturaleza.",
"hidden": false,
"published": true,
Expand Down
71 changes: 59 additions & 12 deletions content/src/collections/12c07699-0129-4f9a-aab2-564e45d81484.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
"image": "https://res.cloudinary.com/cupcake-29k/image/upload/t_cocreator_image/v1731443225/SEE/FullCategories_CardImage-03_fqzn6x.png"
}
],
"tags": ["8da0534a-5da9-430a-bdf3-242ace6460fb"],
"tags": [
"8da0534a-5da9-430a-bdf3-242ace6460fb"
],
"link": "",
"id": "12c07699-0129-4f9a-aab2-564e45d81484",
"exercises": [
Expand All @@ -34,7 +36,9 @@
"published": false,
"sortOrder": 1,
"card": {},
"tags": ["8da0534a-5da9-430a-bdf3-242ace6460fb"],
"tags": [
"8da0534a-5da9-430a-bdf3-242ace6460fb"
],
"link": "",
"id": "12c07699-0129-4f9a-aab2-564e45d81484",
"exercises": [
Expand All @@ -50,7 +54,9 @@
"published": false,
"sortOrder": 1,
"card": {},
"tags": ["8da0534a-5da9-430a-bdf3-242ace6460fb"],
"tags": [
"8da0534a-5da9-430a-bdf3-242ace6460fb"
],
"link": "",
"id": "12c07699-0129-4f9a-aab2-564e45d81484",
"exercises": [
Expand All @@ -66,7 +72,9 @@
"published": false,
"sortOrder": 1,
"card": {},
"tags": ["8da0534a-5da9-430a-bdf3-242ace6460fb"],
"tags": [
"8da0534a-5da9-430a-bdf3-242ace6460fb"
],
"link": "",
"id": "12c07699-0129-4f9a-aab2-564e45d81484",
"exercises": [
Expand All @@ -77,34 +85,73 @@
]
},
"da": {
"tags": ["8da0534a-5da9-430a-bdf3-242ace6460fb"],
"tags": [
"8da0534a-5da9-430a-bdf3-242ace6460fb"
],
"exercises": [
"0e663e57-e320-4ec2-b246-b0a9de3f4056",
"3843d06f-1c38-47b9-ad9b-5a780f364186",
"4ade5d0d-6959-4ba6-9b0c-d98aef65b754",
"4dd7b844-b54a-4d00-b867-73d19a9b0729"
],
"card": {}
"card": {},
"id": "12c07699-0129-4f9a-aab2-564e45d81484"
},
"cs": {
"tags": ["8da0534a-5da9-430a-bdf3-242ace6460fb"],
"tags": [
"8da0534a-5da9-430a-bdf3-242ace6460fb"
],
"exercises": [
"0e663e57-e320-4ec2-b246-b0a9de3f4056",
"3843d06f-1c38-47b9-ad9b-5a780f364186",
"4ade5d0d-6959-4ba6-9b0c-d98aef65b754",
"4dd7b844-b54a-4d00-b867-73d19a9b0729"
],
"card": {}
"card": {},
"id": "12c07699-0129-4f9a-aab2-564e45d81484"
},
"nl": {
"tags": ["8da0534a-5da9-430a-bdf3-242ace6460fb"],
"tags": [
"8da0534a-5da9-430a-bdf3-242ace6460fb"
],
"exercises": [
"0e663e57-e320-4ec2-b246-b0a9de3f4056",
"3843d06f-1c38-47b9-ad9b-5a780f364186",
"4ade5d0d-6959-4ba6-9b0c-d98aef65b754",
"4dd7b844-b54a-4d00-b867-73d19a9b0729"
],
"card": {}
"card": {},
"id": "12c07699-0129-4f9a-aab2-564e45d81484"
},
"es": {}
}
"es": {
"description": "Ser resiliente significa que somos fuertes por dentro, que tenemos control y podemos enfrentar cualquier dificultad que aparezca en el camino. Incluso si ocurren cosas difíciles, al ser resilientes, podemos recuperarnos y volver a tener nuevamente el control.",
"name": "VER Resiliencia",
"hidden": false,
"locked": true,
"published": true,
"sortOrder": 1,
"card": {
"image": {
"source": "https://res.cloudinary.com/cupcake-29k/image/upload/t_card_image/v1731443225/SEE/FullCategories_CardImage-03_fqzn6x.png"
}
},
"coCreators": [
{
"name": "SEE Learning",
"url": "https://seelearning.emory.edu/en/home",
"image": "https://res.cloudinary.com/cupcake-29k/image/upload/t_cocreator_image/v1731443225/SEE/FullCategories_CardImage-03_fqzn6x.png"
}
],
"tags": [
"8da0534a-5da9-430a-bdf3-242ace6460fb"
],
"link": "",
"id": "12c07699-0129-4f9a-aab2-564e45d81484",
"exercises": [
"0e663e57-e320-4ec2-b246-b0a9de3f4056",
"3843d06f-1c38-47b9-ad9b-5a780f364186",
"4ade5d0d-6959-4ba6-9b0c-d98aef65b754",
"4dd7b844-b54a-4d00-b867-73d19a9b0729"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,15 @@
"imageBackgroundColor": "#fbf5e9"
}
},
"da": {},
"cs": {},
"nl": {},
"da": {
"id": "1d35e981-4b8e-47f0-887a-0c90d21fb991"
},
"cs": {
"id": "1d35e981-4b8e-47f0-887a-0c90d21fb991"
},
"nl": {
"id": "1d35e981-4b8e-47f0-887a-0c90d21fb991"
},
"es": {
"description": "Practica y prioriza el autocuidado - incluso en tiempos difíciles.",
"name": "Cuídate",
Expand Down
Loading

0 comments on commit a89e880

Please sign in to comment.