Skip to content

Commit

Permalink
Merge pull request #271 from thetarnav/solid-1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
thetarnav authored Nov 2, 2023
2 parents c12d05c + 86f74ea commit f03768b
Show file tree
Hide file tree
Showing 25 changed files with 2,094 additions and 1,900 deletions.
11 changes: 11 additions & 0 deletions .changeset/orange-impalas-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@solid-devtools/frontend': minor
'@solid-devtools/overlay': minor
'@solid-devtools/logger': minor
'@solid-devtools/debugger': minor
'@solid-devtools/extension': minor
'solid-devtools': minor
'@solid-devtools/shared': minor
---

Update to Solid 1.8
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ jobs:

- name: Run Playwright tests
run: pnpm test:e2e
env:
CI: true

- uses: actions/upload-artifact@v3
if: always()
Expand Down
4 changes: 2 additions & 2 deletions configs/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// colors: https://github.com/tailwindlabs/tailwindcss/blob/master/src/public/colors.js
// spacing and other values: https://github.com/tailwindlabs/tailwindcss/blob/master/stubs/defaultConfig.stub.js

import { misc } from '@nothing-but/utils'
import { Misc } from '@nothing-but/utils'
import type { Prettify, UnionToIntersection } from '@nothing-but/utils/types'

const cyan = {
Expand Down Expand Up @@ -130,7 +130,7 @@ export type Spacing = Prettify<
>
>

export const spacing = misc.keys(raw_spacing_with_custom).reduce(
export const spacing = Misc.keys(raw_spacing_with_custom).reduce(
(acc, key) => {
const value = raw_spacing_with_custom[key]
acc[key] = value
Expand Down
13 changes: 6 additions & 7 deletions configs/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import path from 'path'
import solid from 'vite-plugin-solid'
import { InlineConfig } from 'vitest'
import { defineConfig, UserConfig } from 'vitest/config'
import * as vi from 'vitest/config'

const cwd = process.cwd()

export const testConfig: InlineConfig = {
export const testConfig: vi.UserConfig['test'] = {
passWithNoTests: true,
watch: false,
globals: true,
Expand All @@ -23,11 +22,11 @@ export const resolveConfig = {
'solid-js/store': path.resolve(cwd, 'node_modules/solid-js/store/dist/dev.js'),
'solid-js': path.resolve(cwd, 'node_modules/solid-js/dist/dev.js'),
},
} satisfies UserConfig['resolve']
} satisfies vi.UserConfig['resolve']

export const vitestFullConfig = (patch?: (config: UserConfig) => void) =>
defineConfig(() => {
const config: UserConfig = {
export const vitestFullConfig = (patch?: (config: vi.UserConfig) => void) =>
vi.defineConfig(() => {
const config: vi.UserConfig = {
plugins: [solid()],
test: testConfig,
resolve: resolveConfig,
Expand Down
6 changes: 3 additions & 3 deletions examples/sandbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
},
"devDependencies": {
"@babel/plugin-syntax-typescript": "^7.22.5",
"@unocss/preset-typography": "^0.54.1",
"@unocss/preset-typography": "^0.57.1",
"solid-devtools": "workspace:^",
"unocss": "^0.53.6",
"vite-plugin-inspect": "^0.7.33"
"unocss": "^0.57.1",
"vite-plugin-inspect": "^0.7.41"
},
"dependencies": {
"@solid-devtools/debugger": "workspace:^",
Expand Down
10 changes: 5 additions & 5 deletions examples/start/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"type": "module",
"main": "./dist/index.js",
"devDependencies": {
"solid-start-node": "^0.2.29"
"solid-start-node": "^0.3.9"
},
"dependencies": {
"@solid-devtools/overlay": "workspace:^",
"@solidjs/meta": "^0.28.6",
"@solidjs/router": "^0.8.2",
"@solidjs/meta": "^0.29.1",
"@solidjs/router": "^0.8.3",
"solid-devtools": "workspace:^",
"solid-start": "^0.2.29",
"undici": "^5.22.1"
"solid-start": "^0.3.9",
"undici": "^5.27.0"
},
"engines": {
"node": ">=18"
Expand Down
4 changes: 2 additions & 2 deletions examples/vite-plugin-ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
},
"dependencies": {
"solid-devtools": "workspace:^",
"vite-plugin-ssr": "0.4.133"
"vite-plugin-ssr": "0.4.142"
},
"devDependencies": {
"vite-plugin-inspect": "^0.7.33"
"vite-plugin-inspect": "^0.7.41"
}
}
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"----------------------DEV----------------------": "",
"dev:ext": "pnpm -dir packages/extension run dev",
"dev:transform": "pnpm -dir packages/transform run dev",
"dev": "pnpm run --parallel --filter ./packages/* --filter !./packages/extension dev",
"dev": "pnpm run --parallel --filter=./packages/* --filter=!./packages/extension dev",
"sandbox": "pnpm -dir examples/sandbox run dev",
"sandbox:ext": "pnpm -dir examples/sandbox run dev:ext",
"----------------------BUILD----------------------": "",
Expand All @@ -29,33 +29,33 @@
},
"devDependencies": {
"@changesets/cli": "^2.26.2",
"@nothing-but/utils": "~0.3.2",
"@nothing-but/utils": "~0.11.1",
"@playwright/test": "^1.39.0",
"@total-typescript/ts-reset": "^0.4.2",
"@types/node": "^18.16.16",
"@typescript-eslint/eslint-plugin": "^6.2.0",
"@typescript-eslint/parser": "^6.2.0",
"babel-preset-solid": "^1.7.7",
"@total-typescript/ts-reset": "^0.5.1",
"@types/node": "^20.8.10",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"babel-preset-solid": "^1.8.4",
"cross-env": "^7.0.3",
"esbuild": "^0.18.17",
"esbuild": "^0.19.5",
"esbuild-plugin-solid": "^0.5.0",
"eslint": "^8.45.0",
"eslint": "^8.52.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-no-only-tests": "^3.1.0",
"jsdom": "^22.1.0",
"prettier": "^3.0.0",
"prettier": "^3.0.3",
"prettier-plugin-organize-imports": "^3.2.3",
"solid-js": "^1.7.8",
"tsup": "^7.1.0",
"tsup-preset-solid": "^2.0.2",
"turbo": "^1.10.12",
"typescript": "^5.1.6",
"unocss": "^0.53.6",
"vite": "4.4.7",
"vite-plugin-solid": "^2.7.0",
"vitest": "^0.33.0"
"solid-js": "^1.8.5",
"tsup": "^7.2.0",
"tsup-preset-solid": "^2.1.0",
"turbo": "^1.10.16",
"typescript": "^5.2.2",
"unocss": "^0.57.1",
"vite": "4.5.0",
"vite-plugin-solid": "^2.7.2",
"vitest": "^0.34.6"
},
"packageManager": "pnpm@8.6.0",
"packageManager": "pnpm@8.9.0",
"engines": {
"node": ">=18",
"pnpm": ">=8.6.0"
Expand Down
26 changes: 13 additions & 13 deletions packages/debugger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,26 @@
"test:types": "tsc --noEmit --paths null"
},
"dependencies": {
"@nothing-but/utils": "~0.3.2",
"@nothing-but/utils": "~0.11.1",
"@solid-devtools/shared": "workspace:^",
"@solid-primitives/bounds": "^0.0.114",
"@solid-primitives/cursor": "^0.0.111",
"@solid-primitives/event-bus": "^1.0.7",
"@solid-primitives/event-listener": "^2.2.13",
"@solid-primitives/keyboard": "^1.2.3",
"@solid-primitives/platform": "^0.0.105",
"@solid-primitives/rootless": "^1.4.1",
"@solid-primitives/scheduled": "^1.4.0",
"@solid-primitives/static-store": "^0.0.4",
"@solid-primitives/utils": "^6.2.0"
"@solid-primitives/bounds": "^0.0.118",
"@solid-primitives/cursor": "^0.0.112",
"@solid-primitives/event-bus": "^1.0.8",
"@solid-primitives/event-listener": "^2.3.0",
"@solid-primitives/keyboard": "^1.2.5",
"@solid-primitives/platform": "^0.1.0",
"@solid-primitives/rootless": "^1.4.2",
"@solid-primitives/scheduled": "^1.4.1",
"@solid-primitives/static-store": "^0.0.5",
"@solid-primitives/utils": "^6.2.1"
},
"peerDependencies": {
"solid-js": "^1.7.0"
},
"devDependencies": {
"solid-js": "^1.7.8"
"solid-js": "^1.8.5"
},
"packageManager": "pnpm@8.6.0",
"packageManager": "pnpm@8.9.0",
"keywords": [
"solid",
"devtools",
Expand Down
4 changes: 2 additions & 2 deletions packages/debugger/src/inspector/inspector.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isPlainObject } from '@nothing-but/utils/misc'
import { Misc } from '@nothing-but/utils'
import { untrackedCallback } from '@solid-devtools/shared/primitives'
import { parseLocationString } from '../locator'
import { NodeType, ValueItemType } from '../main/constants'
Expand Down Expand Up @@ -253,7 +253,7 @@ function mapProps(props: Solid.Component['props']) {
value: encodeValue(desc.value, false),
}
// non-object props cannot be inspected (won't ever change and aren't deep)
if (Array.isArray(desc.value) || isPlainObject(desc.value))
if (Array.isArray(desc.value) || Misc.is_plain_object(desc.value))
ValueMap.add(id, () => desc.value)
}
}
Expand Down
10 changes: 5 additions & 5 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
},
"devDependencies": {
"@crxjs/vite-plugin": "2.0.0-beta.17",
"@types/chrome": "^0.0.242",
"rimraf": "^5.0.1",
"zip-a-folder": "^2.0.0"
"@types/chrome": "^0.0.248",
"rimraf": "^5.0.5",
"zip-a-folder": "^3.1.3"
},
"dependencies": {
"@solid-devtools/debugger": "workspace:^",
"@solid-devtools/frontend": "workspace:^",
"@solid-devtools/shared": "workspace:^",
"@solid-primitives/utils": "^6.2.0",
"@solid-primitives/utils": "^6.2.1",
"solid-devtools": "workspace:^",
"solid-js": "^1.7.8"
"solid-js": "^1.8.5"
},
"overrides": {
"@crxjs/vite-plugin": {
Expand Down
34 changes: 17 additions & 17 deletions packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,29 @@
"@solid-devtools/debugger": "workspace:^",
"@solid-devtools/shared": "workspace:^",
"@solid-primitives/context": "^0.2.1",
"@solid-primitives/cursor": "^0.0.111",
"@solid-primitives/date": "^2.0.15",
"@solid-primitives/event-bus": "^1.0.7",
"@solid-primitives/event-listener": "^2.2.13",
"@solid-primitives/jsx-tokenizer": "^1.0.6",
"@solid-primitives/keyboard": "^1.2.3",
"@solid-primitives/cursor": "^0.0.112",
"@solid-primitives/date": "^2.0.18",
"@solid-primitives/event-bus": "^1.0.8",
"@solid-primitives/event-listener": "^2.3.0",
"@solid-primitives/jsx-tokenizer": "^1.0.7",
"@solid-primitives/keyboard": "^1.2.5",
"@solid-primitives/keyed": "^1.2.0",
"@solid-primitives/media": "^2.2.3",
"@solid-primitives/mouse": "^2.0.14",
"@solid-primitives/props": "^3.1.6",
"@solid-primitives/range": "^0.1.14",
"@solid-primitives/resize-observer": "^2.0.18",
"@solid-primitives/scheduled": "^1.4.0",
"@solid-primitives/static-store": "^0.0.4",
"@solid-primitives/styles": "^0.0.110",
"@solid-primitives/media": "^2.2.5",
"@solid-primitives/mouse": "^2.0.16",
"@solid-primitives/props": "^3.1.8",
"@solid-primitives/range": "^0.1.15",
"@solid-primitives/resize-observer": "^2.0.22",
"@solid-primitives/scheduled": "^1.4.1",
"@solid-primitives/static-store": "^0.0.5",
"@solid-primitives/styles": "^0.0.111",
"@solid-primitives/timer": "^1.3.7",
"@solid-primitives/utils": "^6.2.0",
"@solid-primitives/utils": "^6.2.1",
"clsx": "^2.0.0",
"solid-headless": "^0.13.1"
},
"devDependencies": {
"@unocss/cli": "^0.53.6",
"solid-js": "^1.7.8"
"@unocss/cli": "^0.57.1",
"solid-js": "^1.8.5"
},
"peerDependencies": {
"solid-js": "^1.7.0"
Expand Down
Loading

0 comments on commit f03768b

Please sign in to comment.