Skip to content

Visualize Your Ideas With Code

revert: feat: upgrade code-fns for new theme options and lazy loading (#435)

Jacob3f5e43968f7a
diff --git a/package-lock.json b/package-lock.json
index 5b6fa9ae..e90c0e57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6308,6 +6308,26 @@
"@xtuc/long": "4.2.2"
}
},
+ "node_modules/@wooorm/starry-night": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@wooorm/starry-night/-/starry-night-1.5.0.tgz",
+ "integrity": "sha512-YEkNgM8IxKwzRQgTp1nyiraB5rc4LiLpnMTrJvX5+SVs7zgVqkTx6QAZgZFqrZrqq/UCWVYBzE9+zZfxpLPTYQ==",
+ "dependencies": {
+ "@types/hast": "^2.0.0",
+ "import-meta-resolve": "^2.0.0",
+ "vscode-oniguruma": "^1.0.0",
+ "vscode-textmate": "^7.0.0"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
+ "node_modules/@wooorm/starry-night/node_modules/vscode-textmate": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-7.0.4.tgz",
+ "integrity": "sha512-9hJp0xL7HW1Q5OgGe03NACo7yiCTMEk3WU/rtKXUbncLtdg6rVVNJnHwD88UhbIYU2KoxY0Dih0x+kIsmUKn2A=="
+ },
"node_modules/@xtuc/ieee754": {
"version": "1.2.0",
"license": "BSD-3-Clause"
@@ -6551,11 +6571,6 @@
"node": ">=8"
}
},
- "node_modules/ansi-sequence-parser": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/ansi-sequence-parser/-/ansi-sequence-parser-1.1.0.tgz",
- "integrity": "sha512-lEm8mt52to2fT8GhciPCGeCXACSz2UwIN4X2e2LJSnZ5uAbn2/dsYdOmUXq0AtWS5cpAupysIneExOgH0Vd2TQ=="
- },
"node_modules/ansi-styles": {
"version": "4.3.0",
"license": "MIT",
@@ -8025,35 +8040,6 @@
"node": ">= 0.12.0"
}
},
- "node_modules/code-fns": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/code-fns/-/code-fns-0.9.0.tgz",
- "integrity": "sha512-UZl4Oujhmz5n3BLjTMdjjp3wz43V+d/qfEqQhEkvfNNmt5jwcBJbqMnilc08quyNIUioLvTsR08BzEpQpKTIHQ==",
- "dependencies": {
- "shiki": "^0.14.1"
- }
- },
- "node_modules/code-fns/node_modules/jsonc-parser": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
- "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
- },
- "node_modules/code-fns/node_modules/shiki": {
- "version": "0.14.1",
- "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.1.tgz",
- "integrity": "sha512-+Jz4nBkCBe0mEDqo1eKRcCdjRtrCjozmcbTUjbPTX7OOJfEbTZzlUWlZtGe3Gb5oV1/jnojhG//YZc3rs9zSEw==",
- "dependencies": {
- "ansi-sequence-parser": "^1.1.0",
- "jsonc-parser": "^3.2.0",
- "vscode-oniguruma": "^1.7.0",
- "vscode-textmate": "^8.0.0"
- }
- },
- "node_modules/code-fns/node_modules/vscode-textmate": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-8.0.0.tgz",
- "integrity": "sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg=="
- },
"node_modules/collapse-white-space": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
@@ -12416,6 +12402,15 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/import-meta-resolve": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-2.2.1.tgz",
+ "integrity": "sha512-C6lLL7EJPY44kBvA80gq4uMsVFw5x3oSKfuMl1cuZ2RkI5+UJqQXgn+6hlUew0y4ig7Ypt4CObAAIzU53Nfpuw==",
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
"node_modules/imurmurhash": {
"version": "0.1.4",
"license": "MIT",
@@ -21543,13 +21538,21 @@
"license": "MIT",
"dependencies": {
"@motion-canvas/core": "^2.6.0",
- "code-fns": "^0.9.0",
+ "code-fns": "^0.8.2",
"mathjax-full": "^3.2.2"
},
"devDependencies": {
"@motion-canvas/internal": "0.0.0"
}
},
+ "packages/2d/node_modules/code-fns": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/code-fns/-/code-fns-0.8.2.tgz",
+ "integrity": "sha512-3VVeq3cnWxWiWKFLsVo+XWsOXBSW2gAx2uv0ViETLNmNuygEPHlCeDAv/Zy7xXqPgXtgLZyvIJZmx+ojTgOIGA==",
+ "dependencies": {
+ "@wooorm/starry-night": "^1.2.0"
+ }
+ },
"packages/core": {
"name": "@motion-canvas/core",
"version": "2.6.0",
@@ -24929,8 +24932,18 @@
"requires": {
"@motion-canvas/core": "^2.6.0",
"@motion-canvas/internal": "0.0.0",
- "code-fns": "^0.9.0",
+ "code-fns": "0.8.2",
"mathjax-full": "^3.2.2"
+ },
+ "dependencies": {
+ "code-fns": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/code-fns/-/code-fns-0.8.2.tgz",
+ "integrity": "sha512-3VVeq3cnWxWiWKFLsVo+XWsOXBSW2gAx2uv0ViETLNmNuygEPHlCeDAv/Zy7xXqPgXtgLZyvIJZmx+ojTgOIGA==",
+ "requires": {
+ "@wooorm/starry-night": "^1.2.0"
+ }
+ }
}
},
"@motion-canvas/core": {
@@ -25028,7 +25041,7 @@
"@preact/preset-vite": "^2.5.0",
"clsx": "^1.2.1",
"highlight.js": "^11.7.0",
- "preact": "^10.7.3",
+ "preact": "^10.13.0",
"sass": "^1.58.0",
"source-map-js": "^1.0.2"
}
@@ -26120,6 +26133,24 @@
"@xtuc/long": "4.2.2"
}
},
+ "@wooorm/starry-night": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@wooorm/starry-night/-/starry-night-1.5.0.tgz",
+ "integrity": "sha512-YEkNgM8IxKwzRQgTp1nyiraB5rc4LiLpnMTrJvX5+SVs7zgVqkTx6QAZgZFqrZrqq/UCWVYBzE9+zZfxpLPTYQ==",
+ "requires": {
+ "@types/hast": "^2.0.0",
+ "import-meta-resolve": "^2.0.0",
+ "vscode-oniguruma": "^1.0.0",
+ "vscode-textmate": "^7.0.0"
+ },
+ "dependencies": {
+ "vscode-textmate": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-7.0.4.tgz",
+ "integrity": "sha512-9hJp0xL7HW1Q5OgGe03NACo7yiCTMEk3WU/rtKXUbncLtdg6rVVNJnHwD88UhbIYU2KoxY0Dih0x+kIsmUKn2A=="
+ }
+ }
+ },
"@xtuc/ieee754": {
"version": "1.2.0"
},
@@ -26272,11 +26303,6 @@
"ansi-regex": {
"version": "5.0.1"
},
- "ansi-sequence-parser": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/ansi-sequence-parser/-/ansi-sequence-parser-1.1.0.tgz",
- "integrity": "sha512-lEm8mt52to2fT8GhciPCGeCXACSz2UwIN4X2e2LJSnZ5uAbn2/dsYdOmUXq0AtWS5cpAupysIneExOgH0Vd2TQ=="
- },
"ansi-styles": {
"version": "4.3.0",
"requires": {
@@ -27177,37 +27203,6 @@
"version": "4.6.0",
"peer": true
},
- "code-fns": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/code-fns/-/code-fns-0.9.0.tgz",
- "integrity": "sha512-UZl4Oujhmz5n3BLjTMdjjp3wz43V+d/qfEqQhEkvfNNmt5jwcBJbqMnilc08quyNIUioLvTsR08BzEpQpKTIHQ==",
- "requires": {
- "shiki": "^0.14.1"
- },
- "dependencies": {
- "jsonc-parser": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
- "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
- },
- "shiki": {
- "version": "0.14.1",
- "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.1.tgz",
- "integrity": "sha512-+Jz4nBkCBe0mEDqo1eKRcCdjRtrCjozmcbTUjbPTX7OOJfEbTZzlUWlZtGe3Gb5oV1/jnojhG//YZc3rs9zSEw==",
- "requires": {
- "ansi-sequence-parser": "^1.1.0",
- "jsonc-parser": "^3.2.0",
- "vscode-oniguruma": "^1.7.0",
- "vscode-textmate": "^8.0.0"
- }
- },
- "vscode-textmate": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-8.0.0.tgz",
- "integrity": "sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg=="
- }
- }
- },
"collapse-white-space": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
@@ -29900,6 +29895,11 @@
"resolve-cwd": "^3.0.0"
}
},
+ "import-meta-resolve": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-2.2.1.tgz",
+ "integrity": "sha512-C6lLL7EJPY44kBvA80gq4uMsVFw5x3oSKfuMl1cuZ2RkI5+UJqQXgn+6hlUew0y4ig7Ypt4CObAAIzU53Nfpuw=="
+ },
"imurmurhash": {
"version": "0.1.4"
},
diff --git a/packages/2d/package.json b/packages/2d/package.json
index 34ced4c1..f1b04f91 100644
--- a/packages/2d/package.json
+++ b/packages/2d/package.json
@@ -27,7 +27,7 @@
},
"dependencies": {
"@motion-canvas/core": "^2.6.0",
- "code-fns": "^0.9.0",
+ "code-fns": "^0.8.2",
"mathjax-full": "^3.2.2"
}
}
diff --git a/packages/2d/src/components/CodeBlock.ts b/packages/2d/src/components/CodeBlock.ts
index 1134f829..a4d1d26b 100644
--- a/packages/2d/src/components/CodeBlock.ts
+++ b/packages/2d/src/components/CodeBlock.ts
@@ -9,8 +9,6 @@ import {
MorphToken,
Token,
CodeStyle,
- Theme,
- Lang,
} from 'code-fns';
import {
clampRemap,
@@ -23,8 +21,8 @@ import {threadable} from '@motion-canvas/core/lib/decorators';
import {DesiredLength} from '../partials';
import {SerializedVector2, Vector2} from '@motion-canvas/core/lib/types';
import {
+ createComputedAsync,
createSignal,
- DependencyContext,
Signal,
SignalValue,
SimpleSignal,
@@ -36,12 +34,11 @@ type CodePoint = [number, number];
type CodeRange = [CodePoint, CodePoint];
export interface CodeProps extends ShapeProps {
- language?: Lang;
+ language?: string;
children?: CodeTree | string;
code?: SignalValue<CodeTree | string>;
selection?: CodeRange[];
theme?: CodeStyle;
- stockTheme?: Theme;
}
export interface CodeModification {
@@ -50,45 +47,14 @@ export interface CodeModification {
}
export class CodeBlock extends Shape {
- @initial('tsx')
- @signal()
- public declare readonly language: SimpleSignal<Lang, this>;
+ private static initialized = createComputedAsync(
+ () => ready().then(() => true),
+ false,
+ );
- @initial(null)
+ @initial('tsx')
@signal()
- public declare readonly stockTheme: SimpleSignal<Theme | undefined, this>;
-
- protected static loadedLanguages = new Map<Lang, boolean>();
- protected static loadedThemes = new Map<Theme, boolean>();
-
- @computed()
- protected isReady() {
- const language = this.language();
- if (!CodeBlock.loadedLanguages.has(language)) {
- CodeBlock.loadedLanguages.set(language, false);
- DependencyContext.collectPromise(
- ready({languages: [language]}).then(() => {
- CodeBlock.loadedLanguages.set(language, true);
- }),
- );
- return false;
- }
-
- const theme = this.stockTheme();
- if (theme != null && !CodeBlock.loadedThemes.has(theme)) {
- CodeBlock.loadedThemes.set(theme, false);
- DependencyContext.collectPromise(
- ready({themes: [theme]}).then(() => {
- CodeBlock.loadedThemes.set(theme, true);
- }),
- );
- }
-
- return (
- CodeBlock.loadedLanguages.get(language) &&
- (theme == null || CodeBlock.loadedThemes.get(theme))
- );
- }
+ public declare readonly language: SimpleSignal<string, this>;
@initial('')
@parser(function (this: CodeBlock, value: CodeTree | string): CodeTree {
@@ -103,7 +69,7 @@ export class CodeBlock extends Shape {
@signal()
public declare readonly code: Signal<CodeTree | string, CodeTree, this>;
- @initial(null)
+ @initial(undefined)
@signal()
public declare readonly theme: Signal<CodeStyle | null, CodeStyle, this>;
@@ -135,14 +101,11 @@ export class CodeBlock extends Shape {
@computed()
protected parsed() {
- if (!this.isReady()) {
+ if (!CodeBlock.initialized()) {
return [];
}
- return parse(
- {...this.code(), language: this.language()},
- {codeStyle: this.theme(), theme: this.stockTheme()},
- );
+ return parse(this.code(), {codeStyle: this.theme()});
}
public constructor({children, ...rest}: CodeProps) {
@@ -206,7 +169,7 @@ export class CodeBlock extends Shape {
protected override collectAsyncResources(): void {
super.collectAsyncResources();
- this.isReady();
+ CodeBlock.initialized();
}
public set(strings: string[], ...rest: any[]) {
@@ -298,23 +261,18 @@ export class CodeBlock extends Shape {
timingFunction: TimingFunction,
) {
if (typeof code === 'function') throw new Error();
- if (!this.isReady()) return;
+ if (!CodeBlock.initialized()) return;
const autoWidth = this.customWidth() === null;
const autoHeight = this.customHeight() === null;
const fromSize = this.size();
- const toSize = this.getTokensSize(
- parse(code, {codeStyle: this.theme(), theme: this.stockTheme()}),
- );
+ const toSize = this.getTokensSize(parse(code, {codeStyle: this.theme()}));
const beginning = 0.2;
const ending = 0.8;
this.codeProgress(0);
- this.diffed = diff(this.code(), code, {
- codeStyle: this.theme(),
- theme: this.stockTheme(),
- });
+ this.diffed = diff(this.code(), code, {codeStyle: this.theme()});
yield* tween(
time,
value => {
@@ -343,7 +301,7 @@ export class CodeBlock extends Shape {
}
protected override draw(context: CanvasRenderingContext2D) {
- if (!this.isReady()) return;
+ if (!CodeBlock.initialized()) return;
this.requestFontUpdate();
this.applyStyle(context);
diff --git a/packages/2d/src/components/index.ts b/packages/2d/src/components/index.ts
index 0130fd82..7893e91d 100644
--- a/packages/2d/src/components/index.ts
+++ b/packages/2d/src/components/index.ts
@@ -12,4 +12,3 @@ export * from './Txt';
export * from './types';
export * from './Video';
export * from './View2D';
-export * from './CodeBlock';
diff --git a/packages/docs/blog/2023-02-24-version-2.6.0.mdx b/packages/docs/blog/2023-02-24-version-2.6.0.mdx
index cbd99b45..03cc736c 100644
--- a/packages/docs/blog/2023-02-24-version-2.6.0.mdx
+++ b/packages/docs/blog/2023-02-24-version-2.6.0.mdx
@@ -18,19 +18,18 @@ import CodeBlock from '@theme/CodeBlock';
and restore it at a later point.
</Issue>
<Issue user={'Ross-Esmond'} pr={401}>
- <Link to="/docs/code-block">
- <code>CodeBlock</code>
- </Link>{' '}
- is now exported together with other nodes:
- <CodeBlock language={'ts'} className="margin-top--sm margin-bottom--sm">
- {`import {CodeBlock} from '@motion-canvas/2d/lib/components';`}
- </CodeBlock>
- An improved theme system with the new{' '}
- <Link to="/api/2d/components/CodeBlock#stockTheme">
- <code>stockTheme</code>
- </Link>{' '}
- property lets you use VS Code themes (powered by{' '}
- <Link to="https://shiki.matsu.io/">Shiki</Link>)
+ <del>
+ <Link to="/docs/code-block">
+ <code>CodeBlock</code>
+ </Link>{' '}
+ is now exported together with other nodes. An improved theme system with
+ the new{' '}
+ <Link>
+ <code>stockTheme</code>
+ </Link>{' '}
+ property lets you use VS Code themes (powered by{' '}
+ <Link to="https://shiki.matsu.io/">Shiki</Link>)
+ </del>
</Issue>
<Issue user={'aarthificial'} pr={405}>
New{' '}