Visualize Your Ideas With Code
feat: display current package versions (#501)
Jacob2972f673e201
diff --git a/packages/core/src/app/Project.ts b/packages/core/src/app/Project.tsindex 9ff78965..990595c2 100644--- a/packages/core/src/app/Project.ts+++ b/packages/core/src/app/Project.ts@@ -19,6 +19,12 @@ export interface Project {audio?: string;audioOffset?: number;variables?: Record<string, unknown>;+ versions: {+ core: string;+ two: string | null;+ ui: string | null;+ vitePlugin: string | null;+ };}export function makeProject(settings: ProjectSettings) {diff --git a/packages/ui/src/Editor.module.scss b/packages/ui/src/Editor.module.scssnew file mode 100644index 00000000..f6cd6ffe--- /dev/null+++ b/packages/ui/src/Editor.module.scss@@ -0,0 +1,6 @@+.root {+ display: flex;+ flex-direction: column;+ width: 100%;+ height: 100%;+}diff --git a/packages/ui/src/Editor.tsx b/packages/ui/src/Editor.tsxindex 59ba45da..65e64d64 100644--- a/packages/ui/src/Editor.tsx+++ b/packages/ui/src/Editor.tsx@@ -7,31 +7,30 @@ import {useState} from 'preact/hooks';import {usePresenterState} from './hooks';import {PresenterState} from '@motion-canvas/core';import {PresentationMode} from './components/presentation';+import styles from './Editor.module.scss';export function Editor() {const state = usePresenterState();const [sidebarOpen, setSidebarOpen] = useState(false);return state === PresenterState.Initial ? (- <ResizeableLayout- id={'main-timeline'}- size={0.7}- vertical- start={- <ResizeableLayout- resizeable={sidebarOpen}- id={'sidebar-vieport'}- start={<Sidebar setOpen={setSidebarOpen} />}- end={<Viewport />}- />- }- end={- <>- <Timeline />- <Footer />- </>- }- />+ <div className={styles.root}>+ <ResizeableLayout+ id={'main-timeline'}+ size={0.7}+ vertical+ start={+ <ResizeableLayout+ resizeable={sidebarOpen}+ id={'sidebar-vieport'}+ start={<Sidebar setOpen={setSidebarOpen} />}+ end={<Viewport />}+ />+ }+ end={<Timeline />}+ />+ <Footer />+ </div>) : (<PresentationMode />);diff --git a/packages/ui/src/components/footer/Footer.module.scss b/packages/ui/src/components/footer/Footer.module.scssindex b3cd0cc2..e8bc6ef0 100644--- a/packages/ui/src/components/footer/Footer.module.scss+++ b/packages/ui/src/components/footer/Footer.module.scss@@ -1,14 +1,23 @@.root {display: flex;- position: fixed;- bottom: 0;+ flex-grow: 0;+ flex-shrink: 0;+ justify-content: space-between;width: 100%;- height: 1.5rem;- padding: 1px 4px;- overflow-x: hidden;+ height: 24px;+ padding: 4px;+ gap: 4px;+}++.shortcuts {+ flex-grow: 1;+ display: flex;+ overflow: hidden;}.shortcut {+ display: flex;+&:not(:last-child) {border-right: 2px solid var(--surface-color);padding-right: 8px;@@ -24,5 +33,7 @@}.action {font-size: 12px;+ line-height: 16px;+ white-space: nowrap;}}diff --git a/packages/ui/src/components/footer/Footer.tsx b/packages/ui/src/components/footer/Footer.tsxindex c41ecb33..bb7cc021 100644--- a/packages/ui/src/components/footer/Footer.tsx+++ b/packages/ui/src/components/footer/Footer.tsx@@ -1,16 +1,20 @@import {useShortcuts} from '../../contexts/shortcuts';+import {Versions} from './Versions';import styles from './Footer.module.scss';export function Footer() {const {shortcuts, currentModule} = useShortcuts();return (<div className={styles.root}>- {shortcuts[currentModule].map(({key, action}) => (- <div className={styles.shortcut}>- <span className={styles.key}>{key}</span>- <span className={styles.action}>{action}</span>- </div>- ))}+ <div className={styles.shortcuts}>+ {shortcuts[currentModule].map(({key, action}) => (+ <div className={styles.shortcut}>+ <span className={styles.key}>{key}</span>+ <span className={styles.action}>{action}</span>+ </div>+ ))}+ </div>+ <Versions /></div>);}diff --git a/packages/ui/src/components/footer/Versions.module.scss b/packages/ui/src/components/footer/Versions.module.scssnew file mode 100644index 00000000..d02cc736--- /dev/null+++ b/packages/ui/src/components/footer/Versions.module.scss@@ -0,0 +1,26 @@+.root {+ padding: 0 4px;+ position: relative;+ display: flex;+ gap: 8px;+}++.link {+ font-size: 12px;+ line-height: 16px;+ cursor: pointer;+ text-decoration: none;+ white-space: nowrap;++ &:hover {+ text-decoration: underline;+ }++ &.main {+ color: var(--theme);+ }+}++.input {+ display: none;+}diff --git a/packages/ui/src/components/footer/Versions.tsx b/packages/ui/src/components/footer/Versions.tsxnew file mode 100644index 00000000..8735ad90--- /dev/null+++ b/packages/ui/src/components/footer/Versions.tsx@@ -0,0 +1,50 @@+import styles from './Versions.module.scss';+import {useApplication} from '../../contexts';+import clsx from 'clsx';+import {useEffect} from 'preact/hooks';+import {useState} from 'react';++export function Versions() {+ const {project} = useApplication();+ const [newVersion, setNewVersion] = useState(project.versions.core);+ const isOld = project.versions.core.localeCompare(newVersion) < 0;++ useEffect(() => {+ const abort = new AbortController();+ fetch('https://registry.npmjs.org/@motion-canvas/core/latest', {+ signal: abort.signal,+ })+ .then(response => response.json())+ .then(response => setNewVersion(response.version));+ return () => abort.abort();+ }, []);++ return (+ <div className={styles.root}>+ {isOld && (+ <a+ href={`https://motioncanvas.io/blog/version-${'3.1.0'}`}+ target="_blank"+ title="See what's new"+ className={clsx(styles.link, styles.main)}+ >+ UPDATE AVAILABLE+ </a>+ )}+ <div+ title="Copy version information"+ className={styles.link}+ onClick={() => {+ const versions = Object.entries(project.versions)+ .filter(([, version]) => !!version)+ .map(([name, version]) => `- ${name}: ${version}`)+ .join('\n');++ navigator.clipboard.writeText(versions);+ }}+ >+ {project.versions.core}+ </div>+ </div>+ );+}diff --git a/packages/ui/src/components/layout/ResizeableLayout.module.scss b/packages/ui/src/components/layout/ResizeableLayout.module.scssindex b5c551fb..b5e8d06d 100644--- a/packages/ui/src/components/layout/ResizeableLayout.module.scss+++ b/packages/ui/src/components/layout/ResizeableLayout.module.scss@@ -2,6 +2,7 @@display: flex;width: 100%;height: 100%;+ overflow: hidden;justify-content: stretch;&.vertical {diff --git a/packages/ui/src/components/layout/ResizeableLayout.tsx b/packages/ui/src/components/layout/ResizeableLayout.tsxindex b7ece79c..ed2be558 100644--- a/packages/ui/src/components/layout/ResizeableLayout.tsx+++ b/packages/ui/src/components/layout/ResizeableLayout.tsx@@ -4,6 +4,7 @@ import {ComponentChild, JSX} from 'preact';import {useCallback, useMemo, useRef} from 'preact/hooks';import {useDrag, useStorage} from '../../hooks';import clsx from 'clsx';+import {clamp} from '../../utils';interface ResizeableLayoutProps {start: ComponentChild;@@ -29,9 +30,10 @@ export function ResizeableLayout({useCallback((_dx, _dy, x, y) => {const rect = containerRef.current.getBoundingClientRect();- setSize(- vertical ? (y - rect.y) / rect.height : (x - rect.x) / rect.width,- );+ const newSize = vertical+ ? (y - rect.y) / rect.height+ : (x - rect.x) / rect.width;+ setSize(clamp(0, 1, newSize));},[vertical, setSize],),diff --git a/packages/ui/src/components/timeline/Timeline.module.scss b/packages/ui/src/components/timeline/Timeline.module.scssindex 31de7f08..9d4fbfeb 100644--- a/packages/ui/src/components/timeline/Timeline.module.scss+++ b/packages/ui/src/components/timeline/Timeline.module.scss@@ -3,12 +3,12 @@width: 100%;height: 100%;padding-top: 1px;- padding-bottom: 1.5rem;opacity: 0;transition: opacity 0.2s;display: flex;align-items: stretch;position: relative;+ --scrollbar-background: var(--background-color);&.show {opacity: 1;diff --git a/packages/ui/src/components/timeline/Timeline.tsx b/packages/ui/src/components/timeline/Timeline.tsxindex a3d8886f..2fd60a38 100644--- a/packages/ui/src/components/timeline/Timeline.tsx+++ b/packages/ui/src/components/timeline/Timeline.tsx@@ -14,7 +14,7 @@ import {Timestamps} from './Timestamps';import {LabelTrack} from './LabelTrack';import {SceneTrack} from './SceneTrack';import {RangeSelector} from './RangeSelector';-import {clamp} from '@motion-canvas/core/lib/tweening';+import {clamp} from '../../utils';import {AudioTrack} from './AudioTrack';import {useApplication,diff --git a/packages/ui/src/utils/clamp.ts b/packages/ui/src/utils/clamp.tsnew file mode 100644index 00000000..f1922096--- /dev/null+++ b/packages/ui/src/utils/clamp.ts@@ -0,0 +1,3 @@+export function clamp(min: number, max: number, value: number) {+ return value < min ? min : value > max ? max : value;+}diff --git a/packages/ui/src/utils/index.ts b/packages/ui/src/utils/index.tsindex 0646a189..0f647618 100644--- a/packages/ui/src/utils/index.ts+++ b/packages/ui/src/utils/index.ts@@ -1,3 +1,4 @@+export * from './clamp';export * from './localStorage';export * from './sourceMaps';export * from './withLoader';diff --git a/packages/vite-plugin/src/main.ts b/packages/vite-plugin/src/main.tsindex abb45b55..839214a4 100644--- a/packages/vite-plugin/src/main.ts+++ b/packages/vite-plugin/src/main.ts@@ -8,6 +8,7 @@ import {MotionCanvasCorsProxyOptions,setupEnvVarsForProxy,} from './proxy-middleware';+import {getVersions} from './versions';export interface MotionCanvasPluginConfig {/**@@ -102,6 +103,7 @@ export default ({.replace('{{style}}', `/@fs/${path.resolve(editorPath, 'style.css')}`).split('{{source}}');const createHtml = (src: string) => htmlParts[0] + src + htmlParts[1];+ const versions = JSON.stringify(getVersions());const resolvedEditorId = '\0virtual:editor';@@ -210,6 +212,7 @@ export default ({`metaFile.attach(config.meta)`,`export default {`,` name: '${name}',`,+ ` versions: ${versions},`,` ...config,`,`};`,);diff --git a/packages/vite-plugin/src/versions.ts b/packages/vite-plugin/src/versions.tsnew file mode 100644index 00000000..9e0dd6b4--- /dev/null+++ b/packages/vite-plugin/src/versions.ts@@ -0,0 +1,22 @@+import path from 'path';+import fs from 'fs';++export function getVersions() {+ return {+ core: loadVersion('@motion-canvas/core'),+ two: loadVersion('@motion-canvas/2d'),+ ui: loadVersion('@motion-canvas/ui'),+ vitePlugin: loadVersion('..'),+ };+}++function loadVersion(module: string): string | null {+ try {+ const modulePath = path.dirname(require.resolve(`${module}/package.json`));+ const packageJsonPath = path.resolve(modulePath, 'package.json');+ const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());+ return packageJson.version ?? null;+ } catch (_) {+ return null;+ }+}