From e3c0fee902a7bfc312fb01b30531209815d460c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ari=20Perkki=C3=B6?= Date: Tue, 27 Aug 2024 15:22:58 +0300 Subject: [PATCH] feat!: rename `@tutorialkit/components-react` to `@tutorialkit/react` (#155) --- .github/workflows/publish-commit.yaml | 2 +- CONTRIBUTING.md | 4 +- docs/demo/package.json | 2 +- docs/tutorialkit.dev/package.json | 2 +- .../components/react-examples/Example.astro | 2 +- .../ExampleCodeMirrorEditor.tsx | 4 +- .../react-examples/ExampleFileTree.tsx | 2 +- .../react-examples/ExampleSimpleEditor.tsx | 8 +- .../react-examples/ExampleTerminal.tsx | 2 +- .../docs/reference/react-components.mdx | 6 +- e2e/package.json | 2 +- packages/astro/README.md | 2 +- packages/astro/package.json | 2 +- .../src/default/components/LoginButton.tsx | 2 +- .../src/default/components/NavWrapper.tsx | 2 +- .../default/components/ResizablePanel.astro | 2 +- .../components/WorkspacePanelWrapper.tsx | 2 +- packages/astro/src/index.ts | 4 +- packages/astro/tsconfig.json | 2 +- packages/cli/tests/create-tutorial.test.ts | 2 +- packages/{components => }/react/CHANGELOG.md | 0 packages/{components => }/react/package.json | 6 +- .../{components => }/react/scripts/build.js | 0 .../{components => }/react/src/BootScreen.tsx | 0 packages/{components => }/react/src/Nav.tsx | 0 .../react/src/Panels/EditorPanel.tsx | 0 .../react/src/Panels/PreviewPanel.tsx | 0 .../react/src/Panels/TerminalPanel.tsx | 0 .../react/src/Panels/WorkspacePanel.tsx | 0 packages/{components => }/react/src/core.ts | 0 .../core/CodeMirrorEditor/BinaryContent.tsx | 0 .../src/core/CodeMirrorEditor/cm-theme.ts | 0 .../react/src/core/CodeMirrorEditor/indent.ts | 0 .../react/src/core/CodeMirrorEditor/index.tsx | 0 .../src/core/CodeMirrorEditor/languages.ts | 0 .../CodeMirrorEditor/themes/vscode-dark.ts | 0 .../react/src/core/FileTree.tsx | 0 .../react/src/core/Terminal/index.tsx | 0 .../react/src/core/Terminal/theme.ts | 0 .../{components => }/react/src/core/types.ts | 0 .../react/src/css.module.d.ts | 0 .../react/src/hooks/useOutsideClick.ts | 0 packages/{components => }/react/src/index.ts | 0 .../{components => }/react/src/styles/cm.css | 0 .../react/src/styles/nav.module.css | 0 .../react/src/styles/resize-panel.module.css | 0 .../react/src/styles/terminal.css | 0 .../react/src/utils/classnames.ts | 0 .../react/src/utils/debounce.ts | 0 .../react/src/utils/mobile.ts | 0 .../react/tsconfig.build.json | 6 +- packages/{components => }/react/tsconfig.json | 8 +- packages/template/package.json | 2 +- packages/theme/src/index.ts | 2 +- pnpm-lock.yaml | 248 +++++++++--------- pnpm-workspace.yaml | 1 - scripts/changelog.mjs | 2 +- 57 files changed, 161 insertions(+), 170 deletions(-) rename packages/{components => }/react/CHANGELOG.md (100%) rename packages/{components => }/react/package.json (95%) rename packages/{components => }/react/scripts/build.js (100%) rename packages/{components => }/react/src/BootScreen.tsx (100%) rename packages/{components => }/react/src/Nav.tsx (100%) rename packages/{components => }/react/src/Panels/EditorPanel.tsx (100%) rename packages/{components => }/react/src/Panels/PreviewPanel.tsx (100%) rename packages/{components => }/react/src/Panels/TerminalPanel.tsx (100%) rename packages/{components => }/react/src/Panels/WorkspacePanel.tsx (100%) rename packages/{components => }/react/src/core.ts (100%) rename packages/{components => }/react/src/core/CodeMirrorEditor/BinaryContent.tsx (100%) rename packages/{components => }/react/src/core/CodeMirrorEditor/cm-theme.ts (100%) rename packages/{components => }/react/src/core/CodeMirrorEditor/indent.ts (100%) rename packages/{components => }/react/src/core/CodeMirrorEditor/index.tsx (100%) rename packages/{components => }/react/src/core/CodeMirrorEditor/languages.ts (100%) rename packages/{components => }/react/src/core/CodeMirrorEditor/themes/vscode-dark.ts (100%) rename packages/{components => }/react/src/core/FileTree.tsx (100%) rename packages/{components => }/react/src/core/Terminal/index.tsx (100%) rename packages/{components => }/react/src/core/Terminal/theme.ts (100%) rename packages/{components => }/react/src/core/types.ts (100%) rename packages/{components => }/react/src/css.module.d.ts (100%) rename packages/{components => }/react/src/hooks/useOutsideClick.ts (100%) rename packages/{components => }/react/src/index.ts (100%) rename packages/{components => }/react/src/styles/cm.css (100%) rename packages/{components => }/react/src/styles/nav.module.css (100%) rename packages/{components => }/react/src/styles/resize-panel.module.css (100%) rename packages/{components => }/react/src/styles/terminal.css (100%) rename packages/{components => }/react/src/utils/classnames.ts (100%) rename packages/{components => }/react/src/utils/debounce.ts (100%) rename packages/{components => }/react/src/utils/mobile.ts (100%) rename packages/{components => }/react/tsconfig.build.json (60%) rename packages/{components => }/react/tsconfig.json (55%) diff --git a/.github/workflows/publish-commit.yaml b/.github/workflows/publish-commit.yaml index f523e6d5..316cdf87 100644 --- a/.github/workflows/publish-commit.yaml +++ b/.github/workflows/publish-commit.yaml @@ -61,7 +61,7 @@ jobs: run: > pnpm dlx pkg-pr-new@0.0 publish --compact --pnpm ./packages/astro - ./packages/components/react + ./packages/react ./packages/runtime ./packages/theme ./packages/types diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cb077a8d..27323a58 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,7 +31,7 @@ The monorepo consists of multiple packages that are grouped into following group These packages will be installed by the end-users in their `package.json`. - `@tutorialkit/astro` -- `@tutorialkit/components-react` +- `@tutorialkit/react` - `@tutorialkit/runtime` - `@tutorialkit/theme` - `@tutorialkit/types` @@ -53,7 +53,7 @@ You may wish to test your locally-modified copy of TutorialKit against another p "pnpm": { "overrides": { "@tutorialkit/astro": "file:../tutorialkit/packages/astro", - "@tutorialkit/components-react": "file:../tutorialkit/packages/components/react", + "@tutorialkit/react": "file:../tutorialkit/packages/react", "@tutorialkit/runtime": "file:../tutorialkit/packages/runtime", "@tutorialkit/theme": "file:../tutorialkit/packages/theme", "@tutorialkit/types": "file:../tutorialkit/packages/types" diff --git a/docs/demo/package.json b/docs/demo/package.json index 41ec04b2..4e0cb00b 100644 --- a/docs/demo/package.json +++ b/docs/demo/package.json @@ -11,7 +11,7 @@ "preview": "astro preview" }, "dependencies": { - "@tutorialkit/components-react": "workspace:*", + "@tutorialkit/react": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1" }, diff --git a/docs/tutorialkit.dev/package.json b/docs/tutorialkit.dev/package.json index a4c94b05..b7693a7c 100644 --- a/docs/tutorialkit.dev/package.json +++ b/docs/tutorialkit.dev/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "@tutorialkit/components-react": "workspace:*", + "@tutorialkit/react": "workspace:*", "@webcontainer/api": "1.2.0", "classnames": "^2.5.1", "react": "^18.3.1", diff --git a/docs/tutorialkit.dev/src/components/react-examples/Example.astro b/docs/tutorialkit.dev/src/components/react-examples/Example.astro index 6b3dad52..8ebb0b51 100644 --- a/docs/tutorialkit.dev/src/components/react-examples/Example.astro +++ b/docs/tutorialkit.dev/src/components/react-examples/Example.astro @@ -1,5 +1,5 @@ --- -import { classNames } from '@tutorialkit/components-react'; +import { classNames } from '@tutorialkit/react'; import '@tutorialkit/astro/default-theme.css'; interface Props { diff --git a/docs/tutorialkit.dev/src/components/react-examples/ExampleCodeMirrorEditor.tsx b/docs/tutorialkit.dev/src/components/react-examples/ExampleCodeMirrorEditor.tsx index fc830d97..989c1113 100644 --- a/docs/tutorialkit.dev/src/components/react-examples/ExampleCodeMirrorEditor.tsx +++ b/docs/tutorialkit.dev/src/components/react-examples/ExampleCodeMirrorEditor.tsx @@ -1,5 +1,5 @@ -import type { EditorDocument, EditorUpdate, ScrollPosition } from '@tutorialkit/components-react/core'; -import CodeMirrorEditor from '@tutorialkit/components-react/core/CodeMirrorEditor'; +import type { EditorDocument, EditorUpdate, ScrollPosition } from '@tutorialkit/react/core'; +import CodeMirrorEditor from '@tutorialkit/react/core/CodeMirrorEditor'; import { useState } from 'react'; import { useTheme } from './hooks/useTheme'; diff --git a/docs/tutorialkit.dev/src/components/react-examples/ExampleFileTree.tsx b/docs/tutorialkit.dev/src/components/react-examples/ExampleFileTree.tsx index 40f8db75..8510febb 100644 --- a/docs/tutorialkit.dev/src/components/react-examples/ExampleFileTree.tsx +++ b/docs/tutorialkit.dev/src/components/react-examples/ExampleFileTree.tsx @@ -1,5 +1,5 @@ import { useState } from 'react'; -import FileTree from '@tutorialkit/components-react/core/FileTree'; +import FileTree from '@tutorialkit/react/core/FileTree'; export default function ExampleFileTree() { const [selectedFile, setSelectedFile] = useState(FILES[0]); diff --git a/docs/tutorialkit.dev/src/components/react-examples/ExampleSimpleEditor.tsx b/docs/tutorialkit.dev/src/components/react-examples/ExampleSimpleEditor.tsx index 3c5188b6..dbb3c29e 100644 --- a/docs/tutorialkit.dev/src/components/react-examples/ExampleSimpleEditor.tsx +++ b/docs/tutorialkit.dev/src/components/react-examples/ExampleSimpleEditor.tsx @@ -1,13 +1,13 @@ -import type { EditorDocument, EditorUpdate, ScrollPosition } from '@tutorialkit/components-react/core'; -import CodeMirrorEditor from '@tutorialkit/components-react/core/CodeMirrorEditor'; -import FileTree from '@tutorialkit/components-react/core/FileTree'; +import type { EditorDocument, EditorUpdate, ScrollPosition } from '@tutorialkit/react/core'; +import CodeMirrorEditor from '@tutorialkit/react/core/CodeMirrorEditor'; +import FileTree from '@tutorialkit/react/core/FileTree'; import type { FileSystemTree, DirectoryNode } from '@webcontainer/api'; import type { Terminal as XTerm } from '@xterm/xterm'; import { Suspense, lazy, useEffect, useState } from 'react'; import { useTheme } from './hooks/useTheme'; import { useWebContainer } from './hooks/useWebcontainer'; -const Terminal = lazy(() => import('@tutorialkit/components-react/core/Terminal')); +const Terminal = lazy(() => import('@tutorialkit/react/core/Terminal')); export default function ExampleSimpleEditor() { const [domLoaded, setDomLoaded] = useState(false); diff --git a/docs/tutorialkit.dev/src/components/react-examples/ExampleTerminal.tsx b/docs/tutorialkit.dev/src/components/react-examples/ExampleTerminal.tsx index 845794de..c731156e 100644 --- a/docs/tutorialkit.dev/src/components/react-examples/ExampleTerminal.tsx +++ b/docs/tutorialkit.dev/src/components/react-examples/ExampleTerminal.tsx @@ -3,7 +3,7 @@ import { useTheme } from './hooks/useTheme'; import type { Terminal as XTerm } from '@xterm/xterm'; import { useWebContainer } from './hooks/useWebcontainer'; -const Terminal = lazy(() => import('@tutorialkit/components-react/core/Terminal')); +const Terminal = lazy(() => import('@tutorialkit/react/core/Terminal')); export default function ExampleTerminal() { // only needed in astro because of SSR diff --git a/docs/tutorialkit.dev/src/content/docs/reference/react-components.mdx b/docs/tutorialkit.dev/src/content/docs/reference/react-components.mdx index 874d8336..ea1fe7e9 100644 --- a/docs/tutorialkit.dev/src/content/docs/reference/react-components.mdx +++ b/docs/tutorialkit.dev/src/content/docs/reference/react-components.mdx @@ -32,17 +32,17 @@ These components use TutorialKit's design system which is based on an atomic CSS ```shell - npm install @tutorialkit/components-react @tutorialkit/theme + npm install @tutorialkit/react @tutorialkit/theme ``` ```shell - pnpm install @tutorialkit/components-react @tutorialkit/theme + pnpm install @tutorialkit/react @tutorialkit/theme ``` ```shell - yarn add @tutorialkit/components-react @tutorialkit/theme + yarn add @tutorialkit/react @tutorialkit/theme ``` diff --git a/e2e/package.json b/e2e/package.json index 7436ff52..1c3ed8f2 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -14,7 +14,7 @@ "@iconify-json/svg-spinners": "^1.1.2", "@playwright/test": "^1.46.0", "@tutorialkit/astro": "workspace:*", - "@tutorialkit/components-react": "workspace:*", + "@tutorialkit/react": "workspace:*", "@tutorialkit/runtime": "workspace:*", "@tutorialkit/theme": "workspace:*", "@tutorialkit/types": "workspace:*", diff --git a/packages/astro/README.md b/packages/astro/README.md index 19e5d075..631a8be4 100644 --- a/packages/astro/README.md +++ b/packages/astro/README.md @@ -2,7 +2,7 @@ This **[Astro integration][astro-integration]** adds [TutorialKit](https://tutorialkit.dev/) to your project so that you can use TutorialKit's tutorial format for your astro content. -This integration adds routes to serve your tutorial. It uses `@tutorialkit/components-react` for the dynamic part of the experience. +This integration adds routes to serve your tutorial. It uses `@tutorialkit/react` for the dynamic part of the experience. ## License diff --git a/packages/astro/package.json b/packages/astro/package.json index d82eb140..ef7ee7d4 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -37,7 +37,7 @@ "@expressive-code/plugin-line-numbers": "^0.35.3", "@nanostores/react": "0.7.2", "@stackblitz/sdk": "^1.11.0", - "@tutorialkit/components-react": "workspace:*", + "@tutorialkit/react": "workspace:*", "@tutorialkit/runtime": "workspace:*", "@tutorialkit/theme": "workspace:*", "@tutorialkit/types": "workspace:*", diff --git a/packages/astro/src/default/components/LoginButton.tsx b/packages/astro/src/default/components/LoginButton.tsx index 1420a14f..24870297 100644 --- a/packages/astro/src/default/components/LoginButton.tsx +++ b/packages/astro/src/default/components/LoginButton.tsx @@ -1,5 +1,5 @@ import { useStore } from '@nanostores/react'; -import { classNames } from '@tutorialkit/components-react'; +import { classNames } from '@tutorialkit/react'; import { useEffect, useRef, useState } from 'react'; import { authStore } from '../stores/auth-store'; import { login, logout } from './webcontainer'; diff --git a/packages/astro/src/default/components/NavWrapper.tsx b/packages/astro/src/default/components/NavWrapper.tsx index 841d86ae..585ad9a3 100644 --- a/packages/astro/src/default/components/NavWrapper.tsx +++ b/packages/astro/src/default/components/NavWrapper.tsx @@ -1,4 +1,4 @@ -import { Nav } from '@tutorialkit/components-react'; +import { Nav } from '@tutorialkit/react'; import type { Lesson, NavList } from '@tutorialkit/types'; interface Props { diff --git a/packages/astro/src/default/components/ResizablePanel.astro b/packages/astro/src/default/components/ResizablePanel.astro index bde54789..09b9e9fb 100644 --- a/packages/astro/src/default/components/ResizablePanel.astro +++ b/packages/astro/src/default/components/ResizablePanel.astro @@ -1,5 +1,5 @@ --- -import { classNames } from '@tutorialkit/components-react'; +import { classNames } from '@tutorialkit/react'; export type Type = 'horizontal' | 'vertical'; export type Priority = 'min' | 'max'; diff --git a/packages/astro/src/default/components/WorkspacePanelWrapper.tsx b/packages/astro/src/default/components/WorkspacePanelWrapper.tsx index 01fa4a3c..ba02dc1f 100644 --- a/packages/astro/src/default/components/WorkspacePanelWrapper.tsx +++ b/packages/astro/src/default/components/WorkspacePanelWrapper.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react'; import { useStore } from '@nanostores/react'; -import { WorkspacePanel } from '@tutorialkit/components-react'; +import { WorkspacePanel } from '@tutorialkit/react'; import type { Lesson } from '@tutorialkit/types'; import { themeStore } from '../stores/theme-store.js'; import { tutorialStore } from './webcontainer.js'; diff --git a/packages/astro/src/index.ts b/packages/astro/src/index.ts index 3d1c10f9..d14764d2 100644 --- a/packages/astro/src/index.ts +++ b/packages/astro/src/index.ts @@ -87,14 +87,14 @@ export default function createPlugin({ vite: { optimizeDeps: { entries: ['!**/src/(content|templates)/**'], - include: process.env.TUTORIALKIT_DEV ? [] : ['@tutorialkit/components-react'], + include: process.env.TUTORIALKIT_DEV ? [] : ['@tutorialkit/react'], }, define: { __ENTERPRISE__: `${!!enterprise}`, __WC_CONFIG__: enterprise ? JSON.stringify(enterprise) : 'undefined', }, ssr: { - noExternal: ['@tutorialkit/astro', '@tutorialkit/components-react'], + noExternal: ['@tutorialkit/astro', '@tutorialkit/react'], }, plugins: [ userlandCSS, diff --git a/packages/astro/tsconfig.json b/packages/astro/tsconfig.json index 6a30c969..38fecffb 100644 --- a/packages/astro/tsconfig.json +++ b/packages/astro/tsconfig.json @@ -11,7 +11,7 @@ "references": [ { "path": "../runtime/tsconfig.build.json" }, { "path": "../types/tsconfig.build.json" }, - { "path": "../components/react/tsconfig.build.json" }, + { "path": "../react/tsconfig.build.json" }, { "path": "../theme" } ] } diff --git a/packages/cli/tests/create-tutorial.test.ts b/packages/cli/tests/create-tutorial.test.ts index d6fe48f5..553223f2 100644 --- a/packages/cli/tests/create-tutorial.test.ts +++ b/packages/cli/tests/create-tutorial.test.ts @@ -242,7 +242,7 @@ async function runPnpmInstall(dest: string, baseDir: string) { overrides: { '@astrojs/language-server': '2.14.1', '@tutorialkit/astro': `file:${baseDir}/packages/astro`, - '@tutorialkit/components-react': `file:${baseDir}/packages/components/react`, + '@tutorialkit/react': `file:${baseDir}/packages/react`, '@tutorialkit/runtime': `file:${baseDir}/packages/runtime`, '@tutorialkit/theme': `file:${baseDir}/packages/theme`, '@tutorialkit/types': `file:${baseDir}/packages/types`, diff --git a/packages/components/react/CHANGELOG.md b/packages/react/CHANGELOG.md similarity index 100% rename from packages/components/react/CHANGELOG.md rename to packages/react/CHANGELOG.md diff --git a/packages/components/react/package.json b/packages/react/package.json similarity index 95% rename from packages/components/react/package.json rename to packages/react/package.json index 21c70598..b674c11e 100644 --- a/packages/components/react/package.json +++ b/packages/react/package.json @@ -1,7 +1,7 @@ { - "name": "@tutorialkit/components-react", + "name": "@tutorialkit/react", "version": "0.1.6", - "description": "TutorialKit's React components", + "description": "TutorialKit's React components and utilities", "author": "StackBlitz Inc.", "type": "module", "bugs": "https://github.com/stackblitz/tutorialkit/issues", @@ -10,7 +10,7 @@ "repository": { "type": "git", "url": "git+https://github.com/stackblitz/tutorialkit.git", - "directory": "packages/components/react" + "directory": "packages/react" }, "types": "./dist/index.d.ts", "exports": { diff --git a/packages/components/react/scripts/build.js b/packages/react/scripts/build.js similarity index 100% rename from packages/components/react/scripts/build.js rename to packages/react/scripts/build.js diff --git a/packages/components/react/src/BootScreen.tsx b/packages/react/src/BootScreen.tsx similarity index 100% rename from packages/components/react/src/BootScreen.tsx rename to packages/react/src/BootScreen.tsx diff --git a/packages/components/react/src/Nav.tsx b/packages/react/src/Nav.tsx similarity index 100% rename from packages/components/react/src/Nav.tsx rename to packages/react/src/Nav.tsx diff --git a/packages/components/react/src/Panels/EditorPanel.tsx b/packages/react/src/Panels/EditorPanel.tsx similarity index 100% rename from packages/components/react/src/Panels/EditorPanel.tsx rename to packages/react/src/Panels/EditorPanel.tsx diff --git a/packages/components/react/src/Panels/PreviewPanel.tsx b/packages/react/src/Panels/PreviewPanel.tsx similarity index 100% rename from packages/components/react/src/Panels/PreviewPanel.tsx rename to packages/react/src/Panels/PreviewPanel.tsx diff --git a/packages/components/react/src/Panels/TerminalPanel.tsx b/packages/react/src/Panels/TerminalPanel.tsx similarity index 100% rename from packages/components/react/src/Panels/TerminalPanel.tsx rename to packages/react/src/Panels/TerminalPanel.tsx diff --git a/packages/components/react/src/Panels/WorkspacePanel.tsx b/packages/react/src/Panels/WorkspacePanel.tsx similarity index 100% rename from packages/components/react/src/Panels/WorkspacePanel.tsx rename to packages/react/src/Panels/WorkspacePanel.tsx diff --git a/packages/components/react/src/core.ts b/packages/react/src/core.ts similarity index 100% rename from packages/components/react/src/core.ts rename to packages/react/src/core.ts diff --git a/packages/components/react/src/core/CodeMirrorEditor/BinaryContent.tsx b/packages/react/src/core/CodeMirrorEditor/BinaryContent.tsx similarity index 100% rename from packages/components/react/src/core/CodeMirrorEditor/BinaryContent.tsx rename to packages/react/src/core/CodeMirrorEditor/BinaryContent.tsx diff --git a/packages/components/react/src/core/CodeMirrorEditor/cm-theme.ts b/packages/react/src/core/CodeMirrorEditor/cm-theme.ts similarity index 100% rename from packages/components/react/src/core/CodeMirrorEditor/cm-theme.ts rename to packages/react/src/core/CodeMirrorEditor/cm-theme.ts diff --git a/packages/components/react/src/core/CodeMirrorEditor/indent.ts b/packages/react/src/core/CodeMirrorEditor/indent.ts similarity index 100% rename from packages/components/react/src/core/CodeMirrorEditor/indent.ts rename to packages/react/src/core/CodeMirrorEditor/indent.ts diff --git a/packages/components/react/src/core/CodeMirrorEditor/index.tsx b/packages/react/src/core/CodeMirrorEditor/index.tsx similarity index 100% rename from packages/components/react/src/core/CodeMirrorEditor/index.tsx rename to packages/react/src/core/CodeMirrorEditor/index.tsx diff --git a/packages/components/react/src/core/CodeMirrorEditor/languages.ts b/packages/react/src/core/CodeMirrorEditor/languages.ts similarity index 100% rename from packages/components/react/src/core/CodeMirrorEditor/languages.ts rename to packages/react/src/core/CodeMirrorEditor/languages.ts diff --git a/packages/components/react/src/core/CodeMirrorEditor/themes/vscode-dark.ts b/packages/react/src/core/CodeMirrorEditor/themes/vscode-dark.ts similarity index 100% rename from packages/components/react/src/core/CodeMirrorEditor/themes/vscode-dark.ts rename to packages/react/src/core/CodeMirrorEditor/themes/vscode-dark.ts diff --git a/packages/components/react/src/core/FileTree.tsx b/packages/react/src/core/FileTree.tsx similarity index 100% rename from packages/components/react/src/core/FileTree.tsx rename to packages/react/src/core/FileTree.tsx diff --git a/packages/components/react/src/core/Terminal/index.tsx b/packages/react/src/core/Terminal/index.tsx similarity index 100% rename from packages/components/react/src/core/Terminal/index.tsx rename to packages/react/src/core/Terminal/index.tsx diff --git a/packages/components/react/src/core/Terminal/theme.ts b/packages/react/src/core/Terminal/theme.ts similarity index 100% rename from packages/components/react/src/core/Terminal/theme.ts rename to packages/react/src/core/Terminal/theme.ts diff --git a/packages/components/react/src/core/types.ts b/packages/react/src/core/types.ts similarity index 100% rename from packages/components/react/src/core/types.ts rename to packages/react/src/core/types.ts diff --git a/packages/components/react/src/css.module.d.ts b/packages/react/src/css.module.d.ts similarity index 100% rename from packages/components/react/src/css.module.d.ts rename to packages/react/src/css.module.d.ts diff --git a/packages/components/react/src/hooks/useOutsideClick.ts b/packages/react/src/hooks/useOutsideClick.ts similarity index 100% rename from packages/components/react/src/hooks/useOutsideClick.ts rename to packages/react/src/hooks/useOutsideClick.ts diff --git a/packages/components/react/src/index.ts b/packages/react/src/index.ts similarity index 100% rename from packages/components/react/src/index.ts rename to packages/react/src/index.ts diff --git a/packages/components/react/src/styles/cm.css b/packages/react/src/styles/cm.css similarity index 100% rename from packages/components/react/src/styles/cm.css rename to packages/react/src/styles/cm.css diff --git a/packages/components/react/src/styles/nav.module.css b/packages/react/src/styles/nav.module.css similarity index 100% rename from packages/components/react/src/styles/nav.module.css rename to packages/react/src/styles/nav.module.css diff --git a/packages/components/react/src/styles/resize-panel.module.css b/packages/react/src/styles/resize-panel.module.css similarity index 100% rename from packages/components/react/src/styles/resize-panel.module.css rename to packages/react/src/styles/resize-panel.module.css diff --git a/packages/components/react/src/styles/terminal.css b/packages/react/src/styles/terminal.css similarity index 100% rename from packages/components/react/src/styles/terminal.css rename to packages/react/src/styles/terminal.css diff --git a/packages/components/react/src/utils/classnames.ts b/packages/react/src/utils/classnames.ts similarity index 100% rename from packages/components/react/src/utils/classnames.ts rename to packages/react/src/utils/classnames.ts diff --git a/packages/components/react/src/utils/debounce.ts b/packages/react/src/utils/debounce.ts similarity index 100% rename from packages/components/react/src/utils/debounce.ts rename to packages/react/src/utils/debounce.ts diff --git a/packages/components/react/src/utils/mobile.ts b/packages/react/src/utils/mobile.ts similarity index 100% rename from packages/components/react/src/utils/mobile.ts rename to packages/react/src/utils/mobile.ts diff --git a/packages/components/react/tsconfig.build.json b/packages/react/tsconfig.build.json similarity index 60% rename from packages/components/react/tsconfig.build.json rename to packages/react/tsconfig.build.json index 8f98bf24..a4da941c 100644 --- a/packages/components/react/tsconfig.build.json +++ b/packages/react/tsconfig.build.json @@ -8,8 +8,8 @@ "include": ["src"], "exclude": ["src/**/*.spec.ts"], "references": [ - { "path": "../../runtime/tsconfig.build.json" }, - { "path": "../../theme" }, - { "path": "../../types/tsconfig.build.json" } + { "path": "../runtime/tsconfig.build.json" }, + { "path": "../theme" }, + { "path": "../types/tsconfig.build.json" } ] } diff --git a/packages/components/react/tsconfig.json b/packages/react/tsconfig.json similarity index 55% rename from packages/components/react/tsconfig.json rename to packages/react/tsconfig.json index b1463c93..8ad9ac8b 100644 --- a/packages/components/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../tsconfig.json", "compilerOptions": { "jsx": "react-jsx", "baseUrl": "./", @@ -10,8 +10,8 @@ }, "include": ["src"], "references": [ - { "path": "../../runtime/tsconfig.build.json" }, - { "path": "../../theme" }, - { "path": "../../types/tsconfig.build.json" } + { "path": "../runtime/tsconfig.build.json" }, + { "path": "../theme" }, + { "path": "../types/tsconfig.build.json" } ] } diff --git a/packages/template/package.json b/packages/template/package.json index f1f4f592..3ad881cd 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -11,7 +11,7 @@ "start": "astro dev" }, "dependencies": { - "@tutorialkit/components-react": "workspace:*", + "@tutorialkit/react": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1" }, diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts index bc8657fa..19d06cd9 100644 --- a/packages/theme/src/index.ts +++ b/packages/theme/src/index.ts @@ -20,7 +20,7 @@ export function defineConfig(config: UserConfig) { transformers: [transformerDirectives()], content: { inline: getInlineContentForPackage({ - name: '@tutorialkit/components-react', + name: '@tutorialkit/react', pattern: '/dist/**/*.js', root: process.cwd(), }), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9bb50a9d..67ae5b5c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,7 +25,7 @@ importers: version: 5.3.0 commitlint: specifier: ^19.3.0 - version: 19.3.0(@types/node@22.4.1)(typescript@5.5.3) + version: 19.3.0(@types/node@22.4.2)(typescript@5.5.3) conventional-changelog: specifier: ^6.0.0 version: 6.0.0 @@ -50,9 +50,9 @@ importers: docs/demo: dependencies: - '@tutorialkit/components-react': + '@tutorialkit/react': specifier: workspace:* - version: link:../../packages/components/react + version: link:../../packages/react react: specifier: ^18.3.1 version: 18.3.1 @@ -77,7 +77,7 @@ importers: version: link:../../packages/types astro: specifier: ^4.12.0 - version: 4.12.2(@types/node@22.4.1)(typescript@5.5.3) + version: 4.12.2(@types/node@22.4.2)(typescript@5.5.3) prettier-plugin-astro: specifier: ^0.14.1 version: 0.14.1 @@ -87,9 +87,9 @@ importers: docs/tutorialkit.dev: dependencies: - '@tutorialkit/components-react': + '@tutorialkit/react': specifier: workspace:* - version: link:../../packages/components/react + version: link:../../packages/react '@webcontainer/api': specifier: 1.2.0 version: 1.2.0 @@ -129,7 +129,7 @@ importers: version: 18.3.0 astro: specifier: ^4.12.0 - version: 4.12.2(@types/node@22.4.1)(sass@1.77.6)(typescript@5.5.3) + version: 4.12.2(@types/node@22.4.2)(sass@1.77.6)(typescript@5.5.3) sass: specifier: ^1.77.6 version: 1.77.6 @@ -163,9 +163,9 @@ importers: '@tutorialkit/astro': specifier: workspace:* version: link:../packages/astro - '@tutorialkit/components-react': + '@tutorialkit/react': specifier: workspace:* - version: link:../packages/components/react + version: link:../packages/react '@tutorialkit/runtime': specifier: workspace:* version: link:../packages/runtime @@ -177,7 +177,7 @@ importers: version: link:../packages/types '@types/node': specifier: ^22.2.0 - version: 22.4.1 + version: 22.4.2 '@unocss/reset': specifier: ^0.59.4 version: 0.59.4 @@ -186,7 +186,7 @@ importers: version: 0.62.2 astro: specifier: ^4.12.0 - version: 4.12.2(@types/node@22.4.1)(typescript@5.5.3) + version: 4.12.2(@types/node@22.4.2)(typescript@5.5.3) fast-glob: specifier: ^3.3.2 version: 3.3.2 @@ -271,7 +271,7 @@ importers: version: 3.1.0 vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@22.4.1) + version: 1.6.0(@types/node@22.4.2) packages/astro: dependencies: @@ -293,9 +293,9 @@ importers: '@stackblitz/sdk': specifier: ^1.11.0 version: 1.11.0 - '@tutorialkit/components-react': + '@tutorialkit/react': specifier: workspace:* - version: link:../components/react + version: link:../react '@tutorialkit/runtime': specifier: workspace:* version: link:../runtime @@ -310,13 +310,13 @@ importers: version: 18.3.3 '@unocss/reset': specifier: ^0.62.2 - version: 0.62.2 + version: 0.62.3 '@webcontainer/api': specifier: 1.2.0 version: 1.2.0 astro: specifier: ^4.12.0 - version: 4.12.2(@types/node@22.4.1)(typescript@5.5.3) + version: 4.12.2(@types/node@22.4.2)(typescript@5.5.3) astro-expressive-code: specifier: ^0.35.3 version: 0.35.3(astro@4.12.2) @@ -386,7 +386,7 @@ importers: version: 0.8.4(vite@5.3.4) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@22.4.1) + version: 1.6.0(@types/node@22.4.2) packages/cli: dependencies: @@ -458,7 +458,20 @@ importers: specifier: ^1.6.0 version: 1.6.0(@types/node@20.14.11) - packages/components/react: + packages/create-tutorial: + dependencies: + '@tutorialkit/cli': + specifier: latest + version: link:../cli + devDependencies: + '@types/node': + specifier: ^20.14.6 + version: 20.14.11 + typescript: + specifier: ^5.4.5 + version: 5.5.3 + + packages/react: dependencies: '@codemirror/autocomplete': specifier: ^6.16.3 @@ -522,10 +535,10 @@ importers: version: 6.0.0(@codemirror/autocomplete@6.16.3)(@codemirror/lang-css@6.2.1)(@codemirror/lang-html@6.4.9)(@codemirror/lang-javascript@6.2.2)(@codemirror/language@6.10.2)(@codemirror/state@6.4.1)(@codemirror/view@6.28.1)(@lezer/common@1.2.1)(@lezer/highlight@1.2.0)(@lezer/javascript@1.4.17)(@lezer/lr@1.4.1) '@tutorialkit/runtime': specifier: workspace:* - version: link:../../runtime + version: link:../runtime '@tutorialkit/theme': specifier: workspace:* - version: link:../../theme + version: link:../theme '@webcontainer/api': specifier: 1.2.0 version: 1.2.0 @@ -559,7 +572,7 @@ importers: version: 6.5.6 '@tutorialkit/types': specifier: workspace:* - version: link:../../types + version: link:../types '@types/react': specifier: ^18.3.3 version: 18.3.3 @@ -574,20 +587,7 @@ importers: version: 5.5.3 vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@22.4.1) - - packages/create-tutorial: - dependencies: - '@tutorialkit/cli': - specifier: latest - version: link:../cli - devDependencies: - '@types/node': - specifier: ^20.14.6 - version: 20.14.11 - typescript: - specifier: ^5.4.5 - version: 5.5.3 + version: 1.6.0(@types/node@22.4.2) packages/runtime: dependencies: @@ -606,19 +606,19 @@ importers: version: 5.5.3 vite: specifier: ^5.3.1 - version: 5.3.4(@types/node@22.4.1)(sass@1.77.6) + version: 5.3.4(@types/node@22.4.2)(sass@1.77.6) vite-tsconfig-paths: specifier: ^4.3.2 version: 4.3.2(typescript@5.5.3)(vite@5.3.4) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@22.4.1) + version: 1.6.0(@types/node@22.4.2) packages/template: dependencies: - '@tutorialkit/components-react': + '@tutorialkit/react': specifier: workspace:* - version: link:../components/react + version: link:../react react: specifier: ^18.3.1 version: 18.3.1 @@ -667,7 +667,7 @@ importers: version: 5.5.3 vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@22.4.1) + version: 1.6.0(@types/node@22.4.2) packages/theme: dependencies: @@ -686,7 +686,7 @@ importers: devDependencies: '@types/node': specifier: ^22.4.1 - version: 22.4.1 + version: 22.4.2 typescript: specifier: ^5.4.5 version: 5.5.3 @@ -702,7 +702,7 @@ importers: version: 5.5.3 vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@22.4.1) + version: 1.6.0(@types/node@22.4.2) packages: @@ -837,7 +837,7 @@ packages: '@astrojs/markdown-remark': 5.1.0 '@mdx-js/mdx': 3.0.1 acorn: 8.12.0 - astro: 4.12.2(@types/node@22.4.1)(typescript@5.5.3) + astro: 4.12.2(@types/node@22.4.2)(typescript@5.5.3) es-module-lexer: 1.5.3 estree-util-visit: 2.0.0 github-slugger: 2.0.0 @@ -896,7 +896,7 @@ packages: '@pagefind/default-ui': 1.1.0 '@types/hast': 3.0.4 '@types/mdast': 4.0.4 - astro: 4.12.2(@types/node@22.4.1)(sass@1.77.6)(typescript@5.5.3) + astro: 4.12.2(@types/node@22.4.2)(sass@1.77.6)(typescript@5.5.3) astro-expressive-code: 0.35.3(astro@4.12.2) bcp-47: 2.1.0 hast-util-from-html: 2.0.1 @@ -1043,19 +1043,19 @@ packages: lru-cache: 5.1.1 semver: 6.3.1 - /@babel/helper-create-class-features-plugin@7.24.7(@babel/core@7.24.9): + /@babel/helper-create-class-features-plugin@7.24.7(@babel/core@7.24.7): resolution: {integrity: sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.24.7 '@babel/helper-annotate-as-pure': 7.24.7 '@babel/helper-environment-visitor': 7.24.7 '@babel/helper-function-name': 7.24.7 '@babel/helper-member-expression-to-functions': 7.24.7 '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/helper-replace-supers': 7.24.7(@babel/core@7.24.9) + '@babel/helper-replace-supers': 7.24.7(@babel/core@7.24.7) '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 '@babel/helper-split-export-declaration': 7.24.7 semver: 6.3.1 @@ -1114,21 +1114,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/helper-module-transforms@7.24.7(@babel/core@7.24.9): - resolution: {integrity: sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/core': 7.24.9 - '@babel/helper-environment-visitor': 7.24.7 - '@babel/helper-module-imports': 7.24.7 - '@babel/helper-simple-access': 7.24.7 - '@babel/helper-split-export-declaration': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 - transitivePeerDependencies: - - supports-color - /@babel/helper-module-transforms@7.24.9(@babel/core@7.24.9): resolution: {integrity: sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==} engines: {node: '>=6.9.0'} @@ -1154,13 +1139,13 @@ packages: resolution: {integrity: sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==} engines: {node: '>=6.9.0'} - /@babel/helper-replace-supers@7.24.7(@babel/core@7.24.9): + /@babel/helper-replace-supers@7.24.7(@babel/core@7.24.7): resolution: {integrity: sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.24.7 '@babel/helper-environment-visitor': 7.24.7 '@babel/helper-member-expression-to-functions': 7.24.7 '@babel/helper-optimise-call-expression': 7.24.7 @@ -1255,6 +1240,15 @@ packages: dependencies: '@babel/types': 7.24.5 + /@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.24.7): + resolution: {integrity: sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.24.7 + '@babel/helper-plugin-utils': 7.24.7 + /@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.24.9): resolution: {integrity: sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==} engines: {node: '>=6.9.0'} @@ -1264,23 +1258,23 @@ packages: '@babel/core': 7.24.9 '@babel/helper-plugin-utils': 7.24.7 - /@babel/plugin-syntax-typescript@7.24.7(@babel/core@7.24.9): + /@babel/plugin-syntax-typescript@7.24.7(@babel/core@7.24.7): resolution: {integrity: sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.24.7 '@babel/helper-plugin-utils': 7.24.7 - /@babel/plugin-transform-modules-commonjs@7.24.7(@babel/core@7.24.9): + /@babel/plugin-transform-modules-commonjs@7.24.7(@babel/core@7.24.7): resolution: {integrity: sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.9 - '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.9) + '@babel/core': 7.24.7 + '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.7) '@babel/helper-plugin-utils': 7.24.7 '@babel/helper-simple-access': 7.24.7 transitivePeerDependencies: @@ -1319,32 +1313,32 @@ packages: transitivePeerDependencies: - supports-color - /@babel/plugin-transform-typescript@7.24.7(@babel/core@7.24.9): + /@babel/plugin-transform-typescript@7.24.7(@babel/core@7.24.7): resolution: {integrity: sha512-iLD3UNkgx2n/HrjBesVbYX6j0yqn/sJktvbtKKgcaLIQ4bTTQ8obAypc1VpyHPD2y4Phh9zHOaAt8e/L14wCpw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.24.7 '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.24.9) + '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.24.7) '@babel/helper-plugin-utils': 7.24.7 - '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.24.9) + '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.24.7) transitivePeerDependencies: - supports-color - /@babel/preset-typescript@7.24.7(@babel/core@7.24.9): + /@babel/preset-typescript@7.24.7(@babel/core@7.24.7): resolution: {integrity: sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.24.7 '@babel/helper-plugin-utils': 7.24.7 - '@babel/helper-validator-option': 7.24.8 - '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.24.9) - '@babel/plugin-transform-modules-commonjs': 7.24.7(@babel/core@7.24.9) - '@babel/plugin-transform-typescript': 7.24.7(@babel/core@7.24.9) + '@babel/helper-validator-option': 7.24.7 + '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.24.7) + '@babel/plugin-transform-modules-commonjs': 7.24.7(@babel/core@7.24.7) + '@babel/plugin-transform-typescript': 7.24.7(@babel/core@7.24.7) transitivePeerDependencies: - supports-color @@ -1619,14 +1613,14 @@ packages: style-mod: 4.1.2 w3c-keyname: 2.2.8 - /@commitlint/cli@19.3.0(@types/node@22.4.1)(typescript@5.5.3): + /@commitlint/cli@19.3.0(@types/node@22.4.2)(typescript@5.5.3): resolution: {integrity: sha512-LgYWOwuDR7BSTQ9OLZ12m7F/qhNY+NpAyPBgo4YNMkACE7lGuUnuQq1yi9hz1KA4+3VqpOYl8H1rY/LYK43v7g==} engines: {node: '>=v18'} hasBin: true dependencies: '@commitlint/format': 19.3.0 '@commitlint/lint': 19.2.2 - '@commitlint/load': 19.2.0(@types/node@22.4.1)(typescript@5.5.3) + '@commitlint/load': 19.2.0(@types/node@22.4.2)(typescript@5.5.3) '@commitlint/read': 19.2.1 '@commitlint/types': 19.0.3 execa: 8.0.1 @@ -1695,7 +1689,7 @@ packages: '@commitlint/types': 19.0.3 dev: true - /@commitlint/load@19.2.0(@types/node@22.4.1)(typescript@5.5.3): + /@commitlint/load@19.2.0(@types/node@22.4.2)(typescript@5.5.3): resolution: {integrity: sha512-XvxxLJTKqZojCxaBQ7u92qQLFMMZc4+p9qrIq/9kJDy8DOrEa7P1yx7Tjdc2u2JxIalqT4KOGraVgCE7eCYJyQ==} engines: {node: '>=v18'} dependencies: @@ -1705,7 +1699,7 @@ packages: '@commitlint/types': 19.0.3 chalk: 5.3.0 cosmiconfig: 9.0.0(typescript@5.5.3) - cosmiconfig-typescript-loader: 5.0.0(@types/node@22.4.1)(cosmiconfig@9.0.0)(typescript@5.5.3) + cosmiconfig-typescript-loader: 5.0.0(@types/node@22.4.2)(cosmiconfig@9.0.0)(typescript@5.5.3) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -2569,7 +2563,6 @@ packages: /@jridgewell/sourcemap-codec@1.5.0: resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} - dev: true /@jridgewell/trace-mapping@0.3.25: resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} @@ -3219,7 +3212,7 @@ packages: /@types/conventional-commits-parser@5.0.0: resolution: {integrity: sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==} dependencies: - '@types/node': 22.4.1 + '@types/node': 22.4.2 dev: true /@types/cookie@0.6.0: @@ -3249,7 +3242,7 @@ packages: resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 22.4.1 + '@types/node': 20.14.11 dev: true /@types/gtag.js@0.0.20: @@ -3268,7 +3261,7 @@ packages: /@types/jsonfile@6.1.4: resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==} dependencies: - '@types/node': 22.4.1 + '@types/node': 22.4.2 dev: true /@types/mdast@4.0.4: @@ -3302,8 +3295,8 @@ packages: undici-types: 5.26.5 dev: true - /@types/node@22.4.1: - resolution: {integrity: sha512-1tbpb9325+gPnKK0dMm+/LMriX0vKxf6RnB0SZUqfyVkQ4fMgUSySqhxE/y8Jvs4NyF1yHzTfG9KlnkIODxPKg==} + /@types/node@22.4.2: + resolution: {integrity: sha512-nAvM3Ey230/XzxtyDcJ+VjvlzpzoHwLsF7JaDRfoI0ytO0mVheerNmM45CtA0yOILXwXXxOrcUWH3wltX+7PSw==} dependencies: undici-types: 6.19.8 @@ -3328,7 +3321,7 @@ packages: /@types/sax@1.2.7: resolution: {integrity: sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A==} dependencies: - '@types/node': 22.4.1 + '@types/node': 22.4.2 dev: true /@types/semver@7.5.8: @@ -3532,7 +3525,7 @@ packages: '@unocss/core': 0.59.4 '@unocss/reset': 0.59.4 '@unocss/vite': 0.59.4(vite@5.3.4) - vite: 5.3.4(@types/node@22.4.1)(sass@1.77.6) + vite: 5.3.4(@types/node@22.4.2)(sass@1.77.6) transitivePeerDependencies: - rollup @@ -3654,8 +3647,8 @@ packages: /@unocss/reset@0.59.4: resolution: {integrity: sha512-Upy4xzdWl4RChbLAXBq1BoR4WqxXMoIfjvtcwSZcZK2sylXCFAseSWnyzJFdSiXPqNfmMuNgPXgiSxiQB+cmNA==} - /@unocss/reset@0.62.2: - resolution: {integrity: sha512-5hgxcBMMbw5tMSSd4kUX70H0pZK9SwRHtm8Q4VvDV6xOZJa2/fvFR4qyxbuAM9nhOwYUqAAX23lxfmY0bXX73A==} + /@unocss/reset@0.62.3: + resolution: {integrity: sha512-XVKPkbm8y9SGzRaG3x+HygGZURm50MvKLVHXsbxi67RbIir9Ouyt9hQTV6Xs3RicRZFWOpJx3wMRb8iKUOe5Zw==} dev: false /@unocss/rule-utils@0.59.4: @@ -3663,7 +3656,7 @@ packages: engines: {node: '>=14'} dependencies: '@unocss/core': 0.59.4 - magic-string: 0.30.10 + magic-string: 0.30.11 /@unocss/rule-utils@0.62.2: resolution: {integrity: sha512-0za00pkDHsGZhiXBiZfOuUyT+GjCInPxMXj+QsybRU4UrjJS+d3gAteC34BqNFfDAoKQb9G5q9etXztcNHXQbg==} @@ -3679,9 +3672,9 @@ packages: /@unocss/transformer-attributify-jsx-babel@0.59.4: resolution: {integrity: sha512-xtCRSgeTaDBiNJLVX7oOSFe63JiFB5nrdK23PHn3IlZM9O7Bxx4ZxI3MQJtFZFQNE+INFko+DVyY1WiFEm1p/Q==} dependencies: - '@babel/core': 7.24.9 - '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.24.9) - '@babel/preset-typescript': 7.24.7(@babel/core@7.24.9) + '@babel/core': 7.24.7 + '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.24.7) + '@babel/preset-typescript': 7.24.7(@babel/core@7.24.7) '@unocss/core': 0.59.4 transitivePeerDependencies: - supports-color @@ -3730,8 +3723,8 @@ packages: '@unocss/transformer-directives': 0.59.4 chokidar: 3.6.0 fast-glob: 3.3.2 - magic-string: 0.30.10 - vite: 5.3.4(@types/node@22.4.1)(sass@1.77.6) + magic-string: 0.30.11 + vite: 5.3.4(@types/node@22.4.2)(sass@1.77.6) transitivePeerDependencies: - rollup @@ -3746,7 +3739,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.24.7(@babel/core@7.24.7) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.3.4(@types/node@22.4.1) + vite: 5.3.4(@types/node@22.4.2) transitivePeerDependencies: - supports-color @@ -4097,7 +4090,7 @@ packages: peerDependencies: astro: ^4.0.0-beta || ^3.3.0 dependencies: - astro: 4.12.2(@types/node@22.4.1)(typescript@5.5.3) + astro: 4.12.2(@types/node@22.4.2)(typescript@5.5.3) rehype-expressive-code: 0.35.3 /astro@4.12.2(@types/node@20.14.11)(typescript@5.5.3): @@ -4145,7 +4138,7 @@ packages: http-cache-semantics: 4.1.1 js-yaml: 4.1.0 kleur: 4.1.5 - magic-string: 0.30.11 + magic-string: 0.30.10 mrmime: 2.0.0 ora: 8.0.1 p-limit: 6.1.0 @@ -4181,7 +4174,7 @@ packages: - typescript dev: true - /astro@4.12.2(@types/node@22.4.1)(sass@1.77.6)(typescript@5.5.3): + /astro@4.12.2(@types/node@22.4.2)(sass@1.77.6)(typescript@5.5.3): resolution: {integrity: sha512-l6OmqlL+FiuSi9x6F+EGZitteOznq1JffOil7st7cdqeMCTEIym4oagI1a6zp6QekliKWEEZWdplGhgh1k1f7Q==} engines: {node: ^18.17.1 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} hasBin: true @@ -4226,7 +4219,7 @@ packages: http-cache-semantics: 4.1.1 js-yaml: 4.1.0 kleur: 4.1.5 - magic-string: 0.30.11 + magic-string: 0.30.10 mrmime: 2.0.0 ora: 8.0.1 p-limit: 6.1.0 @@ -4242,7 +4235,7 @@ packages: tsconfck: 3.1.1(typescript@5.5.3) unist-util-visit: 5.0.0 vfile: 6.0.2 - vite: 5.3.4(@types/node@22.4.1)(sass@1.77.6) + vite: 5.3.4(@types/node@22.4.2)(sass@1.77.6) vitefu: 0.2.5(vite@5.3.4) which-pm: 3.0.0 yargs-parser: 21.1.1 @@ -4262,7 +4255,7 @@ packages: - typescript dev: true - /astro@4.12.2(@types/node@22.4.1)(typescript@5.5.3): + /astro@4.12.2(@types/node@22.4.2)(typescript@5.5.3): resolution: {integrity: sha512-l6OmqlL+FiuSi9x6F+EGZitteOznq1JffOil7st7cdqeMCTEIym4oagI1a6zp6QekliKWEEZWdplGhgh1k1f7Q==} engines: {node: ^18.17.1 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} hasBin: true @@ -4323,7 +4316,7 @@ packages: tsconfck: 3.1.1(typescript@5.5.3) unist-util-visit: 5.0.0 vfile: 6.0.2 - vite: 5.3.4(@types/node@22.4.1) + vite: 5.3.4(@types/node@22.4.2) vitefu: 0.2.5(vite@5.3.4) which-pm: 3.0.0 yargs-parser: 21.1.1 @@ -4679,12 +4672,12 @@ packages: /comma-separated-tokens@2.0.3: resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==} - /commitlint@19.3.0(@types/node@22.4.1)(typescript@5.5.3): + /commitlint@19.3.0(@types/node@22.4.2)(typescript@5.5.3): resolution: {integrity: sha512-B8eUVQCjz+1ZAjR3LC3+vzKg7c4/qN4QhSxkjp0u0v7Pi79t9CsnGAluvveKmFh56e885zgToPL5ax+l8BHTPg==} engines: {node: '>=v18'} hasBin: true dependencies: - '@commitlint/cli': 19.3.0(@types/node@22.4.1)(typescript@5.5.3) + '@commitlint/cli': 19.3.0(@types/node@22.4.2)(typescript@5.5.3) '@commitlint/types': 19.0.3 transitivePeerDependencies: - '@types/node' @@ -4867,7 +4860,7 @@ packages: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} engines: {node: '>= 0.6'} - /cosmiconfig-typescript-loader@5.0.0(@types/node@22.4.1)(cosmiconfig@9.0.0)(typescript@5.5.3): + /cosmiconfig-typescript-loader@5.0.0(@types/node@22.4.2)(cosmiconfig@9.0.0)(typescript@5.5.3): resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==} engines: {node: '>=v16'} peerDependencies: @@ -4875,7 +4868,7 @@ packages: cosmiconfig: '>=8.2' typescript: '>=4' dependencies: - '@types/node': 22.4.1 + '@types/node': 22.4.2 cosmiconfig: 9.0.0(typescript@5.5.3) jiti: 1.21.6 typescript: 5.5.3 @@ -6501,7 +6494,6 @@ packages: resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} dependencies: '@jridgewell/sourcemap-codec': 1.5.0 - dev: true /markdown-extensions@2.0.0: resolution: {integrity: sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==} @@ -8187,7 +8179,7 @@ packages: astro: '>=4.0.0' dependencies: '@astrojs/starlight': 0.23.4(astro@4.12.2) - astro: 4.12.2(@types/node@22.4.1)(sass@1.77.6)(typescript@5.5.3) + astro: 4.12.2(@types/node@22.4.2)(sass@1.77.6)(typescript@5.5.3) github-slugger: 2.0.0 hast-util-from-html: 2.0.1 hast-util-has-property: 3.0.0 @@ -8756,7 +8748,7 @@ packages: '@unocss/transformer-directives': 0.59.4 '@unocss/transformer-variant-group': 0.59.4 '@unocss/vite': 0.59.4(vite@5.3.4) - vite: 5.3.4(@types/node@22.4.1)(sass@1.77.6) + vite: 5.3.4(@types/node@22.4.2)(sass@1.77.6) transitivePeerDependencies: - postcss - rollup @@ -8848,7 +8840,7 @@ packages: - terser dev: true - /vite-node@1.6.0(@types/node@22.4.1): + /vite-node@1.6.0(@types/node@22.4.2): resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -8857,7 +8849,7 @@ packages: debug: 4.3.5 pathe: 1.1.2 picocolors: 1.0.1 - vite: 5.3.4(@types/node@22.4.1) + vite: 5.3.4(@types/node@22.4.2) transitivePeerDependencies: - '@types/node' - less @@ -8887,7 +8879,7 @@ packages: perfect-debounce: 1.0.0 picocolors: 1.0.1 sirv: 2.0.4 - vite: 5.3.4(@types/node@22.4.1) + vite: 5.3.4(@types/node@22.4.2) transitivePeerDependencies: - rollup - supports-color @@ -8904,7 +8896,7 @@ packages: debug: 4.3.5 globrex: 0.1.2 tsconfck: 3.1.0(typescript@5.5.3) - vite: 5.3.4(@types/node@22.4.1) + vite: 5.3.4(@types/node@22.4.2) transitivePeerDependencies: - supports-color - typescript @@ -8946,7 +8938,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.3.4(@types/node@22.4.1): + /vite@5.3.4(@types/node@22.4.2): resolution: {integrity: sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -8974,14 +8966,14 @@ packages: terser: optional: true dependencies: - '@types/node': 22.4.1 + '@types/node': 22.4.2 esbuild: 0.21.5 postcss: 8.4.39 rollup: 4.18.1 optionalDependencies: fsevents: 2.3.3 - /vite@5.3.4(@types/node@22.4.1)(sass@1.77.6): + /vite@5.3.4(@types/node@22.4.2)(sass@1.77.6): resolution: {integrity: sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -9009,7 +9001,7 @@ packages: terser: optional: true dependencies: - '@types/node': 22.4.1 + '@types/node': 22.4.2 esbuild: 0.21.5 postcss: 8.4.39 rollup: 4.18.1 @@ -9025,7 +9017,7 @@ packages: vite: optional: true dependencies: - vite: 5.3.4(@types/node@22.4.1) + vite: 5.3.4(@types/node@22.4.2) /vitest@1.6.0(@types/node@20.14.11): resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==} @@ -9063,7 +9055,7 @@ packages: debug: 4.3.5 execa: 8.0.1 local-pkg: 0.5.0 - magic-string: 0.30.10 + magic-string: 0.30.11 pathe: 1.1.2 picocolors: 1.0.1 std-env: 3.7.0 @@ -9083,7 +9075,7 @@ packages: - terser dev: true - /vitest@1.6.0(@types/node@22.4.1): + /vitest@1.6.0(@types/node@22.4.2): resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -9108,7 +9100,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 22.4.1 + '@types/node': 22.4.2 '@vitest/expect': 1.6.0 '@vitest/runner': 1.6.0 '@vitest/snapshot': 1.6.0 @@ -9126,8 +9118,8 @@ packages: strip-literal: 2.1.0 tinybench: 2.8.0 tinypool: 0.8.4 - vite: 5.3.4(@types/node@22.4.1) - vite-node: 1.6.0(@types/node@22.4.1) + vite: 5.3.4(@types/node@22.4.2) + vite-node: 1.6.0(@types/node@22.4.2) why-is-node-running: 2.2.2 transitivePeerDependencies: - less diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 120900a4..1aaac70f 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,6 +1,5 @@ packages: - 'packages/*' - - 'packages/components/*' - 'docs/*' - 'extensions/*' - 'integration' diff --git a/scripts/changelog.mjs b/scripts/changelog.mjs index c78df707..1011329a 100755 --- a/scripts/changelog.mjs +++ b/scripts/changelog.mjs @@ -11,7 +11,7 @@ const PRESET = 'angular'; const PACKAGES = [ { path: './packages/astro' }, { path: './packages/cli' }, - { path: './packages/components/react' }, + { path: './packages/react' }, { path: './packages/runtime' }, { path: './packages/theme' }, { path: './packages/types' },