Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
9aa1087
chore: update dependencies to latest patch/minor versions
ericsorenson Mar 9, 2026
849d9d0
add cosmiconfig
ericsorenson Mar 9, 2026
44f9d65
fix: add missing transitive deps to lock file for CI compatibility
ericsorenson Mar 9, 2026
80a7ac6
Revert "fix: add missing transitive deps to lock file for CI compatib…
ericsorenson Mar 10, 2026
cbff86e
Revert "add cosmiconfig"
ericsorenson Mar 10, 2026
7ee9e72
Revert "chore: update dependencies to latest patch/minor versions"
ericsorenson Mar 10, 2026
ab8405b
chore: add ci script to run lint, checkdeps, test, and typecheck locally
ericsorenson Mar 10, 2026
e7a5ba0
fix: add cosmiconfig to lock file to satisfy transitive dependency
ericsorenson Mar 10, 2026
9ffd3c5
fix: add babel-plugin-macros@3.1.0 to satisfy jest-circus peer depend…
ericsorenson Mar 10, 2026
1666dad
Update package-lock.json
ericsorenson Mar 10, 2026
f7c09a6
chore: remove redundant cosmiconfig explicit dep, now satisfied trans…
ericsorenson Mar 10, 2026
99807ec
Update package-lock.json
ericsorenson Mar 10, 2026
0df8de7
Merge remote-tracking branch 'upstream/next' into next
ericsorenson Mar 10, 2026
255a1d5
fix: align root webpack versions with sub-package declarations
ericsorenson Mar 10, 2026
fd33577
chore: upgrade webpack
ericsorenson Mar 10, 2026
427de48
Update package-lock.json
ericsorenson Mar 10, 2026
f84f3ca
chore: update terser-webpack-plugin
ericsorenson Mar 10, 2026
f756ed1
Merge remote-tracking branch 'upstream/next' into next
ericsorenson Mar 10, 2026
30f4786
chore: update react versions
ericsorenson Mar 10, 2026
78d31f4
pin cosmiconfig
ericsorenson Mar 10, 2026
1bc857b
chore: patch updates
ericsorenson Mar 10, 2026
12532d5
chore: update tsdown
ericsorenson Mar 10, 2026
afd3e82
chore: update eslint
ericsorenson Mar 10, 2026
f40190d
Merge remote-tracking branch 'upstream/next' into next
ericsorenson Mar 16, 2026
7a4fc5a
chore: update emotion to the latest version
ericsorenson Mar 16, 2026
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
327 changes: 136 additions & 191 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"color-hash": "2.0.2",
"electron": "35.7.5",
"electron-json-storage": "4.6.0",
"emotion": "9.2.12",
"@emotion/css": "11.13.5",
"graphql": "16.13.1",
"graphql-request": "5.1.0",
"graphql-tag": "2.12.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/overmind-devtools-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"dependencies": {
"@babel/runtime": "^7.28.6",
"color-hash": "^2.0.2",
"emotion": "^9.2.12",
"@emotion/css": "^11.13.5",
"lodash.clonedeep": "^4.5.0",
"overmind-react": "next",
"react": "^19.2.4",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useAppState } from '../../overmind'
import { Flush as FlushType } from '../../overmind/types'
import * as styles from './styles'
import * as textStyles from '../../styles/text'
import { css } from 'emotion'
import { css } from '@emotion/css'
import { FaCode, FaLink } from 'react-icons/fa'

type Props = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const flush = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import * as React from 'react'

import { useAppState } from '../../overmind'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css, keyframes } from 'emotion'
import { css, keyframes } from '@emotion/css'
import { colors } from '../../theme'

export const operator = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react'
import * as styles from './styles'
import { useAppState, useActions } from '../../overmind'
import { nameToColor } from '../../overmind/utils'
import { css } from 'emotion'
import { css } from '@emotion/css'

const ActionSelector: React.FunctionComponent = () => {
const state = useAppState()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

export const wrapper = css({
position: 'relative',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import * as React from 'react'
import { FaChevronDown } from 'react-icons/fa'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

import { colors } from '../../theme'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

import { colors } from '../../theme'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react'
import { useAppState, useActions } from '../../overmind'
import { getAppShortName, nameToColor } from '../../overmind/utils'
import * as styles from './styles'
import { css } from 'emotion'
import { css } from '@emotion/css'

const Apps: React.FunctionComponent = () => {
const state = useAppState()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import * as React from 'react'
import { FaChevronDown, FaChevronUp } from 'react-icons/fa'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

import { colors } from '../../theme'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import * as React from 'react'
import SplitPane, { Pane } from '../common/SplitPane'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

import { colors } from '../../theme'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react'
import { useAppState, useActions } from '../../overmind'
import * as styles from './styles'
import * as textStyles from '../../styles/text'
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'
import { FaChevronDown, FaChevronUp } from 'react-icons/fa'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

export const wrapper = css({
overflowY: 'auto',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react'
import { useAppState, useEffects } from '../../overmind'
import * as styles from './styles'
import * as text from '../../styles/text'
import { css } from 'emotion'
import { css } from '@emotion/css'
import Workspace from '../Workspace'
import Zoomable from '../Zoomable'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useAppState } from '../../overmind'
import * as textStyles from '../../styles/text'
import ValueInspector from '../ValueInspector'
import * as styles from './styles'
import { css } from 'emotion'
import { css } from '@emotion/css'

const Flushes: React.FunctionComponent = () => {
const state = useAppState()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

import { colors } from '../../theme'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import * as React from 'react'

import { isValidJson } from '../../overmind/utils'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

import { colors } from '../../theme'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import * as React from 'react'
import { PropsWithChildren } from 'react'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

import { colors } from '../../theme'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react'
import * as styles from './styles'
import { useAppState, useActions } from '../../overmind'
import { nameToColor } from '../../overmind/utils'
import { css } from 'emotion'
import { css } from '@emotion/css'

const StateMachineSelector: React.FunctionComponent = () => {
const state = useAppState()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const selector = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const transitionDetails = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

export const wrapper = css({
position: 'relative',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react'
import { FaChevronDown } from 'react-icons/fa'
import { useAppState, useActions } from '../../overmind'
import * as styles from './styles'
import { css } from 'emotion'
import { css } from '@emotion/css'
import { nameToColor } from '../../overmind/utils'

const StateMachinesList: React.FunctionComponent = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const listWrapper = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import * as React from 'react'
import {
FaChrome,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'

import { colors } from '../../theme'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../theme'

export const container = (zoomLevel: number) =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../../theme'

export const button = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../../theme'

export const wrapper = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css, injectGlobal } from 'emotion'
import { css, injectGlobal } from '@emotion/css'
import { colors } from '../../../theme'

injectGlobal`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../../../theme'

export const tooltipWrapper = css({
Expand Down
2 changes: 1 addition & 1 deletion packages/overmind-devtools-client/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react'
import { injectGlobal } from 'emotion'
import { injectGlobal } from '@emotion/css'
import { createOvermind } from 'overmind'
import { Provider } from 'overmind-react'
import { createRoot } from 'react-dom/client'
Expand Down
2 changes: 1 addition & 1 deletion packages/overmind-devtools-client/src/styles/text.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css } from 'emotion'
import { css } from '@emotion/css'
import { colors } from '../theme'

export const white = css({
Expand Down