Skip to content

Visualize Your Ideas With Code

refactor(2d): add editor subproject (#864)

Jacobb341e20bae6c
diff --git a/packages/2d/package.json b/packages/2d/package.json
index edccca86..d8fa4b74 100644
--- a/packages/2d/package.json
+++ b/packages/2d/package.json
@@ -6,11 +6,27 @@
"homepage": "https://motioncanvas.io/",
"bugs": "https://github.com/motion-canvas/motion-canvas/issues",
"license": "MIT",
- "main": "lib/index.js",
- "types": "./lib/index.d.ts",
+ "main": "lib/runtime/index.js",
+ "types": "./lib/runtime/index.d.ts",
+ "exports": {
+ ".": "./lib/runtime/index.js",
+ "./lib": "./lib/runtime/index.js",
+ "./lib/components": "./lib/runtime/components/index.js",
+ "./lib/curves": "./lib/runtime/curves/index.js",
+ "./lib/decorators": "./lib/runtime/decorators/index.js",
+ "./lib/partials": "./lib/runtime/partials/index.js",
+ "./lib/scenes": "./lib/runtime/scenes/index.js",
+ "./lib/utils": "./lib/runtime/utils/index.js",
+ "./lib/*": {
+ "import": "./lib/runtime/*.js",
+ "default": "./lib/runtime/*"
+ },
+ "./editor": "./lib/editor/index.js",
+ "./tsconfig.project.json": "./tsconfig.project.json"
+ },
"scripts": {
- "dev": "tspc -w",
- "build": "tspc -p tsconfig.build.json",
+ "dev": "tspc -b src -w",
+ "build": "tspc -b src",
"bundle": "rollup -c rollup.config.mjs",
"test": "vitest"
},
diff --git a/packages/2d/rollup.config.mjs b/packages/2d/rollup.config.mjs
index 29aeef17..544902fb 100644
--- a/packages/2d/rollup.config.mjs
+++ b/packages/2d/rollup.config.mjs
@@ -1,16 +1,36 @@
-import makeConfig from '@motion-canvas/internal/rollup/makeConfig.mjs';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import typescript from '@motion-canvas/internal/rollup/typescript.mjs';
+import terser from '@rollup/plugin-terser';
-export default makeConfig({
- plugins: [
- {
- resolveId(id) {
- if (id.startsWith('@motion-canvas/core')) {
- return {
- id: '@motion-canvas/core',
- external: true,
- };
- }
- },
+export default [
+ {
+ input: 'src/runtime/index.ts',
+ output: {
+ file: 'dist/index.js',
+ format: 'es',
+ sourcemap: true,
},
- ],
-});
+ plugins: [
+ {
+ resolveId(id) {
+ if (id.startsWith('@motion-canvas/core')) {
+ return {
+ id: '@motion-canvas/core',
+ external: true,
+ };
+ }
+ },
+ },
+ resolve(),
+ commonjs(),
+ typescript({
+ tsconfig: './src/runtime/tsconfig.json',
+ compilerOptions: {
+ composite: false,
+ },
+ }),
+ terser(),
+ ],
+ },
+];
diff --git a/packages/2d/src/editor/tsconfig.json b/packages/2d/src/editor/tsconfig.json
new file mode 100644
index 00000000..73b025a5
--- /dev/null
+++ b/packages/2d/src/editor/tsconfig.json
@@ -0,0 +1,9 @@
+{
+ "extends": "../tsconfig.base.json",
+ "compilerOptions": {
+ "jsx": "react-jsx",
+ "jsxImportSource": "preact"
+ },
+ "references": [{"path": "../runtime"}],
+ "include": ["**/*"]
+}
diff --git a/packages/2d/tsdoc.json b/packages/2d/src/editor/tsdoc.json
similarity index 69%
rename from packages/2d/tsdoc.json
rename to packages/2d/src/editor/tsdoc.json
index f5a4dc61..76f784c0 100644
--- a/packages/2d/tsdoc.json
+++ b/packages/2d/src/editor/tsdoc.json
@@ -1,4 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
- "extends": ["../../tsdoc.json"]
+ "extends": ["../../../../tsdoc.json"]
}
diff --git a/packages/2d/src/components/Bezier.ts b/packages/2d/src/runtime/components/Bezier.ts
similarity index 100%
rename from packages/2d/src/components/Bezier.ts
rename to packages/2d/src/runtime/components/Bezier.ts
diff --git a/packages/2d/src/components/Circle.ts b/packages/2d/src/runtime/components/Circle.ts
similarity index 100%
rename from packages/2d/src/components/Circle.ts
rename to packages/2d/src/runtime/components/Circle.ts
diff --git a/packages/2d/src/components/CodeBlock.ts b/packages/2d/src/runtime/components/CodeBlock.ts
similarity index 100%
rename from packages/2d/src/components/CodeBlock.ts
rename to packages/2d/src/runtime/components/CodeBlock.ts
diff --git a/packages/2d/src/components/CubicBezier.ts b/packages/2d/src/runtime/components/CubicBezier.ts
similarity index 100%
rename from packages/2d/src/components/CubicBezier.ts
rename to packages/2d/src/runtime/components/CubicBezier.ts
diff --git a/packages/2d/src/components/Curve.ts b/packages/2d/src/runtime/components/Curve.ts
similarity index 100%
rename from packages/2d/src/components/Curve.ts
rename to packages/2d/src/runtime/components/Curve.ts
diff --git a/packages/2d/src/components/Grid.ts b/packages/2d/src/runtime/components/Grid.ts
similarity index 100%
rename from packages/2d/src/components/Grid.ts
rename to packages/2d/src/runtime/components/Grid.ts
diff --git a/packages/2d/src/components/Icon.ts b/packages/2d/src/runtime/components/Icon.ts
similarity index 100%
rename from packages/2d/src/components/Icon.ts
rename to packages/2d/src/runtime/components/Icon.ts
diff --git a/packages/2d/src/components/Img.ts b/packages/2d/src/runtime/components/Img.ts
similarity index 100%
rename from packages/2d/src/components/Img.ts
rename to packages/2d/src/runtime/components/Img.ts
diff --git a/packages/2d/src/components/Knot.ts b/packages/2d/src/runtime/components/Knot.ts
similarity index 100%
rename from packages/2d/src/components/Knot.ts
rename to packages/2d/src/runtime/components/Knot.ts
diff --git a/packages/2d/src/components/Latex.ts b/packages/2d/src/runtime/components/Latex.ts
similarity index 100%
rename from packages/2d/src/components/Latex.ts
rename to packages/2d/src/runtime/components/Latex.ts
diff --git a/packages/2d/src/components/Layout.ts b/packages/2d/src/runtime/components/Layout.ts
similarity index 100%
rename from packages/2d/src/components/Layout.ts
rename to packages/2d/src/runtime/components/Layout.ts
diff --git a/packages/2d/src/components/Line.ts b/packages/2d/src/runtime/components/Line.ts
similarity index 100%
rename from packages/2d/src/components/Line.ts
rename to packages/2d/src/runtime/components/Line.ts
diff --git a/packages/2d/src/components/Node.ts b/packages/2d/src/runtime/components/Node.ts
similarity index 100%
rename from packages/2d/src/components/Node.ts
rename to packages/2d/src/runtime/components/Node.ts
diff --git a/packages/2d/src/components/Path.ts b/packages/2d/src/runtime/components/Path.ts
similarity index 100%
rename from packages/2d/src/components/Path.ts
rename to packages/2d/src/runtime/components/Path.ts
diff --git a/packages/2d/src/components/Polygon.ts b/packages/2d/src/runtime/components/Polygon.ts
similarity index 100%
rename from packages/2d/src/components/Polygon.ts
rename to packages/2d/src/runtime/components/Polygon.ts
diff --git a/packages/2d/src/components/QuadBezier.ts b/packages/2d/src/runtime/components/QuadBezier.ts
similarity index 100%
rename from packages/2d/src/components/QuadBezier.ts
rename to packages/2d/src/runtime/components/QuadBezier.ts
diff --git a/packages/2d/src/components/Ray.ts b/packages/2d/src/runtime/components/Ray.ts
similarity index 100%
rename from packages/2d/src/components/Ray.ts
rename to packages/2d/src/runtime/components/Ray.ts
diff --git a/packages/2d/src/components/Rect.ts b/packages/2d/src/runtime/components/Rect.ts
similarity index 100%
rename from packages/2d/src/components/Rect.ts
rename to packages/2d/src/runtime/components/Rect.ts
diff --git a/packages/2d/src/components/SVG.ts b/packages/2d/src/runtime/components/SVG.ts
similarity index 100%
rename from packages/2d/src/components/SVG.ts
rename to packages/2d/src/runtime/components/SVG.ts
diff --git a/packages/2d/src/components/Shape.ts b/packages/2d/src/runtime/components/Shape.ts
similarity index 100%
rename from packages/2d/src/components/Shape.ts
rename to packages/2d/src/runtime/components/Shape.ts
diff --git a/packages/2d/src/components/Spline.ts b/packages/2d/src/runtime/components/Spline.ts
similarity index 100%
rename from packages/2d/src/components/Spline.ts
rename to packages/2d/src/runtime/components/Spline.ts
diff --git a/packages/2d/src/components/Txt.test.tsx b/packages/2d/src/runtime/components/Txt.test.tsx
similarity index 100%
rename from packages/2d/src/components/Txt.test.tsx
rename to packages/2d/src/runtime/components/Txt.test.tsx
diff --git a/packages/2d/src/components/Txt.ts b/packages/2d/src/runtime/components/Txt.ts
similarity index 100%
rename from packages/2d/src/components/Txt.ts
rename to packages/2d/src/runtime/components/Txt.ts
diff --git a/packages/2d/src/components/TxtLeaf.ts b/packages/2d/src/runtime/components/TxtLeaf.ts
similarity index 100%
rename from packages/2d/src/components/TxtLeaf.ts
rename to packages/2d/src/runtime/components/TxtLeaf.ts
diff --git a/packages/2d/src/components/Video.ts b/packages/2d/src/runtime/components/Video.ts
similarity index 100%
rename from packages/2d/src/components/Video.ts
rename to packages/2d/src/runtime/components/Video.ts
diff --git a/packages/2d/src/components/View2D.ts b/packages/2d/src/runtime/components/View2D.ts
similarity index 100%
rename from packages/2d/src/components/View2D.ts
rename to packages/2d/src/runtime/components/View2D.ts
diff --git a/packages/2d/src/components/__logs__/image-without-source.md b/packages/2d/src/runtime/components/__logs__/image-without-source.md
similarity index 100%
rename from packages/2d/src/components/__logs__/image-without-source.md
rename to packages/2d/src/runtime/components/__logs__/image-without-source.md
diff --git a/packages/2d/src/components/__logs__/line-without-points.md b/packages/2d/src/runtime/components/__logs__/line-without-points.md
similarity index 100%
rename from packages/2d/src/components/__logs__/line-without-points.md
rename to packages/2d/src/runtime/components/__logs__/line-without-points.md
diff --git a/packages/2d/src/components/__logs__/reactive-playback-rate.md b/packages/2d/src/runtime/components/__logs__/reactive-playback-rate.md
similarity index 100%
rename from packages/2d/src/components/__logs__/reactive-playback-rate.md
rename to packages/2d/src/runtime/components/__logs__/reactive-playback-rate.md
diff --git a/packages/2d/src/components/__logs__/spline-with-insufficient-knots.md b/packages/2d/src/runtime/components/__logs__/spline-with-insufficient-knots.md
similarity index 100%
rename from packages/2d/src/components/__logs__/spline-with-insufficient-knots.md
rename to packages/2d/src/runtime/components/__logs__/spline-with-insufficient-knots.md
diff --git a/packages/2d/src/components/__tests__/children.test.tsx b/packages/2d/src/runtime/components/__tests__/children.test.tsx
similarity index 100%
rename from packages/2d/src/components/__tests__/children.test.tsx
rename to packages/2d/src/runtime/components/__tests__/children.test.tsx
diff --git a/packages/2d/src/components/__tests__/clone.test.tsx b/packages/2d/src/runtime/components/__tests__/clone.test.tsx
similarity index 100%
rename from packages/2d/src/components/__tests__/clone.test.tsx
rename to packages/2d/src/runtime/components/__tests__/clone.test.tsx
diff --git a/packages/2d/src/components/__tests__/generatorTest.ts b/packages/2d/src/runtime/components/__tests__/generatorTest.ts
similarity index 100%
rename from packages/2d/src/components/__tests__/generatorTest.ts
rename to packages/2d/src/runtime/components/__tests__/generatorTest.ts
diff --git a/packages/2d/src/components/__tests__/mockScene2D.ts b/packages/2d/src/runtime/components/__tests__/mockScene2D.ts
similarity index 100%
rename from packages/2d/src/components/__tests__/mockScene2D.ts
rename to packages/2d/src/runtime/components/__tests__/mockScene2D.ts
diff --git a/packages/2d/src/components/__tests__/query.test.tsx b/packages/2d/src/runtime/components/__tests__/query.test.tsx
similarity index 100%
rename from packages/2d/src/components/__tests__/query.test.tsx
rename to packages/2d/src/runtime/components/__tests__/query.test.tsx
diff --git a/packages/2d/src/components/__tests__/state.test.tsx b/packages/2d/src/runtime/components/__tests__/state.test.tsx
similarity index 100%
rename from packages/2d/src/components/__tests__/state.test.tsx
rename to packages/2d/src/runtime/components/__tests__/state.test.tsx
diff --git a/packages/2d/src/components/index.ts b/packages/2d/src/runtime/components/index.ts
similarity index 100%
rename from packages/2d/src/components/index.ts
rename to packages/2d/src/runtime/components/index.ts
diff --git a/packages/2d/src/components/types.ts b/packages/2d/src/runtime/components/types.ts
similarity index 100%
rename from packages/2d/src/components/types.ts
rename to packages/2d/src/runtime/components/types.ts
diff --git a/packages/2d/src/curves/ArcSegment.ts b/packages/2d/src/runtime/curves/ArcSegment.ts
similarity index 100%
rename from packages/2d/src/curves/ArcSegment.ts
rename to packages/2d/src/runtime/curves/ArcSegment.ts
diff --git a/packages/2d/src/curves/CircleSegment.ts b/packages/2d/src/runtime/curves/CircleSegment.ts
similarity index 100%
rename from packages/2d/src/curves/CircleSegment.ts
rename to packages/2d/src/runtime/curves/CircleSegment.ts
diff --git a/packages/2d/src/curves/CubicBezierSegment.ts b/packages/2d/src/runtime/curves/CubicBezierSegment.ts
similarity index 100%
rename from packages/2d/src/curves/CubicBezierSegment.ts
rename to packages/2d/src/runtime/curves/CubicBezierSegment.ts
diff --git a/packages/2d/src/curves/CurveDrawingInfo.ts b/packages/2d/src/runtime/curves/CurveDrawingInfo.ts
similarity index 100%
rename from packages/2d/src/curves/CurveDrawingInfo.ts
rename to packages/2d/src/runtime/curves/CurveDrawingInfo.ts
diff --git a/packages/2d/src/curves/CurvePoint.ts b/packages/2d/src/runtime/curves/CurvePoint.ts
similarity index 100%
rename from packages/2d/src/curves/CurvePoint.ts
rename to packages/2d/src/runtime/curves/CurvePoint.ts
diff --git a/packages/2d/src/curves/CurveProfile.ts b/packages/2d/src/runtime/curves/CurveProfile.ts
similarity index 100%
rename from packages/2d/src/curves/CurveProfile.ts
rename to packages/2d/src/runtime/curves/CurveProfile.ts
diff --git a/packages/2d/src/curves/KnotInfo.ts b/packages/2d/src/runtime/curves/KnotInfo.ts
similarity index 100%
rename from packages/2d/src/curves/KnotInfo.ts
rename to packages/2d/src/runtime/curves/KnotInfo.ts
diff --git a/packages/2d/src/curves/LineSegment.ts b/packages/2d/src/runtime/curves/LineSegment.ts
similarity index 100%
rename from packages/2d/src/curves/LineSegment.ts
rename to packages/2d/src/runtime/curves/LineSegment.ts
diff --git a/packages/2d/src/curves/Polynomial.ts b/packages/2d/src/runtime/curves/Polynomial.ts
similarity index 100%
rename from packages/2d/src/curves/Polynomial.ts
rename to packages/2d/src/runtime/curves/Polynomial.ts
diff --git a/packages/2d/src/curves/Polynomial2D.ts b/packages/2d/src/runtime/curves/Polynomial2D.ts
similarity index 100%
rename from packages/2d/src/curves/Polynomial2D.ts
rename to packages/2d/src/runtime/curves/Polynomial2D.ts
diff --git a/packages/2d/src/curves/PolynomialSegment.ts b/packages/2d/src/runtime/curves/PolynomialSegment.ts
similarity index 100%
rename from packages/2d/src/curves/PolynomialSegment.ts
rename to packages/2d/src/runtime/curves/PolynomialSegment.ts
diff --git a/packages/2d/src/curves/QuadBezierSegment.ts b/packages/2d/src/runtime/curves/QuadBezierSegment.ts
similarity index 100%
rename from packages/2d/src/curves/QuadBezierSegment.ts
rename to packages/2d/src/runtime/curves/QuadBezierSegment.ts
diff --git a/packages/2d/src/curves/Segment.ts b/packages/2d/src/runtime/curves/Segment.ts
similarity index 100%
rename from packages/2d/src/curves/Segment.ts
rename to packages/2d/src/runtime/curves/Segment.ts
diff --git a/packages/2d/src/curves/UniformPolynomialCurveSampler.ts b/packages/2d/src/runtime/curves/UniformPolynomialCurveSampler.ts
similarity index 100%
rename from packages/2d/src/curves/UniformPolynomialCurveSampler.ts
rename to packages/2d/src/runtime/curves/UniformPolynomialCurveSampler.ts
diff --git a/packages/2d/src/curves/createCurveProfileLerp.ts b/packages/2d/src/runtime/curves/createCurveProfileLerp.ts
similarity index 100%
rename from packages/2d/src/curves/createCurveProfileLerp.ts
rename to packages/2d/src/runtime/curves/createCurveProfileLerp.ts
diff --git a/packages/2d/src/curves/getBezierSplineProfile.ts b/packages/2d/src/runtime/curves/getBezierSplineProfile.ts
similarity index 100%
rename from packages/2d/src/curves/getBezierSplineProfile.ts
rename to packages/2d/src/runtime/curves/getBezierSplineProfile.ts
diff --git a/packages/2d/src/curves/getCircleProfile.ts b/packages/2d/src/runtime/curves/getCircleProfile.ts
similarity index 100%
rename from packages/2d/src/curves/getCircleProfile.ts
rename to packages/2d/src/runtime/curves/getCircleProfile.ts
diff --git a/packages/2d/src/curves/getPathProfile.ts b/packages/2d/src/runtime/curves/getPathProfile.ts
similarity index 100%
rename from packages/2d/src/curves/getPathProfile.ts
rename to packages/2d/src/runtime/curves/getPathProfile.ts
diff --git a/packages/2d/src/curves/getPointAtDistance.ts b/packages/2d/src/runtime/curves/getPointAtDistance.ts
similarity index 100%
rename from packages/2d/src/curves/getPointAtDistance.ts
rename to packages/2d/src/runtime/curves/getPointAtDistance.ts
diff --git a/packages/2d/src/curves/getPolylineProfile.test.ts b/packages/2d/src/runtime/curves/getPolylineProfile.test.ts
similarity index 100%
rename from packages/2d/src/curves/getPolylineProfile.test.ts
rename to packages/2d/src/runtime/curves/getPolylineProfile.test.ts
diff --git a/packages/2d/src/curves/getPolylineProfile.ts b/packages/2d/src/runtime/curves/getPolylineProfile.ts
similarity index 100%
rename from packages/2d/src/curves/getPolylineProfile.ts
rename to packages/2d/src/runtime/curves/getPolylineProfile.ts
diff --git a/packages/2d/src/curves/getRectProfile.ts b/packages/2d/src/runtime/curves/getRectProfile.ts
similarity index 100%
rename from packages/2d/src/curves/getRectProfile.ts
rename to packages/2d/src/runtime/curves/getRectProfile.ts
diff --git a/packages/2d/src/curves/index.ts b/packages/2d/src/runtime/curves/index.ts
similarity index 100%
rename from packages/2d/src/curves/index.ts
rename to packages/2d/src/runtime/curves/index.ts
diff --git a/packages/2d/src/decorators/canvasStyleSignal.ts b/packages/2d/src/runtime/decorators/canvasStyleSignal.ts
similarity index 100%
rename from packages/2d/src/decorators/canvasStyleSignal.ts
rename to packages/2d/src/runtime/decorators/canvasStyleSignal.ts
diff --git a/packages/2d/src/decorators/colorSignal.ts b/packages/2d/src/runtime/decorators/colorSignal.ts
similarity index 100%
rename from packages/2d/src/decorators/colorSignal.ts
rename to packages/2d/src/runtime/decorators/colorSignal.ts
diff --git a/packages/2d/src/decorators/compound.ts b/packages/2d/src/runtime/decorators/compound.ts
similarity index 100%
rename from packages/2d/src/decorators/compound.ts
rename to packages/2d/src/runtime/decorators/compound.ts
diff --git a/packages/2d/src/decorators/computed.ts b/packages/2d/src/runtime/decorators/computed.ts
similarity index 100%
rename from packages/2d/src/decorators/computed.ts
rename to packages/2d/src/runtime/decorators/computed.ts
diff --git a/packages/2d/src/decorators/defaultStyle.ts b/packages/2d/src/runtime/decorators/defaultStyle.ts
similarity index 100%
rename from packages/2d/src/decorators/defaultStyle.ts
rename to packages/2d/src/runtime/decorators/defaultStyle.ts
diff --git a/packages/2d/src/decorators/filtersSignal.ts b/packages/2d/src/runtime/decorators/filtersSignal.ts
similarity index 100%
rename from packages/2d/src/decorators/filtersSignal.ts
rename to packages/2d/src/runtime/decorators/filtersSignal.ts
diff --git a/packages/2d/src/decorators/index.ts b/packages/2d/src/runtime/decorators/index.ts
similarity index 100%
rename from packages/2d/src/decorators/index.ts
rename to packages/2d/src/runtime/decorators/index.ts
diff --git a/packages/2d/src/decorators/initializers.ts b/packages/2d/src/runtime/decorators/initializers.ts
similarity index 100%
rename from packages/2d/src/decorators/initializers.ts
rename to packages/2d/src/runtime/decorators/initializers.ts
diff --git a/packages/2d/src/decorators/signal.test.ts b/packages/2d/src/runtime/decorators/signal.test.ts
similarity index 100%
rename from packages/2d/src/decorators/signal.test.ts
rename to packages/2d/src/runtime/decorators/signal.test.ts
diff --git a/packages/2d/src/decorators/signal.ts b/packages/2d/src/runtime/decorators/signal.ts
similarity index 100%
rename from packages/2d/src/decorators/signal.ts
rename to packages/2d/src/runtime/decorators/signal.ts
diff --git a/packages/2d/src/decorators/spacingSignal.ts b/packages/2d/src/runtime/decorators/spacingSignal.ts
similarity index 100%
rename from packages/2d/src/decorators/spacingSignal.ts
rename to packages/2d/src/runtime/decorators/spacingSignal.ts
diff --git a/packages/2d/src/decorators/vector2Signal.ts b/packages/2d/src/runtime/decorators/vector2Signal.ts
similarity index 100%
rename from packages/2d/src/decorators/vector2Signal.ts
rename to packages/2d/src/runtime/decorators/vector2Signal.ts
diff --git a/packages/2d/src/globals.d.ts b/packages/2d/src/runtime/globals.d.ts
similarity index 100%
rename from packages/2d/src/globals.d.ts
rename to packages/2d/src/runtime/globals.d.ts
diff --git a/packages/2d/src/index.ts b/packages/2d/src/runtime/index.ts
similarity index 100%
rename from packages/2d/src/index.ts
rename to packages/2d/src/runtime/index.ts
diff --git a/packages/2d/src/jsx-dev-runtime.ts b/packages/2d/src/runtime/jsx-dev-runtime.ts
similarity index 100%
rename from packages/2d/src/jsx-dev-runtime.ts
rename to packages/2d/src/runtime/jsx-dev-runtime.ts
diff --git a/packages/2d/src/jsx-runtime.ts b/packages/2d/src/runtime/jsx-runtime.ts
similarity index 100%
rename from packages/2d/src/jsx-runtime.ts
rename to packages/2d/src/runtime/jsx-runtime.ts
diff --git a/packages/2d/src/parse-svg-path.d.ts b/packages/2d/src/runtime/parse-svg-path.d.ts
similarity index 100%
rename from packages/2d/src/parse-svg-path.d.ts
rename to packages/2d/src/runtime/parse-svg-path.d.ts
diff --git a/packages/2d/src/partials/Filter.ts b/packages/2d/src/runtime/partials/Filter.ts
similarity index 100%
rename from packages/2d/src/partials/Filter.ts
rename to packages/2d/src/runtime/partials/Filter.ts
diff --git a/packages/2d/src/partials/Gradient.ts b/packages/2d/src/runtime/partials/Gradient.ts
similarity index 100%
rename from packages/2d/src/partials/Gradient.ts
rename to packages/2d/src/runtime/partials/Gradient.ts
diff --git a/packages/2d/src/partials/Pattern.ts b/packages/2d/src/runtime/partials/Pattern.ts
similarity index 100%
rename from packages/2d/src/partials/Pattern.ts
rename to packages/2d/src/runtime/partials/Pattern.ts
diff --git a/packages/2d/src/partials/index.ts b/packages/2d/src/runtime/partials/index.ts
similarity index 100%
rename from packages/2d/src/partials/index.ts
rename to packages/2d/src/runtime/partials/index.ts
diff --git a/packages/2d/src/partials/types.ts b/packages/2d/src/runtime/partials/types.ts
similarity index 100%
rename from packages/2d/src/partials/types.ts
rename to packages/2d/src/runtime/partials/types.ts
diff --git a/packages/2d/src/scenes/Scene2D.ts b/packages/2d/src/runtime/scenes/Scene2D.ts
similarity index 100%
rename from packages/2d/src/scenes/Scene2D.ts
rename to packages/2d/src/runtime/scenes/Scene2D.ts
diff --git a/packages/2d/src/scenes/index.ts b/packages/2d/src/runtime/scenes/index.ts
similarity index 100%
rename from packages/2d/src/scenes/index.ts
rename to packages/2d/src/runtime/scenes/index.ts
diff --git a/packages/2d/src/scenes/makeScene2D.ts b/packages/2d/src/runtime/scenes/makeScene2D.ts
similarity index 100%
rename from packages/2d/src/scenes/makeScene2D.ts
rename to packages/2d/src/runtime/scenes/makeScene2D.ts
diff --git a/packages/2d/src/scenes/useScene2D.ts b/packages/2d/src/runtime/scenes/useScene2D.ts
similarity index 100%
rename from packages/2d/src/scenes/useScene2D.ts
rename to packages/2d/src/runtime/scenes/useScene2D.ts
diff --git a/packages/2d/src/runtime/tsconfig.json b/packages/2d/src/runtime/tsconfig.json
new file mode 100644
index 00000000..8bffd9a8
--- /dev/null
+++ b/packages/2d/src/runtime/tsconfig.json
@@ -0,0 +1,18 @@
+{
+ "extends": "../tsconfig.base.json",
+ "compilerOptions": {
+ "types": ["node"],
+ "jsx": "react-jsx",
+ "jsxImportSource": "@motion-canvas/2d/lib",
+ "plugins": [
+ {
+ "transform": "@motion-canvas/internal/transformers/markdown-literals.js"
+ }
+ ],
+ "paths": {
+ "@motion-canvas/2d/lib/*": ["./*"]
+ }
+ },
+ "include": ["**/*"],
+ "exclude": ["**/*.test.*", "**/__tests__/**/*"]
+}
diff --git a/packages/2d/src/runtime/tsdoc.json b/packages/2d/src/runtime/tsdoc.json
new file mode 100644
index 00000000..76f784c0
--- /dev/null
+++ b/packages/2d/src/runtime/tsdoc.json
@@ -0,0 +1,4 @@
+{
+ "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
+ "extends": ["../../../../tsdoc.json"]
+}
diff --git a/packages/2d/src/utils/CanvasUtils.ts b/packages/2d/src/runtime/utils/CanvasUtils.ts
similarity index 100%
rename from packages/2d/src/utils/CanvasUtils.ts
rename to packages/2d/src/runtime/utils/CanvasUtils.ts
diff --git a/packages/2d/src/utils/diff.test.ts b/packages/2d/src/runtime/utils/diff.test.ts
similarity index 100%
rename from packages/2d/src/utils/diff.test.ts
rename to packages/2d/src/runtime/utils/diff.test.ts
diff --git a/packages/2d/src/utils/diff.ts b/packages/2d/src/runtime/utils/diff.ts
similarity index 100%
rename from packages/2d/src/utils/diff.ts
rename to packages/2d/src/runtime/utils/diff.ts
diff --git a/packages/2d/src/utils/index.ts b/packages/2d/src/runtime/utils/index.ts
similarity index 100%
rename from packages/2d/src/utils/index.ts
rename to packages/2d/src/runtime/utils/index.ts
diff --git a/packages/2d/src/utils/is.ts b/packages/2d/src/runtime/utils/is.ts
similarity index 100%
rename from packages/2d/src/utils/is.ts
rename to packages/2d/src/runtime/utils/is.ts
diff --git a/packages/2d/src/utils/makeSignalExtensions.ts b/packages/2d/src/runtime/utils/makeSignalExtensions.ts
similarity index 100%
rename from packages/2d/src/utils/makeSignalExtensions.ts
rename to packages/2d/src/runtime/utils/makeSignalExtensions.ts
diff --git a/packages/2d/tsconfig.json b/packages/2d/src/tsconfig.base.json
similarity index 56%
rename from packages/2d/tsconfig.json
rename to packages/2d/src/tsconfig.base.json
index 3ba1a670..8b18ddae 100644
--- a/packages/2d/tsconfig.json
+++ b/packages/2d/src/tsconfig.base.json
@@ -1,6 +1,7 @@
{
"compilerOptions": {
- "outDir": "lib",
+ "rootDir": ".",
+ "outDir": "../lib",
"strict": true,
"noImplicitOverride": true,
"module": "esnext",
@@ -12,14 +13,6 @@
"inlineSourceMap": true,
"experimentalDecorators": true,
"skipLibCheck": true,
- "types": ["node"],
- "jsx": "react-jsx",
- "jsxImportSource": "@motion-canvas/2d/src",
- "plugins": [
- {
- "transform": "@motion-canvas/internal/transformers/markdown-literals.js"
- }
- ]
- },
- "include": ["src"]
+ "composite": true
+ }
}
diff --git a/packages/2d/src/tsconfig.json b/packages/2d/src/tsconfig.json
new file mode 100644
index 00000000..0ad069a5
--- /dev/null
+++ b/packages/2d/src/tsconfig.json
@@ -0,0 +1,5 @@
+{
+ "files": [],
+ "include": [],
+ "references": [{"path": "./runtime"}, {"path": "./editor"}]
+}
diff --git a/packages/2d/tsconfig.build.json b/packages/2d/tsconfig.build.json
deleted file mode 100644
index 3f58745d..00000000
--- a/packages/2d/tsconfig.build.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "exclude": ["**/*.test.*", "**/__tests__/**/*"]
-}
diff --git a/packages/2d/vitest.config.ts b/packages/2d/vitest.config.ts
index 5b71a510..d6314052 100644
--- a/packages/2d/vitest.config.ts
+++ b/packages/2d/vitest.config.ts
@@ -4,7 +4,7 @@ import markdownLiterals from '@motion-canvas/internal/vite/markdown-literals';
export default defineConfig({
plugins: [markdownLiterals()],
test: {
- include: ['./src/**/*.test.*'],
+ include: ['./src/runtime/**/*.test.*'],
environment: 'jsdom',
},
});
diff --git a/packages/core/rollup.config.mjs b/packages/core/rollup.config.mjs
index 30225f48..142d90fc 100644
--- a/packages/core/rollup.config.mjs
+++ b/packages/core/rollup.config.mjs
@@ -1,3 +1,16 @@
-import makeConfig from '@motion-canvas/internal/rollup/makeConfig.mjs';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import terser from '@rollup/plugin-terser';
+import typescript from '@motion-canvas/internal/rollup/typescript.mjs';
-export default makeConfig();
+export default [
+ {
+ input: 'src/index.ts',
+ output: {
+ file: 'dist/index.js',
+ format: 'es',
+ sourcemap: true,
+ },
+ plugins: [resolve(), commonjs(), typescript(), terser()],
+ },
+];
diff --git a/packages/docs/bundle.js b/packages/docs/bundle.js
index f4a558e9..c3114d53 100644
--- a/packages/docs/bundle.js
+++ b/packages/docs/bundle.js
@@ -35,7 +35,7 @@ module.exports = () => ({
});
async function copyBundle(name) {
- const bundle = `../${name}/dist/index.min.js`;
+ const bundle = `../${name}/dist/index.js`;
if (!fs.existsSync(bundle)) {
throw `The '${name}' bundle is missing.\n\tMake sure to first run:\n\tnpm run ${name}:bundle\n`;
}
diff --git a/packages/docs/typedoc.js b/packages/docs/typedoc.js
index fb8e1336..22ef3157 100644
--- a/packages/docs/typedoc.js
+++ b/packages/docs/typedoc.js
@@ -57,14 +57,14 @@ module.exports = () => ({
excludeInternal: true,
excludePrivate: true,
entryPoints: [
- '../2d/src/components',
- '../2d/src/curves',
- '../2d/src/decorators',
- '../2d/src/partials',
- '../2d/src/scenes',
- '../2d/src/utils',
+ '../2d/src/runtime/components',
+ '../2d/src/runtime/curves',
+ '../2d/src/runtime/decorators',
+ '../2d/src/runtime/partials',
+ '../2d/src/runtime/scenes',
+ '../2d/src/runtime/utils',
],
- tsconfig: '../2d/tsconfig.build.json',
+ tsconfig: '../2d/src/runtime/tsconfig.json',
},
'2d',
core,
diff --git a/packages/internal/rollup/makeConfig.mjs b/packages/internal/rollup/makeConfig.mjs
deleted file mode 100644
index 05fcca0c..00000000
--- a/packages/internal/rollup/makeConfig.mjs
+++ /dev/null
@@ -1,47 +0,0 @@
-import resolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
-import typescriptBase from '@rollup/plugin-typescript';
-import terser from '@rollup/plugin-terser';
-import markdownLiterals from '../transformers/markdown-literals.js';
-
-function typescript() {
- return typescriptBase({
- compilerOptions: {
- declaration: false,
- declarationMap: false,
- },
- transformers: {
- before: [
- {
- type: 'program',
- factory: markdownLiterals,
- },
- ],
- },
- });
-}
-
-export default function makeConfig(config = {}) {
- const {output = {}, plugins = [], ...rest} = config;
- return [
- {
- input: 'src/index.ts',
- output: [
- {
- file: 'dist/index.js',
- format: 'es',
- sourcemap: true,
- ...output,
- },
- {
- file: 'dist/index.min.js',
- format: 'es',
- ...output,
- plugins: [terser()],
- },
- ],
- plugins: [...plugins, resolve(), commonjs(), typescript()],
- ...rest,
- },
- ];
-}
diff --git a/packages/internal/rollup/typescript.mjs b/packages/internal/rollup/typescript.mjs
new file mode 100644
index 00000000..27884b6d
--- /dev/null
+++ b/packages/internal/rollup/typescript.mjs
@@ -0,0 +1,26 @@
+import typescriptBase from '@rollup/plugin-typescript';
+import markdownLiterals from '../transformers/markdown-literals.js';
+
+/**
+ * @param {import('@rollup/plugin-typescript').RollupTypescriptOptions} options
+ * @returns {Plugin}
+ */
+export default function typescript(options = {}) {
+ const {compilerOptions, ...rest} = options;
+ return typescriptBase({
+ compilerOptions: {
+ declaration: false,
+ declarationMap: false,
+ ...(compilerOptions ?? {}),
+ },
+ transformers: {
+ before: [
+ {
+ type: 'program',
+ factory: markdownLiterals,
+ },
+ ],
+ },
+ ...rest,
+ });
+}