From 644636b9304c97ea3acbf183a0310252e4f346db Mon Sep 17 00:00:00 2001 From: desperado1802 Date: Fri, 20 Oct 2023 17:52:03 +0300 Subject: [PATCH 01/21] border indicating task running is removed from last 24 hours section --- .../Authenticated/ProfileScreen/components/ListCardItem.tsx | 3 ++- .../ProfileScreen/components/UserProfileTasks.tsx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx index 4046a53cc..27242d9ed 100644 --- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx +++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx @@ -34,6 +34,7 @@ export type ListItemProps = { activeAuthTask: boolean viewType?: "default" | "unassign" profile?: IUserProfile + isNowTab?: boolean } export interface Props extends ListItemProps {} @@ -259,7 +260,7 @@ const ListCardItem: React.FC = (props) => { {dark ? ( diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/UserProfileTasks.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/UserProfileTasks.tsx index cac54450f..b2a88e5be 100644 --- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/UserProfileTasks.tsx +++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/UserProfileTasks.tsx @@ -91,6 +91,7 @@ const UserProfileTasks: FC = observer(({ profile, content }) Date: Fri, 20 Oct 2023 18:18:34 +0300 Subject: [PATCH 02/21] removed the linear gradient from 24h section in dark theme --- .../Authenticated/ProfileScreen/components/ListCardItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx index 27242d9ed..6c155e8b8 100644 --- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx +++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx @@ -268,7 +268,7 @@ const ListCardItem: React.FC = (props) => { colors={["#B993E6", "#6EB0EC", "#5855D8"]} start={{ x: 0.1, y: 0.5 }} end={{ x: 1, y: 0.5 }} - style={{ padding: activeAuthTask ? 3 : 0, borderRadius: 14 }} + style={{ padding: activeAuthTask && props.isNowTab ? 3 : 0, borderRadius: 14 }} > From 78cb88bb65dd6340c71d5310f85cff146827287d Mon Sep 17 00:00:00 2001 From: desperado1802 Date: Fri, 20 Oct 2023 18:36:26 +0300 Subject: [PATCH 03/21] fixed the color of scroll buttons in labels and all statuses --- apps/mobile/app/components/AllTaskStatuses.tsx | 14 +++++++++----- apps/mobile/app/components/TaskLabels.tsx | 16 ++++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/apps/mobile/app/components/AllTaskStatuses.tsx b/apps/mobile/app/components/AllTaskStatuses.tsx index fbbd3b854..1bba8dc2e 100644 --- a/apps/mobile/app/components/AllTaskStatuses.tsx +++ b/apps/mobile/app/components/AllTaskStatuses.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useRef, useState } from "react" import { FlatList, StyleSheet, TouchableOpacity, View } from "react-native" import { AntDesign } from "@expo/vector-icons" -import { colors } from "../theme" +import { colors, useAppTheme } from "../theme" import LabelItem from "./LabelItem" import { useTaskLabelValue, @@ -16,6 +16,7 @@ import { ITeamTask } from "../services/interfaces/ITask" const AllTaskStatuses = ({ task }: { task: ITeamTask }) => { const flatListRef = useRef(null) const [labelIndex, setLabelIndex] = useState(0) + const { dark } = useAppTheme() const allStatuses = useTaskStatusValue() const allSizes = useTaskSizeValue() @@ -84,19 +85,22 @@ const AllTaskStatuses = ({ task }: { task: ITeamTask }) => { {labelIndex === labels.length - 2 || labels.length < 3 ? null : ( onNextPressed()} > - + )} {labelIndex !== 0 ? ( onPrevPressed()} > - + ) : null} diff --git a/apps/mobile/app/components/TaskLabels.tsx b/apps/mobile/app/components/TaskLabels.tsx index ce2e0614b..2ef75371e 100644 --- a/apps/mobile/app/components/TaskLabels.tsx +++ b/apps/mobile/app/components/TaskLabels.tsx @@ -38,14 +38,12 @@ interface IndividualTaskLabel { } const TaskLabels: FC = observer(({ task, setLabels, newTaskLabels }) => { - const { colors } = useAppTheme() + const { colors, dark } = useAppTheme() const { updateTask } = useTeamTasks() const [openModal, setOpenModal] = useState(false) const flatListRef = useRef(null) const [labelIndex, setLabelIndex] = useState(0) - const [tempLabels, setTempLabels] = useState( - task?.tags || newTaskLabels || [], - ) + const [tempLabels, setTempLabels] = useState(task?.tags || newTaskLabels || []) const [arrayChanged, setArrayChanged] = useState(false) const freshOpenModal = () => { @@ -150,7 +148,10 @@ const TaskLabels: FC = observer(({ task, setLabels, newTaskLabel newTaskLabels?.length < 3 ? null : ( onNextPressed()} > @@ -159,7 +160,10 @@ const TaskLabels: FC = observer(({ task, setLabels, newTaskLabel {labelIndex >= 1 ? ( onPrevPressed()} > From 66872ce1bef76bd981fa1fd4f910050e5fb0eb55 Mon Sep 17 00:00:00 2001 From: desperado1802 Date: Fri, 20 Oct 2023 18:41:28 +0300 Subject: [PATCH 04/21] fixed the imported colors object --- apps/mobile/app/components/AllTaskStatuses.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/mobile/app/components/AllTaskStatuses.tsx b/apps/mobile/app/components/AllTaskStatuses.tsx index 1bba8dc2e..a19880c03 100644 --- a/apps/mobile/app/components/AllTaskStatuses.tsx +++ b/apps/mobile/app/components/AllTaskStatuses.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useRef, useState } from "react" import { FlatList, StyleSheet, TouchableOpacity, View } from "react-native" import { AntDesign } from "@expo/vector-icons" -import { colors, useAppTheme } from "../theme" +import { useAppTheme } from "../theme" import LabelItem from "./LabelItem" import { useTaskLabelValue, @@ -16,7 +16,7 @@ import { ITeamTask } from "../services/interfaces/ITask" const AllTaskStatuses = ({ task }: { task: ITeamTask }) => { const flatListRef = useRef(null) const [labelIndex, setLabelIndex] = useState(0) - const { dark } = useAppTheme() + const { dark, colors } = useAppTheme() const allStatuses = useTaskStatusValue() const allSizes = useTaskSizeValue() @@ -88,7 +88,7 @@ const AllTaskStatuses = ({ task }: { task: ITeamTask }) => { style={[styles.scrollRight, { backgroundColor: dark ? "#1e2430" : colors.background }]} onPress={() => onNextPressed()} > - + )} {labelIndex !== 0 ? ( @@ -100,7 +100,7 @@ const AllTaskStatuses = ({ task }: { task: ITeamTask }) => { ]} onPress={() => onPrevPressed()} > - + ) : null} From 698ca2469509ad6c0ff017878d5eff7383761055 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 Oct 2023 02:20:26 +0000 Subject: [PATCH 05/21] chore(deps-dev): bump react-devtools-core in /apps/mobile Bumps [react-devtools-core](https://github.com/facebook/react/tree/HEAD/packages/react-devtools-core) from 4.27.3 to 4.28.4. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/HEAD/packages/react-devtools-core) --- updated-dependencies: - dependency-name: react-devtools-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- apps/mobile/package.json | 2 +- apps/mobile/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 5801c3f3e..325e1326d 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -149,7 +149,7 @@ "postinstall-prepare": "2.0.0", "prettier": "2.8.7", "query-string": "^8.1.0", - "react-devtools-core": "4.27.3", + "react-devtools-core": "4.28.4", "react-dom": "18.2.0", "react-native-web": "~0.18.11", "reactotron-core-client": "^2.8.10", diff --git a/apps/mobile/yarn.lock b/apps/mobile/yarn.lock index ceb06e3a1..7bd0935e4 100644 --- a/apps/mobile/yarn.lock +++ b/apps/mobile/yarn.lock @@ -12402,10 +12402,10 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@~1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-devtools-core@4.27.3, react-devtools-core@^4.26.1: - version "4.27.3" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.27.3.tgz#66145f0b765b60bd59ca622bf427770333c723b0" - integrity sha512-39mfD7VdF7mJm0+l9mrwluWPEZak700lgACGetqVmz5/FpcfThT53HNG8RoTd1UHybBPoDWUQTv0LW+0Hfbu6Q== +react-devtools-core@4.28.4, react-devtools-core@^4.26.1: + version "4.28.4" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.28.4.tgz#fb8183eada77093f4c2f9830e664bf22255abe27" + integrity sha512-IUZKLv3CimeM07G3vX4H4loxVpByrzq3HvfTX7v9migalwvLs9ZY5D3S3pKR33U+GguYfBBdMMZyToFhsSE/iQ== dependencies: shell-quote "^1.6.1" ws "^7" From a397cd863fb900803a9946aca7957c8432145ff9 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 09:52:20 +0200 Subject: [PATCH 06/21] chore: adding Desktop App build --- .github/workflows/desktop-prod.yml | 175 +++++++++++++++++++++++++++++ .github/workflows/release-prod.yml | 36 ++++++ .scripts/bump-version-electron.js | 57 ++++++++++ apps/desktop/.gitkeep | 0 apps/desktop/README.md | 3 + 5 files changed, 271 insertions(+) create mode 100644 .github/workflows/desktop-prod.yml create mode 100644 .github/workflows/release-prod.yml create mode 100644 .scripts/bump-version-electron.js delete mode 100644 apps/desktop/.gitkeep create mode 100644 apps/desktop/README.md diff --git a/.github/workflows/desktop-prod.yml b/.github/workflows/desktop-prod.yml new file mode 100644 index 000000000..6fae7ce22 --- /dev/null +++ b/.github/workflows/desktop-prod.yml @@ -0,0 +1,175 @@ +name: Desktop App Build DEV + +on: + workflow_run: + workflows: ['Release Prod'] + branches: [develop] + types: + - completed + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + release-linux: + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [buildjet-8vcpu-ubuntu-2204] + + steps: + - name: Check out Git repository + uses: actions/checkout@v3 + with: + repository: 'ever-co/ever-gauzy' + + - name: Install Node.js, NPM and Yarn + uses: buildjet/setup-node@v3 + with: + node-version: 16 + cache: 'yarn' + + - name: Change permissions + run: 'sudo chown -R $(whoami) ./*' + + - name: Install system dependencies + run: 'sudo apt-get update && sudo apt install -y curl gnupg git libappindicator3-1 ca-certificates binutils icnsutils graphicsmagick' + + - name: Install latest version of NPM + run: 'sudo npm install -g npm@9' + + - name: Install latest node-gyp package + run: 'sudo npm install --quiet -g node-gyp@9.3.1' + + - name: Install Yarn dependencies + run: 'yarn install --network-timeout 1000000 --frozen-lockfile' + + - name: Bootstrap Yarn + run: 'yarn bootstrap' + + - name: Bump version desktop timer app + uses: actions/github-script@v6 + with: + script: | + const script = require('./.scripts/bump-version-electron.js') + console.log(script.desktop(true)) + + - name: Build Desktop Timer App + run: 'yarn build:desktop-timer:linux:release:gh' + env: + USE_HARD_LINKS: false + GH_TOKEN: ${{ secrets.GH_TOKEN }} + EP_GH_IGNORE_TIME: true + SENTRY_DSN: ${{ secrets.SENTRY_DSN }} + SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}' + SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}' + SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}' + DO_KEY_ID: ${{ secrets.DO_KEY_ID }} + DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }} + NX_NO_CLOUD: true + + release-mac: + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [macos-12] + + steps: + - name: Check out Git repository + uses: actions/checkout@v3 + with: + repository: 'ever-co/ever-gauzy' + + - name: Install Node.js, NPM and Yarn + uses: actions/setup-node@v3 + with: + node-version: 16 + cache: 'yarn' + + - name: Install latest version of NPM + run: 'sudo npm install -g npm@9' + + - name: Install latest node-gyp package + run: 'sudo npm install --quiet -g node-gyp@9.3.1' + + - name: Install Yarn dependencies + run: 'yarn install --network-timeout 1000000 --frozen-lockfile' + + - name: Bootstrap Yarn + run: 'yarn bootstrap' + + - name: Bump version desktop timer app + uses: actions/github-script@v6 + with: + script: | + const script = require('./.scripts/bump-version-electron.js') + console.log(script.desktop(true)) + + - name: Build Desktop Timer App + run: 'yarn build:desktop-timer:mac:release' + env: + USE_HARD_LINKS: false + GH_TOKEN: ${{ secrets.GH_TOKEN }} + EP_GH_IGNORE_TIME: true + SENTRY_DSN: ${{ secrets.SENTRY_DSN }} + SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}' + SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}' + SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}' + DO_KEY_ID: ${{ secrets.DO_KEY_ID }} + DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }} + NX_NO_CLOUD: true + + release-windows: + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [windows-latest-l] + + steps: + - name: Check out Git repository + uses: actions/checkout@v3 + with: + repository: 'ever-co/ever-gauzy' + + - name: Install Node.js, NPM and Yarn + uses: actions/setup-node@v3 + with: + node-version: 16 + cache: 'yarn' + + - name: Install latest version of NPM + run: 'npm install -g npm@9' + + - name: Install latest node-gyp package + run: 'npm install --quiet -g node-gyp@9.3.1' + + - name: Install Yarn dependencies + run: 'yarn install --network-timeout 1000000 --frozen-lockfile' + + - name: Bootstrap Yarn + run: 'yarn bootstrap' + + - name: Bump version desktop timer app + uses: actions/github-script@v6 + with: + script: | + const script = require('./.scripts/bump-version-electron.js') + console.log(script.desktop(true)) + + - name: Build Desktop Timer App + run: 'yarn build:desktop-timer:windows:release:gh' + env: + USE_HARD_LINKS: false + GH_TOKEN: ${{ secrets.GH_TOKEN }} + EP_GH_IGNORE_TIME: true + SENTRY_DSN: ${{ secrets.SENTRY_DSN }} + SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}' + SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}' + SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}' + DO_KEY_ID: ${{ secrets.DO_KEY_ID }} + DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }} + NX_NO_CLOUD: true diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml new file mode 100644 index 000000000..4df1db2d7 --- /dev/null +++ b/.github/workflows/release-prod.yml @@ -0,0 +1,36 @@ +name: Release Prod + +on: + push: + branches: [develop] + +jobs: + release: + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [ubuntu-latest] + + steps: + - name: Check out Git repository + uses: actions/checkout@v3 + + - name: Bump version and push tag + uses: mathieudutour/github-tag-action@v6.1 + id: tag_version + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + release_branches: master,main,develop,stage + pre_release_branches: something_to_possible_use_later + + - name: Create a GitHub release + uses: ncipollo/release-action@v1 + with: + allowUpdates: true + generateReleaseNotes: true + prerelease: false + token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ steps.tag_version.outputs.new_tag }} + name: ${{ steps.tag_version.outputs.new_tag }} + body: ${{ steps.tag_version.outputs.changelog }} diff --git a/.scripts/bump-version-electron.js b/.scripts/bump-version-electron.js new file mode 100644 index 000000000..9a93ef8e7 --- /dev/null +++ b/.scripts/bump-version-electron.js @@ -0,0 +1,57 @@ +const fs = require('fs'); +const { exec } = require('child_process'); + +module.exports.desktop = (isProd) => { + if (fs.existsSync('./apps/desktop-timer/src/package.json')) { + let package = require('../apps/desktop-timer/src/package.json'); + let currentVersion = package.version; + + exec( + 'git fetch --tags && git tag --sort version:refname | tail -1', + (error, stdout) => { + if (error) { + console.error(`exec error: ${error}`); + return; + } + + let newVersion = stdout.trim(); + console.log('latest tag', newVersion); + if (newVersion) { + // let's remove "v" from version, i.e. first character + newVersion = newVersion.substring(1); + package.version = newVersion; + + if (!isProd) { + package.build.publish = [ + { + provider: 'github', + repo: 'ever-teams-desktop', + releaseType: 'prerelease' + }, + { + provider: 'spaces', + name: 'ever', + region: 'sfo3', + path: '/ever-teams-desktop-pre', + acl: 'public-read' + } + ]; + } + + fs.writeFileSync( + './apps/desktop-timer/src/package.json', + JSON.stringify(package, null, 2) + ); + + let updated = require('../apps/desktop-timer/src/package.json'); + console.log('Version updated to version', updated.version); + } else { + console.log( + 'Latest tag is not found. build desktop app with default version', + currentVersion + ); + } + } + ); + } +}; diff --git a/apps/desktop/.gitkeep b/apps/desktop/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/desktop/README.md b/apps/desktop/README.md new file mode 100644 index 000000000..01004d091 --- /dev/null +++ b/apps/desktop/README.md @@ -0,0 +1,3 @@ +# Ever Teams Desktop App + +The Source code for Ever Teams Desktop App located in From 2ca827331518374f87f888b6c9cca33e75f3601f Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 12:20:48 +0200 Subject: [PATCH 07/21] chore: fixing Desktop App publish --- .scripts/bump-version-electron.js | 22 +++++++++++++++++++++- .vscode/settings.json | 1 + 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.scripts/bump-version-electron.js b/.scripts/bump-version-electron.js index 9a93ef8e7..29e00d384 100644 --- a/.scripts/bump-version-electron.js +++ b/.scripts/bump-version-electron.js @@ -7,7 +7,7 @@ module.exports.desktop = (isProd) => { let currentVersion = package.version; exec( - 'git fetch --tags && git tag --sort version:refname | tail -1', + 'git fetch git@github.com:ever-co/ever-teams.git --tags && git tag --sort version:refname | tail -1', (error, stdout) => { if (error) { console.error(`exec error: ${error}`); @@ -16,11 +16,16 @@ module.exports.desktop = (isProd) => { let newVersion = stdout.trim(); console.log('latest tag', newVersion); + if (newVersion) { // let's remove "v" from version, i.e. first character newVersion = newVersion.substring(1); package.version = newVersion; + package.build.appId = 'com.ever.everteamsdesktop'; + package.build.productName = 'Ever Teams Desktop'; + package.build.linux.executableName = 'ever-teams-desktop'; + if (!isProd) { package.build.publish = [ { @@ -36,6 +41,21 @@ module.exports.desktop = (isProd) => { acl: 'public-read' } ]; + } else { + package.build.publish = [ + { + provider: 'github', + repo: 'ever-teams-desktop', + releaseType: 'release' + }, + { + provider: 'spaces', + name: 'ever', + region: 'sfo3', + path: '/ever-teams-desktop', + acl: 'public-read' + } + ]; } fs.writeFileSync( diff --git a/.vscode/settings.json b/.vscode/settings.json index f181e928c..f84ea27cb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -24,6 +24,7 @@ "clsxm", "dummyimage", "everco", + "everteamsdesktop", "exposdk", "headlessui", "heroicons", From a63409e55dd33fa447f7ebcb4e50cca61eb50577 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 14:41:39 +0200 Subject: [PATCH 08/21] chore: more for desktop app build --- .scripts/bump-version-electron.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.scripts/bump-version-electron.js b/.scripts/bump-version-electron.js index 29e00d384..b55ce9dc5 100644 --- a/.scripts/bump-version-electron.js +++ b/.scripts/bump-version-electron.js @@ -7,7 +7,7 @@ module.exports.desktop = (isProd) => { let currentVersion = package.version; exec( - 'git fetch git@github.com:ever-co/ever-teams.git --tags && git tag --sort version:refname | tail -1', + "git ls-remote --tags git@github.com:ever-co/ever-teams.git | grep -v '^{}' | awk -F'/' '/refs/tags// {print $3}' | grep -E '^v?[0-9]+.[0-9]+.[0-9]+' | sort -V | tail -n1", (error, stdout) => { if (error) { console.error(`exec error: ${error}`); @@ -22,6 +22,11 @@ module.exports.desktop = (isProd) => { newVersion = newVersion.substring(1); package.version = newVersion; + package.name = 'ever-teams-desktop'; + package.productName = 'Ever Teams Desktop'; + package.description = 'Ever Teams Desktop'; + package.homepage = 'https://ever.team'; + package.build.appId = 'com.ever.everteamsdesktop'; package.build.productName = 'Ever Teams Desktop'; package.build.linux.executableName = 'ever-teams-desktop'; From 2b26c529941aac18f04eb16df4775e7e404f90e6 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 15:26:37 +0200 Subject: [PATCH 09/21] chore: build desktop app --- .github/workflows/desktop-prod.yml | 6 +++ .scripts/bump-version-electron.js | 82 ------------------------------ 2 files changed, 6 insertions(+), 82 deletions(-) delete mode 100644 .scripts/bump-version-electron.js diff --git a/.github/workflows/desktop-prod.yml b/.github/workflows/desktop-prod.yml index 6fae7ce22..c5614dfed 100644 --- a/.github/workflows/desktop-prod.yml +++ b/.github/workflows/desktop-prod.yml @@ -55,6 +55,12 @@ jobs: script: | const script = require('./.scripts/bump-version-electron.js') console.log(script.desktop(true)) + env: + PROJECT_REPO: 'git@github.com:ever-co/ever-teams.git' + DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' + COMPANY_SITE_LINK: 'https://ever.team' + DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Teams Desktop' + DESKTOP_TIMER_APP_ID: 'com.ever.everteamsdesktop' - name: Build Desktop Timer App run: 'yarn build:desktop-timer:linux:release:gh' diff --git a/.scripts/bump-version-electron.js b/.scripts/bump-version-electron.js deleted file mode 100644 index b55ce9dc5..000000000 --- a/.scripts/bump-version-electron.js +++ /dev/null @@ -1,82 +0,0 @@ -const fs = require('fs'); -const { exec } = require('child_process'); - -module.exports.desktop = (isProd) => { - if (fs.existsSync('./apps/desktop-timer/src/package.json')) { - let package = require('../apps/desktop-timer/src/package.json'); - let currentVersion = package.version; - - exec( - "git ls-remote --tags git@github.com:ever-co/ever-teams.git | grep -v '^{}' | awk -F'/' '/refs/tags// {print $3}' | grep -E '^v?[0-9]+.[0-9]+.[0-9]+' | sort -V | tail -n1", - (error, stdout) => { - if (error) { - console.error(`exec error: ${error}`); - return; - } - - let newVersion = stdout.trim(); - console.log('latest tag', newVersion); - - if (newVersion) { - // let's remove "v" from version, i.e. first character - newVersion = newVersion.substring(1); - package.version = newVersion; - - package.name = 'ever-teams-desktop'; - package.productName = 'Ever Teams Desktop'; - package.description = 'Ever Teams Desktop'; - package.homepage = 'https://ever.team'; - - package.build.appId = 'com.ever.everteamsdesktop'; - package.build.productName = 'Ever Teams Desktop'; - package.build.linux.executableName = 'ever-teams-desktop'; - - if (!isProd) { - package.build.publish = [ - { - provider: 'github', - repo: 'ever-teams-desktop', - releaseType: 'prerelease' - }, - { - provider: 'spaces', - name: 'ever', - region: 'sfo3', - path: '/ever-teams-desktop-pre', - acl: 'public-read' - } - ]; - } else { - package.build.publish = [ - { - provider: 'github', - repo: 'ever-teams-desktop', - releaseType: 'release' - }, - { - provider: 'spaces', - name: 'ever', - region: 'sfo3', - path: '/ever-teams-desktop', - acl: 'public-read' - } - ]; - } - - fs.writeFileSync( - './apps/desktop-timer/src/package.json', - JSON.stringify(package, null, 2) - ); - - let updated = require('../apps/desktop-timer/src/package.json'); - console.log('Version updated to version', updated.version); - } else { - console.log( - 'Latest tag is not found. build desktop app with default version', - currentVersion - ); - } - } - ); - } -}; From 04c68dc3fa3de993d6c5bb3c5fb7c879e6ea8a52 Mon Sep 17 00:00:00 2001 From: Badal Khatri <81486442+badalkhatri0924@users.noreply.github.com> Date: Sat, 21 Oct 2023 19:21:27 +0530 Subject: [PATCH 10/21] Updated README file and Project run commands (#1614) * Updated README file and Project run commands * Update README.md --------- Co-authored-by: Ruslan K --- README.md | 26 ++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7b2c7a5d9..e0bf27184 100644 --- a/README.md +++ b/README.md @@ -80,13 +80,31 @@ Please refer to our official [Platform Documentation](https://docs.ever.team) (W ## 🚀 Getting Starting -Ever® Teams™ requires access to Ever® Gauzy™ Platform APIs, provided by another project - Ever® Gauzy™ Platform, see (and also ). Specifically, you will be interested in the `apps/api` and `apps/server` folders of the mono-repo. +### Super Quick Start -There are a few ways to run Ever Teams: + -1. Connect it to our live Ever Gauzy APIs using endpoint (or to our staging if you want to just test everything) which is set in the `GAUZY_API_SERVER_URL` env variable (see for example). Of course, you will have to register in Ever Gauzy, see (Note: currently in Alpha version) +### Quick Start with our live APIs -2. Download and run the Ever Gauzy Server setup () or run the server manually (see ). You can also run only Ever Gauzy APIs (manually), see . For getting starting instructions, it's best to check the Ever Gauzy [README](https://github.com/ever-co/ever-gauzy/blob/develop/README.md) file. After you get API or Server running, make sure you set the environment variable `GAUZY_API_SERVER_URL` (see for example). +1. Clone this repo +2. Run `yarn install` +3. Run `yarn build:web` +4. Run `yarn start:web` + +Note: by default, Ever Teams web frontend will be connected to our production [Ever Gauzy](https://github.com/ever-co/ever-gauzy) API endpoint . You can change it in environment variable `GAUZY_API_SERVER_URL`, see below how to run with a Self-hosted Backend. + +### Run with a Self-hosted Backend + +1. Download and run the Ever Gauzy Server setup () or run the server manually (see ). You can also run only Ever Gauzy APIs (manually), see . For getting starting instructions, it's best to check the Ever Gauzy [README](https://github.com/ever-co/ever-gauzy/blob/develop/README.md) file. +2. Clone this repo +3. After you get the API or Server running, make sure you set the environment variable `GAUZY_API_SERVER_URL` in Ever Teams .env file (see for example). +4. Run `yarn install` +5. Run `yarn build:web` +6. Run `yarn start:web` + +### Notes + +Note: Ever® Teams™ requires access to Ever® Gauzy™ Platform APIs, provided by another project - Ever® Gauzy™ Platform, see (and also ). Specifically, you might be interested in the `apps/api` and `apps/server` folders of the mono-repo for the code of Gauzy API & Gauzy Server. ## 📄 Content diff --git a/package.json b/package.json index 1eb8cabfe..9f9a3b321 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "config:prod": "yarn run config -- --environment=prod", "start": "yarn build && yarn concurrently --raw --kill-others \"yarn start:web\"", "start:prod": "yarn build && yarn concurrently --raw --kill-others \"yarn start:web:prod\"", - "start:web": "yarn run postinstall.web && yarn run config:dev && yarn ng serve web --open", + "start:web": "cd apps/web && yarn run start", "start:web:forever": "yarn run config:dev && forever start ng serve web --disable-host-check --host 0.0.0.0", "start:web:pm2": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn build:web && yarn ts-node ./apps/web/src/pm2bootstrap.ts", "start:web:prod": "yarn run config:prod && yarn ng serve web --configuration production --disable-host-check --host 0.0.0.0 --prod", From 8eb08bb83ff22295d9e3cff2eeaf489c62081c73 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 15:53:10 +0200 Subject: [PATCH 11/21] chore: use develop branch --- .github/workflows/desktop-prod.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/desktop-prod.yml b/.github/workflows/desktop-prod.yml index c5614dfed..aef6fb34b 100644 --- a/.github/workflows/desktop-prod.yml +++ b/.github/workflows/desktop-prod.yml @@ -24,6 +24,7 @@ jobs: uses: actions/checkout@v3 with: repository: 'ever-co/ever-gauzy' + ref: develop - name: Install Node.js, NPM and Yarn uses: buildjet/setup-node@v3 @@ -88,6 +89,7 @@ jobs: uses: actions/checkout@v3 with: repository: 'ever-co/ever-gauzy' + ref: develop - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 @@ -140,6 +142,7 @@ jobs: uses: actions/checkout@v3 with: repository: 'ever-co/ever-gauzy' + ref: develop - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 From c3fc705cdf123317e39709d17d770764eeb78522 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 16:09:42 +0200 Subject: [PATCH 12/21] chore: build desktop app --- .github/workflows/desktop-prod.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/desktop-prod.yml b/.github/workflows/desktop-prod.yml index aef6fb34b..0499ce79e 100644 --- a/.github/workflows/desktop-prod.yml +++ b/.github/workflows/desktop-prod.yml @@ -55,7 +55,7 @@ jobs: with: script: | const script = require('./.scripts/bump-version-electron.js') - console.log(script.desktop(true)) + console.log(script.desktopTimer(true)) env: PROJECT_REPO: 'git@github.com:ever-co/ever-teams.git' DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' @@ -114,7 +114,7 @@ jobs: with: script: | const script = require('./.scripts/bump-version-electron.js') - console.log(script.desktop(true)) + console.log(script.desktopTimer(true)) - name: Build Desktop Timer App run: 'yarn build:desktop-timer:mac:release' @@ -167,7 +167,7 @@ jobs: with: script: | const script = require('./.scripts/bump-version-electron.js') - console.log(script.desktop(true)) + console.log(script.desktopTimer(true)) - name: Build Desktop Timer App run: 'yarn build:desktop-timer:windows:release:gh' From bbfe63eb6af5fe781787f89591a1653a9488c7f9 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 16:44:32 +0200 Subject: [PATCH 13/21] chore: update desktop app build --- .github/workflows/desktop-prod.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/desktop-prod.yml b/.github/workflows/desktop-prod.yml index 0499ce79e..01ff06ef9 100644 --- a/.github/workflows/desktop-prod.yml +++ b/.github/workflows/desktop-prod.yml @@ -115,6 +115,12 @@ jobs: script: | const script = require('./.scripts/bump-version-electron.js') console.log(script.desktopTimer(true)) + env: + PROJECT_REPO: 'git@github.com:ever-co/ever-teams.git' + DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' + COMPANY_SITE_LINK: 'https://ever.team' + DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Teams Desktop' + DESKTOP_TIMER_APP_ID: 'com.ever.everteamsdesktop' - name: Build Desktop Timer App run: 'yarn build:desktop-timer:mac:release' @@ -168,6 +174,12 @@ jobs: script: | const script = require('./.scripts/bump-version-electron.js') console.log(script.desktopTimer(true)) + env: + PROJECT_REPO: 'git@github.com:ever-co/ever-teams.git' + DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' + COMPANY_SITE_LINK: 'https://ever.team' + DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Teams Desktop' + DESKTOP_TIMER_APP_ID: 'com.ever.everteamsdesktop' - name: Build Desktop Timer App run: 'yarn build:desktop-timer:windows:release:gh' From b7f6ffdca1e39c44c0fac9ef3c09cc9eb91036b2 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 17:03:14 +0200 Subject: [PATCH 14/21] chore: switch repo URL --- .github/workflows/desktop-prod.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/desktop-prod.yml b/.github/workflows/desktop-prod.yml index 01ff06ef9..01e6d96e1 100644 --- a/.github/workflows/desktop-prod.yml +++ b/.github/workflows/desktop-prod.yml @@ -57,7 +57,7 @@ jobs: const script = require('./.scripts/bump-version-electron.js') console.log(script.desktopTimer(true)) env: - PROJECT_REPO: 'git@github.com:ever-co/ever-teams.git' + PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git' DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' COMPANY_SITE_LINK: 'https://ever.team' DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Teams Desktop' @@ -116,7 +116,7 @@ jobs: const script = require('./.scripts/bump-version-electron.js') console.log(script.desktopTimer(true)) env: - PROJECT_REPO: 'git@github.com:ever-co/ever-teams.git' + PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git' DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' COMPANY_SITE_LINK: 'https://ever.team' DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Teams Desktop' @@ -175,7 +175,7 @@ jobs: const script = require('./.scripts/bump-version-electron.js') console.log(script.desktopTimer(true)) env: - PROJECT_REPO: 'git@github.com:ever-co/ever-teams.git' + PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git' DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' COMPANY_SITE_LINK: 'https://ever.team' DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Teams Desktop' From 7209fd6c1cd6a3664bcf962c6c368752b439f3bb Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 17:54:22 +0200 Subject: [PATCH 15/21] chore: deploy fix --- .github/workflows/desktop-prod.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/desktop-prod.yml b/.github/workflows/desktop-prod.yml index 01e6d96e1..b69feaa92 100644 --- a/.github/workflows/desktop-prod.yml +++ b/.github/workflows/desktop-prod.yml @@ -55,7 +55,7 @@ jobs: with: script: | const script = require('./.scripts/bump-version-electron.js') - console.log(script.desktopTimer(true)) + script.desktopTimer(true).then(console.log) env: PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git' DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' @@ -114,7 +114,7 @@ jobs: with: script: | const script = require('./.scripts/bump-version-electron.js') - console.log(script.desktopTimer(true)) + script.desktopTimer(true).then(console.log) env: PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git' DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' @@ -173,7 +173,7 @@ jobs: with: script: | const script = require('./.scripts/bump-version-electron.js') - console.log(script.desktopTimer(true)) + script.desktopTimer(true).then(console.log) env: PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git' DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop' From 0c2359bb8e65c1906669484f2ed638e553184daa Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 19:17:22 +0200 Subject: [PATCH 16/21] chore: change formatting configs to be inline with our other projects --- .editorconfig | 5 ++++- .github/workflows/desktop-prod.yml | 15 +++++++++++++++ .prettierignore | 2 ++ .prettierrc | 25 +++++++++++++++++++++++-- .stylelintrc.json | 1 + package.json | 6 +++--- 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index 21968762b..e9c6734eb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,10 +4,13 @@ root = true [*] charset = utf-8 indent_style = tab -indent_size = 2 +indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true [*.md] max_line_length = off trim_trailing_whitespace = false + +[*.yml] +indent_style = space diff --git a/.github/workflows/desktop-prod.yml b/.github/workflows/desktop-prod.yml index b69feaa92..64815a01b 100644 --- a/.github/workflows/desktop-prod.yml +++ b/.github/workflows/desktop-prod.yml @@ -76,6 +76,11 @@ jobs: DO_KEY_ID: ${{ secrets.DO_KEY_ID }} DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }} NX_NO_CLOUD: true + COMPANY_SITE: 'Ever Teams' + COMPANY_SITE_LINK: 'https://ever.team' + COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/everteamshq' + COMPANY_TWITTER_LINK: 'https://twitter.com/ever_teams' + COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co' release-mac: runs-on: ${{ matrix.os }} @@ -135,6 +140,11 @@ jobs: DO_KEY_ID: ${{ secrets.DO_KEY_ID }} DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }} NX_NO_CLOUD: true + COMPANY_SITE: 'Ever Teams' + COMPANY_SITE_LINK: 'https://ever.team' + COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/everteamshq' + COMPANY_TWITTER_LINK: 'https://twitter.com/ever_teams' + COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co' release-windows: runs-on: ${{ matrix.os }} @@ -194,3 +204,8 @@ jobs: DO_KEY_ID: ${{ secrets.DO_KEY_ID }} DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }} NX_NO_CLOUD: true + COMPANY_SITE: 'Ever Teams' + COMPANY_SITE_LINK: 'https://ever.team' + COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/everteamshq' + COMPANY_TWITTER_LINK: 'https://twitter.com/ever_teams' + COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co' diff --git a/.prettierignore b/.prettierignore index d0b804da2..fbd7097fe 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,6 @@ # Add files here to ignore them from prettier formatting +**/xplat/*/.xplatframework + /dist /coverage diff --git a/.prettierrc b/.prettierrc index ec9312c3d..1a058e296 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,6 +1,27 @@ { + "printWidth": 120, "singleQuote": true, - "trailingComma": "none", + "semi": true, "useTabs": true, - "tabWidth": 2 + "tabWidth": 4, + "arrowParens": "always", + "trailingComma": "none", + "quoteProps": "as-needed", + "trimTrailingWhitespace": true, + "overrides": [ + { + "files": "*.scss", + "options": { + "useTabs": false, + "tabWidth": 2 + } + }, + { + "files": "*.yml", + "options": { + "useTabs": false, + "tabWidth": 2 + } + } + ] } diff --git a/.stylelintrc.json b/.stylelintrc.json index 628aa9909..6c63a769e 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -2,6 +2,7 @@ "extends": "stylelint-config-standard-scss", "plugins": ["stylelint-scss"], "rules": { + "selector-type-no-unknown": false, "at-rule-no-unknown": null, "scss/at-rule-no-unknown": true, "scss/dollar-variable-pattern": "^foo", diff --git a/package.json b/package.json index 9f9a3b321..d46a808fc 100644 --- a/package.json +++ b/package.json @@ -186,9 +186,9 @@ "lint-staged": "^10.4.0", "nx": "16.7.4", "nx-cloud": "16.3.0", - "prettier": "^2.8.0", - "prettier-eslint-cli": "^7.1.0", - "pretty-quick": "^3.1.0", + "prettier": "^3.0.3", + "prettier-eslint-cli": "^8.0.1", + "pretty-quick": "^3.1.3", "rimraf": "^3.0.2", "semantic-release": "^19.0.5", "ts-node": "^10.9.1" From c8ee7f9a56085cf3de301078d7562d2872667b99 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 19:27:27 +0200 Subject: [PATCH 17/21] chore: spelling / formatting --- .cspell.json | 56 +++++++++++++++++++++++++++ .eslintrc.json | 76 ++++++++++++++++++------------------- .github/workflows/typos.yml | 23 +++++++++++ .vscode/settings.json | 19 +--------- 4 files changed, 116 insertions(+), 58 deletions(-) create mode 100644 .cspell.json create mode 100644 .github/workflows/typos.yml diff --git a/.cspell.json b/.cspell.json new file mode 100644 index 000000000..c248a7cf3 --- /dev/null +++ b/.cspell.json @@ -0,0 +1,56 @@ +{ + "version": "0.2", + "language": "en", + "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json", + "words": [ + "barcodes", + "cacheable", + "cloudinary", + "clsxm", + "dummyimage", + "everco", + "everteamsdesktop", + "exposdk", + "headlessui", + "heroicons", + "plasmo", + "RECAPTCHA", + "svgs", + "tailwindcss", + "Timesheet", + "Vercel" + ], + "useGitignore": true, + "ignorePaths": [ + ".deploy/*", + ".git/*", + ".git/!{COMMIT_EDITMSG,EDITMSG}", + ".git/*/**", + ".yarn", + "**/*.jar", + ".pnp.js", + "**/.git/**", + ".vscode", + ".gitignore", + "action/lib/**", + "coverage", + ".cspell.json", + "cspell.json", + "__snapshots__", + "__recordings__", + "**/coverage/**", + "**/fixtures/**/*.json", + "**/fixtures/sampleCode/*errors/", + "**/node_modules/**", + "**/vscode-extension/**", + "package-lock.json", + "yarn.lock", + "**/assets/i18n/*.json", + "**/migrations/**", + "packages/**/*.seed.json", + "**/*.svg", + "tools/build/webpack.config.js", + "docker-compose.demo.yml", + "docker-compose.yml" + ] +} diff --git a/.eslintrc.json b/.eslintrc.json index 495c24934..a48c85b37 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,42 +1,38 @@ { - "env": { - "browser": true, - "es2021": true - }, - "extends": [ - "eslint:recommended", - "plugin:react/recommended", - "plugin:@typescript-eslint/recommended" - ], - "parser": "@typescript-eslint/parser", - "parserOptions": { - "ecmaFeatures": { - "jsx": true - }, - "ecmaVersion": 13, - "sourceType": "module" - }, - "plugins": ["react", "@typescript-eslint"], - "rules": { - "camelcase": "off", - "@typescript-eslint/camelcase": ["off", { "properties": "never" }], - "@typescript-eslint/ban-ts-ignore": ["off"], - "@typescript-eslint/no-explicit-any": ["off", { "ignoreRestArgs": true }], - "@typescript-eslint/interface-name-prefix": ["off"], - "@typescript-eslint/explicit-function-return-type": "off", - "@typescript-eslint/explicit-module-boundary-types": "off", - "jsx-a11y/no-onchange": "off", - "react/jsx-props-no-spreading": "off", - "import/prefer-default-export": "off", - "import/no-extraneous-dependencies": "off", - "react/prop-types": "off", - "@typescript-eslint/no-unused-vars": "warn", - "react/react-in-jsx-scope": "off", - "@typescript-eslint/ban-ts-comment": "off" - }, - "settings": { - "react": { - "version": "detect" - } - } + "env": { + "browser": true, + "es2021": true + }, + "extends": ["eslint:recommended", "plugin:react/recommended", "plugin:@typescript-eslint/recommended"], + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaFeatures": { + "jsx": true + }, + "ecmaVersion": 13, + "sourceType": "module" + }, + "plugins": ["react", "@typescript-eslint"], + "rules": { + "camelcase": "off", + "@typescript-eslint/camelcase": ["off", { "properties": "never" }], + "@typescript-eslint/ban-ts-ignore": ["off"], + "@typescript-eslint/no-explicit-any": ["off", { "ignoreRestArgs": true }], + "@typescript-eslint/interface-name-prefix": ["off"], + "@typescript-eslint/explicit-function-return-type": "off", + "@typescript-eslint/explicit-module-boundary-types": "off", + "jsx-a11y/no-onchange": "off", + "react/jsx-props-no-spreading": "off", + "import/prefer-default-export": "off", + "import/no-extraneous-dependencies": "off", + "react/prop-types": "off", + "@typescript-eslint/no-unused-vars": "warn", + "react/react-in-jsx-scope": "off", + "@typescript-eslint/ban-ts-comment": "off" + }, + "settings": { + "react": { + "version": "detect" + } + } } diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml new file mode 100644 index 000000000..fe9d9fbc9 --- /dev/null +++ b/.github/workflows/typos.yml @@ -0,0 +1,23 @@ +name: 'Check Spelling and Typos with cspell' +on: + push: + branches: [develop] + pull_request: + branches: [develop] + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + spellcheck: + name: Cspell + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: streetsidesoftware/cspell-action@v2 + with: + # Github token used to fetch the list of changed files in the commit. + github_token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }} + strict: true + config: '.cspell.json' diff --git a/.vscode/settings.json b/.vscode/settings.json index f84ea27cb..6eb64214e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,24 +17,7 @@ }, "vsicons.presets.angular": true, "deepscan.enable": true, - "cSpell.words": [ - "barcodes", - "cacheable", - "cloudinary", - "clsxm", - "dummyimage", - "everco", - "everteamsdesktop", - "exposdk", - "headlessui", - "heroicons", - "plasmo", - "RECAPTCHA", - "svgs", - "tailwindcss", - "Timesheet", - "Vercel" - ], + "cSpell.words": [], "files.exclude": { "**/.git": true, "**/.DS_Store": true, From 621d4a5a33ec0bc0184f697282e17b21556b9b46 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 19:40:39 +0200 Subject: [PATCH 18/21] chore: switch build for desktop to release branch --- .github/workflows/desktop-prod.yml | 4 ++-- .github/workflows/release-prod.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/desktop-prod.yml b/.github/workflows/desktop-prod.yml index 64815a01b..cbe101a9d 100644 --- a/.github/workflows/desktop-prod.yml +++ b/.github/workflows/desktop-prod.yml @@ -1,9 +1,9 @@ -name: Desktop App Build DEV +name: Desktop App Build PROD on: workflow_run: workflows: ['Release Prod'] - branches: [develop] + branches: [main] types: - completed diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index 4df1db2d7..bcf30d2d4 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -2,7 +2,7 @@ name: Release Prod on: push: - branches: [develop] + branches: [main] jobs: release: From 28cbbfd2b32f33f0489e55fe77a6ec8754024ffe Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 19:46:22 +0200 Subject: [PATCH 19/21] chore: update yarn lock --- yarn.lock | 421 +++++++++++++++++++++++++++++------------------------- 1 file changed, 229 insertions(+), 192 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4cc62a858..880d91fd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1701,6 +1701,11 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb" integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw== +"@eslint/js@8.52.0": + version "8.52.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.52.0.tgz#78fe5f117840f69dc4a353adf9b9cd926353378c" + integrity sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA== + "@excalidraw/excalidraw@^0.15.3": version "0.15.3" resolved "https://registry.yarnpkg.com/@excalidraw/excalidraw/-/excalidraw-0.15.3.tgz#5dea570f76451adf68bc24d4bfdd67a375cfeab1" @@ -2049,6 +2054,15 @@ debug "^4.1.1" minimatch "^3.0.5" +"@humanwhocodes/config-array@^0.11.13": + version "0.11.13" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" + integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ== + dependencies: + "@humanwhocodes/object-schema" "^2.0.1" + debug "^4.1.1" + minimatch "^3.0.5" + "@humanwhocodes/module-importer@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" @@ -2059,6 +2073,11 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== +"@humanwhocodes/object-schema@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" + integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== + "@hutson/parse-repository-url@^3.0.0": version "3.0.2" resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" @@ -2617,7 +2636,7 @@ dependencies: "@lexical/offset" "0.8.1" -"@messageformat/core@^3.0.1": +"@messageformat/core@^3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@messageformat/core/-/core-3.2.0.tgz#fcb1e530f4ae4ed61c9c7a0b49cc119a79468da1" integrity sha512-ppbb/7OYqg/t4WdFk8VAfZEV2sNUq3+7VeBAo5sKFhmF786sh6gB7fUeXa2qLTDIcTHS49HivTBN7QNOU5OFTg== @@ -4005,25 +4024,23 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== -"@prettier/eslint@npm:prettier-eslint@^15.0.1": - version "15.0.1" - resolved "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-15.0.1.tgz#2543a43e9acec2a9767ad6458165ce81f353db9c" - integrity sha512-mGOWVHixSvpZWARqSDXbdtTL54mMBxc5oQYQ6RAqy8jecuNJBgN3t9E5a81G66F8x8fsKNiR1HWaBV66MJDOpg== +"@prettier/eslint@npm:prettier-eslint@^16.1.0": + version "16.1.1" + resolved "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-16.1.1.tgz#aeafbd5f6f00958e83c63d390751cfda47330d73" + integrity sha512-SbtugbH80njB9QOPqb8C+W40Rvhr6iD0wrJTxk1Zx10rkY7KdjtSwHpf/WfiI3REboaXbvIOJXGiua3maIt0Sw== dependencies: - "@types/eslint" "^8.4.2" - "@types/prettier" "^2.6.0" - "@typescript-eslint/parser" "^5.10.0" + "@typescript-eslint/parser" "^6.7.5" common-tags "^1.4.0" dlv "^1.1.0" eslint "^8.7.0" indent-string "^4.0.0" lodash.merge "^4.6.0" loglevel-colored-level-prefix "^1.0.0" - prettier "^2.5.1" - pretty-format "^23.0.1" + prettier "^3.0.1" + pretty-format "^29.7.0" require-relative "^0.8.7" - typescript "^4.5.4" - vue-eslint-parser "^8.0.1" + typescript "^5.2.2" + vue-eslint-parser "^9.1.0" "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" @@ -5257,7 +5274,7 @@ "@types/eslint" "*" "@types/estree" "*" -"@types/eslint@*", "@types/eslint@^8.4.2": +"@types/eslint@*": version "8.44.2" resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.2.tgz#0d21c505f98a89b8dd4d37fa162b09da6089199a" integrity sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg== @@ -5435,11 +5452,6 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/prettier@^2.6.0": - version "2.7.3" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" - integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== - "@types/prop-types@*": version "15.7.5" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" @@ -5624,7 +5636,7 @@ "@typescript-eslint/typescript-estree" "5.60.1" debug "^4.3.4" -"@typescript-eslint/parser@^5.10.0", "@typescript-eslint/parser@^5.21.0": +"@typescript-eslint/parser@^5.21.0": version "5.62.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7" integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== @@ -5645,6 +5657,17 @@ "@typescript-eslint/visitor-keys" "6.5.0" debug "^4.3.4" +"@typescript-eslint/parser@^6.7.5": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.8.0.tgz#bb2a969d583db242f1ee64467542f8b05c2e28cb" + integrity sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg== + dependencies: + "@typescript-eslint/scope-manager" "6.8.0" + "@typescript-eslint/types" "6.8.0" + "@typescript-eslint/typescript-estree" "6.8.0" + "@typescript-eslint/visitor-keys" "6.8.0" + debug "^4.3.4" + "@typescript-eslint/scope-manager@5.60.1": version "5.60.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz#35abdb47f500c68c08f2f2b4f22c7c79472854bb" @@ -5669,6 +5692,14 @@ "@typescript-eslint/types" "6.5.0" "@typescript-eslint/visitor-keys" "6.5.0" +"@typescript-eslint/scope-manager@6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.8.0.tgz#5cac7977385cde068ab30686889dd59879811efd" + integrity sha512-xe0HNBVwCph7rak+ZHcFD6A+q50SMsFwcmfdjs9Kz4qDh5hWhaPhFjRs/SODEhroBI5Ruyvyz9LfwUJ624O40g== + dependencies: + "@typescript-eslint/types" "6.8.0" + "@typescript-eslint/visitor-keys" "6.8.0" + "@typescript-eslint/type-utils@5.60.1": version "5.60.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.60.1.tgz#17770540e98d65ab4730c7aac618003f702893f4" @@ -5694,6 +5725,11 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.5.0.tgz#f4e55cfd99ac5346ea772770bf212a3e689a8f04" integrity sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w== +"@typescript-eslint/types@6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.8.0.tgz#1ab5d4fe1d613e3f65f6684026ade6b94f7e3ded" + integrity sha512-p5qOxSum7W3k+llc7owEStXlGmSl8FcGvhYt8Vjy7FqEnmkCVlM3P57XQEGj58oqaBWDQXbJDZxwUWMS/EAPNQ== + "@typescript-eslint/typescript-estree@5.60.1": version "5.60.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz#8c71824b7165b64d5ebd7aa42968899525959834" @@ -5733,6 +5769,19 @@ semver "^7.5.4" ts-api-utils "^1.0.1" +"@typescript-eslint/typescript-estree@6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.8.0.tgz#9565f15e0cd12f55cf5aa0dfb130a6cb0d436ba1" + integrity sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg== + dependencies: + "@typescript-eslint/types" "6.8.0" + "@typescript-eslint/visitor-keys" "6.8.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" + "@typescript-eslint/utils@5.60.1": version "5.60.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.60.1.tgz#6861ebedbefba1ac85482d2bdef6f2ff1eb65b80" @@ -5785,6 +5834,19 @@ "@typescript-eslint/types" "6.5.0" eslint-visitor-keys "^3.4.1" +"@typescript-eslint/visitor-keys@6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.8.0.tgz#cffebed56ae99c45eba901c378a6447b06be58b8" + integrity sha512-oqAnbA7c+pgOhW2OhGvxm0t1BULX5peQI/rLsNDpGM78EebV3C9IGbX5HNZabuZ6UQrYveCLjKo8Iy/lLlBkkg== + dependencies: + "@typescript-eslint/types" "6.8.0" + eslint-visitor-keys "^3.4.1" + +"@ungap/structured-clone@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" + integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== + "@vercel/analytics@^0.1.6": version "0.1.11" resolved "https://registry.yarnpkg.com/@vercel/analytics/-/analytics-0.1.11.tgz#727a0ac655a4a89104cdea3e6925476470299428" @@ -6171,7 +6233,7 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -7382,26 +7444,31 @@ camelcase-keys@^6.2.2: map-obj "^4.0.0" quick-lru "^4.0.1" -camelcase-keys@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252" - integrity sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg== +camelcase-keys@^9.1.0: + version "9.1.2" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-9.1.2.tgz#d287a4451245325984fe5148359a54397655e264" + integrity sha512-nFhquwz7p3nWSHeVYoIkefNPdR2Rt4EuKs9/gaqx3DhJL6HkNHIEcsH+D6N4NvW/MHxc4TT+rp0rc4K7E7x9hw== dependencies: - camelcase "^6.3.0" - map-obj "^4.1.0" - quick-lru "^5.1.1" - type-fest "^1.2.1" + camelcase "^8.0.0" + map-obj "5.0.0" + quick-lru "^6.1.1" + type-fest "^4.3.2" -camelcase@^5.0.0, camelcase@^5.3.1: +camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0, camelcase@^6.2.0, camelcase@^6.3.0: +camelcase@^6.0.0, camelcase@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== +camelcase@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-8.0.0.tgz#c0d36d418753fb6ad9c5e0437579745c1c14a534" + integrity sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA== + caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" @@ -7690,15 +7757,6 @@ client-only@0.0.1, client-only@^0.0.1: resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1" integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA== -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" - cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -8385,10 +8443,10 @@ core-js@3.6.5: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== -core-js@^3.24.1: - version "3.32.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.1.tgz#a7d8736a3ed9dd05940c3c4ff32c591bb735be77" - integrity sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ== +core-js@^3.33.0: + version "3.33.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.1.tgz#ef3766cfa382482d0a2c2bc5cb52c6d88805da52" + integrity sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q== core-util-is@1.0.2: version "1.0.2" @@ -8836,7 +8894,7 @@ decamelize-keys@^1.1.0: decamelize "^1.1.0" map-obj "^1.0.0" -decamelize@^1.1.0, decamelize@^1.2.0: +decamelize@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== @@ -9432,11 +9490,6 @@ emoji-mart@^5.5.2: resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.5.2.tgz#3ddbaf053139cf4aa217650078bc1c50ca8381af" integrity sha512-Sqc/nso4cjxhOwWJsp9xkVm8OF5c+mJLZJFoFfzRuKO+yWiN7K8c96xmtughYb0d/fZ8UC6cLIQ/p4BR6Pv3/A== -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -9941,7 +9994,7 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.0.0, eslint-scope@^7.2.2: +eslint-scope@^7.1.1, eslint-scope@^7.2.2: version "7.2.2" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== @@ -9949,7 +10002,7 @@ eslint-scope@^7.0.0, eslint-scope@^7.2.2: esrecurse "^4.3.0" estraverse "^5.2.0" -eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2, eslint-visitor-keys@^3.4.3: +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2, eslint-visitor-keys@^3.4.3: version "3.4.3" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== @@ -9997,7 +10050,7 @@ eslint@8.46.0: strip-ansi "^6.0.1" text-table "^0.2.0" -eslint@^8.21.0, eslint@^8.28.0, eslint@^8.7.0: +eslint@^8.28.0, eslint@^8.7.0: version "8.48.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155" integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg== @@ -10040,7 +10093,51 @@ eslint@^8.21.0, eslint@^8.28.0, eslint@^8.7.0: strip-ansi "^6.0.1" text-table "^0.2.0" -espree@^9.0.0, espree@^9.6.0, espree@^9.6.1: +eslint@^8.51.0: + version "8.52.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.52.0.tgz#d0cd4a1fac06427a61ef9242b9353f36ea7062fc" + integrity sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.6.1" + "@eslint/eslintrc" "^2.1.2" + "@eslint/js" "8.52.0" + "@humanwhocodes/config-array" "^0.11.13" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" + "@ungap/structured-clone" "^1.2.0" + ajv "^6.12.4" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.3.2" + doctrine "^3.0.0" + escape-string-regexp "^4.0.0" + eslint-scope "^7.2.2" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" + esquery "^1.4.2" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.19.0" + graphemer "^1.4.0" + ignore "^5.2.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-yaml "^4.1.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.1.2" + natural-compare "^1.4.0" + optionator "^0.9.3" + strip-ansi "^6.0.1" + text-table "^0.2.0" + +espree@^9.3.1, espree@^9.6.0, espree@^9.6.1: version "9.6.1" resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== @@ -10535,13 +10632,6 @@ find-up@^2.0.0: dependencies: locate-path "^2.0.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -10862,7 +10952,7 @@ get-assigned-identifiers@^1.1.0, get-assigned-identifiers@^1.2.0: resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1" integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ== -get-caller-file@^2.0.1, get-caller-file@^2.0.5: +get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -11074,7 +11164,7 @@ glob@7.1.7: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.2.3, glob@^7.1.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0, glob@^7.2.3: +glob@7.2.3, glob@^7.1.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -11097,6 +11187,17 @@ glob@^10.2.2, glob@^10.2.4: minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-scurry "^1.10.1" +glob@^10.3.10: + version "10.3.10" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + glob@^6.0.1: version "6.0.4" resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" @@ -11734,7 +11835,7 @@ ignore-walk@^6.0.0: dependencies: minimatch "^9.0.0" -ignore@^5.0.4, ignore@^5.1.4, ignore@^5.1.9, ignore@^5.2.0: +ignore@^5.0.4, ignore@^5.1.4, ignore@^5.1.9, ignore@^5.2.0, ignore@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== @@ -12472,6 +12573,15 @@ jackspeak@^2.0.3: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" +jackspeak@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jake@^10.8.5: version "10.8.7" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" @@ -13616,14 +13726,6 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -14059,12 +14161,17 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" +map-obj@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-5.0.0.tgz#126c98596b63927d7360f287cccc67177aa1938b" + integrity sha512-2L3MIgJynYrZ3TYMriLDLWocz15okFakV6J12HXvMXDHui2x/zgChzg1u9mFFGbbGWE+GsLpQByt4POb9Or+uA== + map-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== -map-obj@^4.0.0, map-obj@^4.1.0: +map-obj@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== @@ -15706,7 +15813,7 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.0: +p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== @@ -15734,13 +15841,6 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -16619,29 +16719,29 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prettier-eslint-cli@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/prettier-eslint-cli/-/prettier-eslint-cli-7.1.0.tgz#617c0b597e10dd5008b0e23aee4172c507d484ba" - integrity sha512-kMMvV7Mt6VqdJSb25aCkOA7HTIxy5mii2tzBb1vCSmzlIECOzTP2wRPIeAtBky6WdpfN0n1Zxa4E37Atp1IksA== +prettier-eslint-cli@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/prettier-eslint-cli/-/prettier-eslint-cli-8.0.1.tgz#112a9002b816d13a96f1bb1eb4310952e26cd4f0" + integrity sha512-jru4JUDHzWEtM/SOxqagU7hQTVP8BVrxO2J0qNauWZuPRld6Ea2eyNaEzIGx6I+yjmOLCsjNM+vU1AJgaW1ZSQ== dependencies: - "@messageformat/core" "^3.0.1" - "@prettier/eslint" "npm:prettier-eslint@^15.0.1" + "@messageformat/core" "^3.2.0" + "@prettier/eslint" "npm:prettier-eslint@^16.1.0" arrify "^2.0.1" boolify "^1.0.1" - camelcase-keys "^7.0.2" + camelcase-keys "^9.1.0" chalk "^4.1.2" common-tags "^1.8.2" - core-js "^3.24.1" - eslint "^8.21.0" + core-js "^3.33.0" + eslint "^8.51.0" find-up "^5.0.0" get-stdin "^8.0.0" - glob "^7.2.3" - ignore "^5.2.0" + glob "^10.3.10" + ignore "^5.2.4" indent-string "^4.0.0" lodash.memoize "^4.1.2" loglevel-colored-level-prefix "^1.0.0" - rxjs "^7.5.6" - yargs "^13.1.1" + rxjs "^7.8.1" + yargs "^17.7.2" prettier-linter-helpers@^1.0.0: version "1.0.0" @@ -16650,10 +16750,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.5.1, prettier@^2.8.0: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@^3.0.1, prettier@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" + integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== pretty-bytes@^5.6.0: version "5.6.0" @@ -16669,14 +16769,6 @@ pretty-format@29.4.3: ansi-styles "^5.0.0" react-is "^18.0.0" -pretty-format@^23.0.1: - version "23.6.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760" - integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw== - dependencies: - ansi-regex "^3.0.0" - ansi-styles "^3.2.0" - pretty-format@^27.0.2: version "27.5.1" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" @@ -16695,7 +16787,16 @@ pretty-format@^29.6.3: ansi-styles "^5.0.0" react-is "^18.0.0" -pretty-quick@^3.1.0: +pretty-format@^29.7.0: + version "29.7.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812" + integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ== + dependencies: + "@jest/schemas" "^29.6.3" + ansi-styles "^5.0.0" + react-is "^18.0.0" + +pretty-quick@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.3.tgz#15281108c0ddf446675157ca40240099157b638e" integrity sha512-kOCi2FJabvuh1as9enxYmrnBC6tVMoVOenMaBqRfsvBHB0cbpYHjdQEpSglpASDFEXVwplpcGR4CLEaisYAFcA== @@ -16981,10 +17082,10 @@ quick-lru@^4.0.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== +quick-lru@^6.1.1: + version "6.1.2" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-6.1.2.tgz#e9a90524108629be35287d0b864e7ad6ceb3659e" + integrity sha512-AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ== quote-stream@^1.0.1: version "1.0.2" @@ -17524,11 +17625,6 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - require-relative@^0.8.7: version "0.8.7" resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" @@ -17697,7 +17793,7 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -rxjs@7.8.1, rxjs@^7.0.0, rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.5.6, rxjs@^7.8.0: +rxjs@7.8.1, rxjs@^7.0.0, rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0, rxjs@^7.8.1: version "7.8.1" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== @@ -17922,7 +18018,7 @@ semver@7.5.3: dependencies: lru-cache "^6.0.0" -semver@7.5.4, semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1, semver@^7.5.3, semver@^7.5.4: +semver@7.5.4, semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1, semver@^7.5.3, semver@^7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -18626,15 +18722,6 @@ string-width@^2.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" @@ -18734,13 +18821,6 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -19440,16 +19520,16 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -type-fest@^1.2.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" - integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== - type-fest@^3.0.0: version "3.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706" integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g== +type-fest@^4.3.2: + version "4.5.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.5.0.tgz#79208f4dbb8a9946a55889e9f482b95a3292ee41" + integrity sha512-diLQivFzddJl4ylL3jxSkEc39Tpw7o1QeEHIPxVwryDK2lpB7Nqhzhuo6v5/Ls08Z0yPSAhsyAWlv1/H0ciNmw== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -19529,12 +19609,12 @@ typescript@4.8.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== -"typescript@^3 || ^4", typescript@^4.5.4, typescript@^4.9.4: +"typescript@^3 || ^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.6.4 || ^5.0.0", typescript@^5.0.4: +"typescript@^4.6.4 || ^5.0.0", typescript@^5.0.4, typescript@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== @@ -19908,18 +19988,18 @@ vm-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vue-eslint-parser@^8.0.1: - version "8.3.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz#5d31129a1b3dd89c0069ca0a1c88f970c360bd0d" - integrity sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g== +vue-eslint-parser@^9.1.0: + version "9.3.2" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.3.2.tgz#6f9638e55703f1c77875a19026347548d93fd499" + integrity sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg== dependencies: - debug "^4.3.2" - eslint-scope "^7.0.0" - eslint-visitor-keys "^3.1.0" - espree "^9.0.0" + debug "^4.3.4" + eslint-scope "^7.1.1" + eslint-visitor-keys "^3.3.0" + espree "^9.3.1" esquery "^1.4.0" lodash "^4.17.21" - semver "^7.3.5" + semver "^7.3.6" walk-up-path@^1.0.0: version "1.0.0" @@ -20155,11 +20235,6 @@ which-collection@^1.0.1: is-weakmap "^2.0.1" is-weakset "^2.0.1" -which-module@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" - integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== - which-typed-array@^1.1.10, which-typed-array@^1.1.11, which-typed-array@^1.1.2, which-typed-array@^1.1.9: version "1.1.11" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a" @@ -20230,15 +20305,6 @@ wordwrap@^1.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -20370,11 +20436,6 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== - y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -20415,14 +20476,6 @@ yargs-parser@21.1.1, yargs-parser@>=21.1.1, yargs-parser@^21.0.0, yargs-parser@^ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs-parser@^13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^20.2.2, yargs-parser@^20.2.3: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" @@ -20451,22 +20504,6 @@ yargs@16.2.0, yargs@^16.0.0, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^13.1.1: - version "13.3.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.2" - yargs@^17.0.0, yargs@^17.1.0, yargs@^17.3.1, yargs@^17.5.0, yargs@^17.6.2, yargs@^17.7.2: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" From 2b408eaa84d653437f776dc8356531bc2dbd5f35 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 20:03:23 +0200 Subject: [PATCH 20/21] chore: prettier --- apps/extensions/.prettierrc.cjs | 26 +++++++++++++------------- apps/mobile/.prettierrc | 27 +++++++++++++++++++++++++++ apps/web/.prettierrc | 25 +++++++++++++++++++++++-- package.json | 5 ++++- 4 files changed, 67 insertions(+), 16 deletions(-) create mode 100644 apps/mobile/.prettierrc diff --git a/apps/extensions/.prettierrc.cjs b/apps/extensions/.prettierrc.cjs index ee0bf6bd5..bdac24dc4 100644 --- a/apps/extensions/.prettierrc.cjs +++ b/apps/extensions/.prettierrc.cjs @@ -2,16 +2,16 @@ * @type {import('prettier').Options} */ module.exports = { - printWidth: 80, - tabWidth: 2, - useTabs: false, - semi: false, - singleQuote: false, - trailingComma: "none", - bracketSpacing: true, - bracketSameLine: true, - plugins: [require.resolve("@plasmohq/prettier-plugin-sort-imports")], - importOrder: ["^@plasmohq/(.*)$", "^~(.*)$", "^[./]"], - importOrderSeparation: true, - importOrderSortSpecifiers: true -} + printWidth: 120, + tabWidth: 4, + useTabs: true, + semi: true, + singleQuote: true, + trailingComma: 'none', + bracketSpacing: true, + bracketSameLine: true, + plugins: [require.resolve('@plasmohq/prettier-plugin-sort-imports')], + importOrder: ['^@plasmohq/(.*)$', '^~(.*)$', '^[./]'], + importOrderSeparation: true, + importOrderSortSpecifiers: true +}; diff --git a/apps/mobile/.prettierrc b/apps/mobile/.prettierrc new file mode 100644 index 000000000..1a058e296 --- /dev/null +++ b/apps/mobile/.prettierrc @@ -0,0 +1,27 @@ +{ + "printWidth": 120, + "singleQuote": true, + "semi": true, + "useTabs": true, + "tabWidth": 4, + "arrowParens": "always", + "trailingComma": "none", + "quoteProps": "as-needed", + "trimTrailingWhitespace": true, + "overrides": [ + { + "files": "*.scss", + "options": { + "useTabs": false, + "tabWidth": 2 + } + }, + { + "files": "*.yml", + "options": { + "useTabs": false, + "tabWidth": 2 + } + } + ] +} diff --git a/apps/web/.prettierrc b/apps/web/.prettierrc index ec9312c3d..1a058e296 100644 --- a/apps/web/.prettierrc +++ b/apps/web/.prettierrc @@ -1,6 +1,27 @@ { + "printWidth": 120, "singleQuote": true, - "trailingComma": "none", + "semi": true, "useTabs": true, - "tabWidth": 2 + "tabWidth": 4, + "arrowParens": "always", + "trailingComma": "none", + "quoteProps": "as-needed", + "trimTrailingWhitespace": true, + "overrides": [ + { + "files": "*.scss", + "options": { + "useTabs": false, + "tabWidth": 2 + } + }, + { + "files": "*.yml", + "options": { + "useTabs": false, + "tabWidth": 2 + } + } + ] } diff --git a/package.json b/package.json index d46a808fc..087675f59 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,10 @@ "lint-fix:scss": "cd apps/web && stylelint **/*.{scss,css} --fix", "e2e": "yarn run postinstall.web && yarn run config:dev && yarn ng e2e --browser chrome", "e2e:ci": "yarn run postinstall.web && yarn run config:prod && yarn --frozen-lockfile --cache-folder ~/.cache/yarn ng:ci e2e -c=production --prod --headless", - "prettier": "cd apps/web && prettier --write **/*.{js,jsx,ts,tsx,scss,css} --config ./.prettierrc", + "prettier": "yarn prettier:web && yarn prettier:mobile && yarn prettier:extensions", + "prettier:extensions": "cd apps/extensions && prettier --write **/*.{js,jsx,ts,tsx,scss,css} --config ./.prettierrc.cjs", + "prettier:web": "cd apps/web && prettier --write **/*.{js,jsx,ts,tsx,scss,css} --config ./.prettierrc", + "prettier:mobile": "cd apps/mobile && prettier --write **/*.{js,jsx,ts,tsx,scss,css} --config ./.prettierrc", "postinstall": "lerna bootstrap", "precommit": "yarn lint-fix && yarn lint-fix:scss && yarn prettier", "affected:apps": "yarn nx affected:apps", From cf0bb9803cf5d8a819666352aa34bdbcba09b75a Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 21 Oct 2023 20:19:34 +0200 Subject: [PATCH 21/21] chore: spell --- .cspell.json | 5 ++++- .vscode/settings.json | 4 ++-- package.json | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cspell.json b/.cspell.json index c248a7cf3..16d3b2e4a 100644 --- a/.cspell.json +++ b/.cspell.json @@ -51,6 +51,9 @@ "**/*.svg", "tools/build/webpack.config.js", "docker-compose.demo.yml", - "docker-compose.yml" + "docker-compose.yml", + "wait", + "apps/web/lib/i18n/*.ts", + "apps/mobile/app/i18n/*.ts", ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 6eb64214e..7c6853e26 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -24,13 +24,13 @@ "**/node_modules": false, "**/public/**/*.png": true, "**/public/**/*.jpg": true, - "**/public/**/*.pdf": true + "**/public/**/*.pdf": true, }, "search.exclude": { "**/node_modules": true, "**/bower_components": true, "**/*.code-search": true, - "**/web/components/**": true + "**/web/components/**": true, }, "docwriter.style": "Auto-detect" } diff --git a/package.json b/package.json index 087675f59..67751ab24 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,8 @@ "doc:serve": "compodoc -s -d dist/docs", "doc:build-serve": "compodoc -p tsconfig.json -d docs -s", "postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall", - "postinstall.web": "yarn node tools/web/postinstall" + "postinstall.web": "yarn node tools/web/postinstall", + "spell": "cspell . --config .cspell.json" }, "config": { "commitizen": {