From 99f03bd73036229b914da903a0cb00c1806a258c Mon Sep 17 00:00:00 2001 From: JW Date: Fri, 14 Jul 2023 22:05:18 +0800 Subject: [PATCH] :bug: switch console-feed to offical version (#7) --- .changeset/young-suits-press.md | 5 ++++ .eslintignore | 1 + packages/client/package.json | 2 +- packages/client/src/pages/index.tsx | 4 +-- packages/vsit/global.d.ts | 2 +- packages/vsit/package.json | 2 +- packages/vsit/src/plugins/vsit/index.ts | 4 +-- pnpm-lock.yaml | 36 ++++++++++++------------- 8 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 .changeset/young-suits-press.md create mode 100644 .eslintignore diff --git a/.changeset/young-suits-press.md b/.changeset/young-suits-press.md new file mode 100644 index 0000000..3b027d0 --- /dev/null +++ b/.changeset/young-suits-press.md @@ -0,0 +1,5 @@ +--- +"vsit": patch +--- + +replace @nicksrandall/console-feed to console-feed diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..3366c96 --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +dist-client diff --git a/packages/client/package.json b/packages/client/package.json index 0d5828a..4123cca 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -38,10 +38,10 @@ "@codemirror/state": "^6.2.1", "@codemirror/view": "^6.13.0", "@lezer/highlight": "^1.1.6", - "@nicksrandall/console-feed": "3.5.0", "@tailwindcss/typography": "0.5.7", "@uiw/codemirror-theme-atomone": "^4.21.2", "clsx": "1.2.1", + "console-feed": "3.5.0", "daisyui": "^2.24.0", "solid-codemirror": "^2.3.0", "solid-js": "^1.7.6" diff --git a/packages/client/src/pages/index.tsx b/packages/client/src/pages/index.tsx index 91cf2d8..9e10615 100644 --- a/packages/client/src/pages/index.tsx +++ b/packages/client/src/pages/index.tsx @@ -1,7 +1,7 @@ /* eslint-disable react/jsx-key */ -import Hook from '@nicksrandall/console-feed/lib/Hook' -import { Decode } from '@nicksrandall/console-feed/lib/Transform' import clsx from 'clsx' +import Hook from 'console-feed/lib/Hook' +import { Decode } from 'console-feed/lib/Transform' import { createSignal } from 'solid-js' import { consolehook, MESSAGE_EVENT_TYPE } from 'vsit' diff --git a/packages/vsit/global.d.ts b/packages/vsit/global.d.ts index f50a352..0bebe47 100644 --- a/packages/vsit/global.d.ts +++ b/packages/vsit/global.d.ts @@ -1,4 +1,4 @@ -import type { Encode, Hook } from '@nicksrandall/@nicksrandall/console-feed' +import type { Encode, Hook } from 'console-feed' import type { ViteDevServer } from 'vite' declare global { diff --git a/packages/vsit/package.json b/packages/vsit/package.json index acb113e..ee3a9ff 100644 --- a/packages/vsit/package.json +++ b/packages/vsit/package.json @@ -69,7 +69,6 @@ }, "devDependencies": { "@changesets/cli": "^2.26.0", - "@nicksrandall/console-feed": "3.5.0", "@rollup/plugin-alias": "4.0.3", "@rollup/plugin-commonjs": "24.0.1", "@rollup/plugin-json": "^6.0.0", @@ -82,6 +81,7 @@ "body-parser": "1.20.2", "cac": "6.7.12", "consola": "^2.15.3", + "console-feed": "3.5.0", "cz-emoji": "^1.3.1", "debug": "^4.3.4", "esbuild": "^0.18.6", diff --git a/packages/vsit/src/plugins/vsit/index.ts b/packages/vsit/src/plugins/vsit/index.ts index 48e0e7a..adf92e0 100644 --- a/packages/vsit/src/plugins/vsit/index.ts +++ b/packages/vsit/src/plugins/vsit/index.ts @@ -1,8 +1,8 @@ import { performance } from 'node:perf_hooks' -import Hook from '@nicksrandall/console-feed/lib/Hook' -import { Encode } from '@nicksrandall/console-feed/lib/Transform' import bodyparser from 'body-parser' +import Hook from 'console-feed/lib/Hook' +import { Encode } from 'console-feed/lib/Transform' import { parseURL } from 'ufo' import { debug } from '@/common/log' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8c5bb7b..80ba4ea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,7 +41,6 @@ importers: '@codemirror/state': ^6.2.1 '@codemirror/view': ^6.13.0 '@lezer/highlight': ^1.1.6 - '@nicksrandall/console-feed': 3.5.0 '@svgr-rs/svgrs-plugin': ^0.1.0 '@tailwindcss/typography': 0.5.7 '@types/debug': ^4.1.8 @@ -49,6 +48,7 @@ importers: '@uiw/codemirror-theme-atomone': ^4.21.2 autoprefixer: 10.4.8 clsx: 1.2.1 + console-feed: 3.5.0 daisyui: ^2.24.0 postcss: 8.4.16 solid-codemirror: ^2.3.0 @@ -73,10 +73,10 @@ importers: '@codemirror/state': 6.2.1 '@codemirror/view': 6.13.0 '@lezer/highlight': 1.1.6 - '@nicksrandall/console-feed': 3.5.0 '@tailwindcss/typography': 0.5.7_tailwindcss@3.3.2 '@uiw/codemirror-theme-atomone': 4.21.2_sxb653lu6oglfxs7ekdhsp4ari clsx: 1.2.1 + console-feed: 3.5.0 daisyui: 2.51.6_25hquoklqeoqwmt7fwvvcyxm5e solid-codemirror: 2.3.0_im77duhudjzqkq4jfyk3tbrzby solid-js: 1.7.6 @@ -100,7 +100,6 @@ importers: packages/vsit: specifiers: '@changesets/cli': ^2.26.0 - '@nicksrandall/console-feed': 3.5.0 '@rollup/plugin-alias': 4.0.3 '@rollup/plugin-commonjs': 24.0.1 '@rollup/plugin-json': ^6.0.0 @@ -113,6 +112,7 @@ importers: body-parser: 1.20.2 cac: 6.7.12 consola: ^2.15.3 + console-feed: 3.5.0 cz-emoji: ^1.3.1 debug: ^4.3.4 esbuild: ^0.18.6 @@ -143,7 +143,6 @@ importers: vite: 4.3.8_@types+node@20.3.1 devDependencies: '@changesets/cli': 2.26.1 - '@nicksrandall/console-feed': 3.5.0 '@rollup/plugin-alias': 4.0.3_rollup@3.19.1 '@rollup/plugin-commonjs': 24.0.1_rollup@3.19.1 '@rollup/plugin-json': 6.0.0_rollup@3.19.1 @@ -156,6 +155,7 @@ importers: body-parser: 1.20.2 cac: 6.7.12 consola: 2.15.3 + console-feed: 3.5.0 cz-emoji: 1.3.1 debug: 4.3.4 esbuild: 0.18.6 @@ -1535,20 +1535,6 @@ packages: glob: 7.1.7 dev: true - /@nicksrandall/console-feed/3.5.0: - resolution: {integrity: sha512-Fv5NtxQ3QC/e2sI/FJ1DI23XvjrWcvTlY8E/QjUkK0x+khxdSiP01ml3gdtX//TUkn51e2REvshKAfNRYhPa8A==} - peerDependencies: - react: ^15.x || ^16.x || ^17.x || ^18.x - dependencies: - '@emotion/core': 10.3.1 - '@emotion/styled': 10.3.0_@emotion+core@10.3.1 - emotion-theming: 10.3.0_@emotion+core@10.3.1 - linkifyjs: 2.1.9 - react-inspector: 5.1.1 - transitivePeerDependencies: - - jquery - - react-dom - /@nodelib/fs.scandir/2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -2774,6 +2760,20 @@ packages: resolution: {integrity: sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==} dev: true + /console-feed/3.5.0: + resolution: {integrity: sha512-2N5b37yH0HeaqbBDsHBx0jEy3qvhTGA1dVdGyEM6C1NQhVmIX+ToU6Rt/uo86K0lLs4Lg1orC940YSn+Z3kk5g==} + peerDependencies: + react: ^15.x || ^16.x || ^17.x || ^18.x + dependencies: + '@emotion/core': 10.3.1 + '@emotion/styled': 10.3.0_@emotion+core@10.3.1 + emotion-theming: 10.3.0_@emotion+core@10.3.1 + linkifyjs: 2.1.9 + react-inspector: 5.1.1 + transitivePeerDependencies: + - jquery + - react-dom + /content-type/1.0.5: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'}