Skip to content

chore: switch from yarn to pnpm #8822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Aug 2, 2023
Merged

chore: switch from yarn to pnpm #8822

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5142440
experiment: switch from `yarn` to `pnpm`
coadler Jul 31, 2023
2f2c8bd
fixup! experiment: switch from `yarn` to `pnpm`
coadler Jul 31, 2023
7f5e7e5
fixup! experiment: switch from `yarn` to `pnpm`
coadler Jul 31, 2023
fefad21
fixup! experiment: switch from `yarn` to `pnpm`
coadler Jul 31, 2023
e1339e7
Merge branch 'main' into colin/pnpm
coadler Aug 1, 2023
a5949ed
fixup! Merge branch 'main' into colin/pnpm
coadler Aug 1, 2023
e93a843
fixup! Merge branch 'main' into colin/pnpm
coadler Aug 1, 2023
6b5dcd4
fixup! Merge branch 'main' into colin/pnpm
coadler Aug 1, 2023
fc78d63
fixup! Merge branch 'main' into colin/pnpm
coadler Aug 1, 2023
958c196
fixup! Merge branch 'main' into colin/pnpm
coadler Aug 1, 2023
b7c9a70
fixup! Merge branch 'main' into colin/pnpm
coadler Aug 1, 2023
c96b3a4
fixup! Merge branch 'main' into colin/pnpm
coadler Aug 1, 2023
581c3d7
fixup! Merge branch 'main' into colin/pnpm
coadler Aug 1, 2023
6b80b9a
offlinedocs lodash types
coadler Aug 1, 2023
4d70d01
fixup! offlinedocs lodash types
coadler Aug 2, 2023
8a34624
fixup! offlinedocs lodash types
coadler Aug 2, 2023
82c1c39
fixup! offlinedocs lodash types
coadler Aug 2, 2023
241b16b
fixup! offlinedocs lodash types
coadler Aug 2, 2023
3fd92e6
fixup! offlinedocs lodash types
coadler Aug 2, 2023
ade687f
fixup! offlinedocs lodash types
coadler Aug 2, 2023
65f9b6a
fixup! offlinedocs lodash types
coadler Aug 2, 2023
b0ce6ba
fixup! offlinedocs lodash types
coadler Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! Merge branch 'main' into colin/pnpm
  • Loading branch information
@coadler
coadler committed Aug 1, 2023
commit e93a843a0f2f04a50129929e93e63b1cae7ba47f
21 changes: 18 additions & 3 deletions site/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions site/src/components/RequireAuth/RequireAuth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { useAuth } from "components/AuthProvider/AuthProvider"
import { FC } from "react"
import { Navigate, useLocation } from "react-router"
import { Outlet } from "react-router-dom"
import { Outlet, Navigate, useLocation } from "react-router-dom"
import { embedRedirect } from "../../utils/redirect"
import { FullScreenLoader } from "../Loader/FullScreenLoader"
import { DashboardProvider } from "components/Dashboard/DashboardProvider"
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/RequirePermission/RequirePermission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC } from "react"
import { Navigate } from "react-router"
import { Navigate } from "react-router-dom"

export interface RequirePermissionProps {
children: JSX.Element
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/UsersPage/CreateUserPage/CreateUserPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useMachine } from "@xstate/react"
import { useOrganizationId } from "hooks/useOrganizationId"
import { FC } from "react"
import { Helmet } from "react-helmet-async"
import { useNavigate } from "react-router"
import { useNavigate } from "react-router-dom"
import { createUserMachine } from "xServices/users/createUserXService"
import * as TypesGen from "../../../api/typesGenerated"
import { CreateUserForm } from "../../../components/CreateUserForm/CreateUserForm"
Expand Down
3 changes: 1 addition & 2 deletions site/src/pages/UsersPage/UsersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import { useMe } from "hooks/useMe"
import { usePermissions } from "hooks/usePermissions"
import { FC, ReactNode, useEffect } from "react"
import { Helmet } from "react-helmet-async"
import { useNavigate } from "react-router"
import { useSearchParams } from "react-router-dom"
import { useSearchParams, useNavigate } from "react-router-dom"
import { siteRolesMachine } from "xServices/roles/siteRolesXService"
import { usersMachine } from "xServices/users/usersXService"
import { ConfirmDialog } from "../../components/Dialogs/ConfirmDialog/ConfirmDialog"
Expand Down