Visualize Your Ideas With Code
refactor(2d): add editor subproject (#864)
Jacobb341e20bae6c
diff --git a/packages/2d/package.json b/packages/2d/package.jsonindex 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.mjsindex 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.jsonnew file mode 100644index 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.jsonsimilarity index 69%rename from packages/2d/tsdoc.jsonrename to packages/2d/src/editor/tsdoc.jsonindex 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.tssimilarity index 100%rename from packages/2d/src/components/Bezier.tsrename to packages/2d/src/runtime/components/Bezier.tsdiff --git a/packages/2d/src/components/Circle.ts b/packages/2d/src/runtime/components/Circle.tssimilarity index 100%rename from packages/2d/src/components/Circle.tsrename to packages/2d/src/runtime/components/Circle.tsdiff --git a/packages/2d/src/components/CodeBlock.ts b/packages/2d/src/runtime/components/CodeBlock.tssimilarity index 100%rename from packages/2d/src/components/CodeBlock.tsrename to packages/2d/src/runtime/components/CodeBlock.tsdiff --git a/packages/2d/src/components/CubicBezier.ts b/packages/2d/src/runtime/components/CubicBezier.tssimilarity index 100%rename from packages/2d/src/components/CubicBezier.tsrename to packages/2d/src/runtime/components/CubicBezier.tsdiff --git a/packages/2d/src/components/Curve.ts b/packages/2d/src/runtime/components/Curve.tssimilarity index 100%rename from packages/2d/src/components/Curve.tsrename to packages/2d/src/runtime/components/Curve.tsdiff --git a/packages/2d/src/components/Grid.ts b/packages/2d/src/runtime/components/Grid.tssimilarity index 100%rename from packages/2d/src/components/Grid.tsrename to packages/2d/src/runtime/components/Grid.tsdiff --git a/packages/2d/src/components/Icon.ts b/packages/2d/src/runtime/components/Icon.tssimilarity index 100%rename from packages/2d/src/components/Icon.tsrename to packages/2d/src/runtime/components/Icon.tsdiff --git a/packages/2d/src/components/Img.ts b/packages/2d/src/runtime/components/Img.tssimilarity index 100%rename from packages/2d/src/components/Img.tsrename to packages/2d/src/runtime/components/Img.tsdiff --git a/packages/2d/src/components/Knot.ts b/packages/2d/src/runtime/components/Knot.tssimilarity index 100%rename from packages/2d/src/components/Knot.tsrename to packages/2d/src/runtime/components/Knot.tsdiff --git a/packages/2d/src/components/Latex.ts b/packages/2d/src/runtime/components/Latex.tssimilarity index 100%rename from packages/2d/src/components/Latex.tsrename to packages/2d/src/runtime/components/Latex.tsdiff --git a/packages/2d/src/components/Layout.ts b/packages/2d/src/runtime/components/Layout.tssimilarity index 100%rename from packages/2d/src/components/Layout.tsrename to packages/2d/src/runtime/components/Layout.tsdiff --git a/packages/2d/src/components/Line.ts b/packages/2d/src/runtime/components/Line.tssimilarity index 100%rename from packages/2d/src/components/Line.tsrename to packages/2d/src/runtime/components/Line.tsdiff --git a/packages/2d/src/components/Node.ts b/packages/2d/src/runtime/components/Node.tssimilarity index 100%rename from packages/2d/src/components/Node.tsrename to packages/2d/src/runtime/components/Node.tsdiff --git a/packages/2d/src/components/Path.ts b/packages/2d/src/runtime/components/Path.tssimilarity index 100%rename from packages/2d/src/components/Path.tsrename to packages/2d/src/runtime/components/Path.tsdiff --git a/packages/2d/src/components/Polygon.ts b/packages/2d/src/runtime/components/Polygon.tssimilarity index 100%rename from packages/2d/src/components/Polygon.tsrename to packages/2d/src/runtime/components/Polygon.tsdiff --git a/packages/2d/src/components/QuadBezier.ts b/packages/2d/src/runtime/components/QuadBezier.tssimilarity index 100%rename from packages/2d/src/components/QuadBezier.tsrename to packages/2d/src/runtime/components/QuadBezier.tsdiff --git a/packages/2d/src/components/Ray.ts b/packages/2d/src/runtime/components/Ray.tssimilarity index 100%rename from packages/2d/src/components/Ray.tsrename to packages/2d/src/runtime/components/Ray.tsdiff --git a/packages/2d/src/components/Rect.ts b/packages/2d/src/runtime/components/Rect.tssimilarity index 100%rename from packages/2d/src/components/Rect.tsrename to packages/2d/src/runtime/components/Rect.tsdiff --git a/packages/2d/src/components/SVG.ts b/packages/2d/src/runtime/components/SVG.tssimilarity index 100%rename from packages/2d/src/components/SVG.tsrename to packages/2d/src/runtime/components/SVG.tsdiff --git a/packages/2d/src/components/Shape.ts b/packages/2d/src/runtime/components/Shape.tssimilarity index 100%rename from packages/2d/src/components/Shape.tsrename to packages/2d/src/runtime/components/Shape.tsdiff --git a/packages/2d/src/components/Spline.ts b/packages/2d/src/runtime/components/Spline.tssimilarity index 100%rename from packages/2d/src/components/Spline.tsrename to packages/2d/src/runtime/components/Spline.tsdiff --git a/packages/2d/src/components/Txt.test.tsx b/packages/2d/src/runtime/components/Txt.test.tsxsimilarity index 100%rename from packages/2d/src/components/Txt.test.tsxrename to packages/2d/src/runtime/components/Txt.test.tsxdiff --git a/packages/2d/src/components/Txt.ts b/packages/2d/src/runtime/components/Txt.tssimilarity index 100%rename from packages/2d/src/components/Txt.tsrename to packages/2d/src/runtime/components/Txt.tsdiff --git a/packages/2d/src/components/TxtLeaf.ts b/packages/2d/src/runtime/components/TxtLeaf.tssimilarity index 100%rename from packages/2d/src/components/TxtLeaf.tsrename to packages/2d/src/runtime/components/TxtLeaf.tsdiff --git a/packages/2d/src/components/Video.ts b/packages/2d/src/runtime/components/Video.tssimilarity index 100%rename from packages/2d/src/components/Video.tsrename to packages/2d/src/runtime/components/Video.tsdiff --git a/packages/2d/src/components/View2D.ts b/packages/2d/src/runtime/components/View2D.tssimilarity index 100%rename from packages/2d/src/components/View2D.tsrename to packages/2d/src/runtime/components/View2D.tsdiff --git a/packages/2d/src/components/__logs__/image-without-source.md b/packages/2d/src/runtime/components/__logs__/image-without-source.mdsimilarity index 100%rename from packages/2d/src/components/__logs__/image-without-source.mdrename to packages/2d/src/runtime/components/__logs__/image-without-source.mddiff --git a/packages/2d/src/components/__logs__/line-without-points.md b/packages/2d/src/runtime/components/__logs__/line-without-points.mdsimilarity index 100%rename from packages/2d/src/components/__logs__/line-without-points.mdrename to packages/2d/src/runtime/components/__logs__/line-without-points.mddiff --git a/packages/2d/src/components/__logs__/reactive-playback-rate.md b/packages/2d/src/runtime/components/__logs__/reactive-playback-rate.mdsimilarity index 100%rename from packages/2d/src/components/__logs__/reactive-playback-rate.mdrename to packages/2d/src/runtime/components/__logs__/reactive-playback-rate.mddiff --git a/packages/2d/src/components/__logs__/spline-with-insufficient-knots.md b/packages/2d/src/runtime/components/__logs__/spline-with-insufficient-knots.mdsimilarity index 100%rename from packages/2d/src/components/__logs__/spline-with-insufficient-knots.mdrename to packages/2d/src/runtime/components/__logs__/spline-with-insufficient-knots.mddiff --git a/packages/2d/src/components/__tests__/children.test.tsx b/packages/2d/src/runtime/components/__tests__/children.test.tsxsimilarity index 100%rename from packages/2d/src/components/__tests__/children.test.tsxrename to packages/2d/src/runtime/components/__tests__/children.test.tsxdiff --git a/packages/2d/src/components/__tests__/clone.test.tsx b/packages/2d/src/runtime/components/__tests__/clone.test.tsxsimilarity index 100%rename from packages/2d/src/components/__tests__/clone.test.tsxrename to packages/2d/src/runtime/components/__tests__/clone.test.tsxdiff --git a/packages/2d/src/components/__tests__/generatorTest.ts b/packages/2d/src/runtime/components/__tests__/generatorTest.tssimilarity index 100%rename from packages/2d/src/components/__tests__/generatorTest.tsrename to packages/2d/src/runtime/components/__tests__/generatorTest.tsdiff --git a/packages/2d/src/components/__tests__/mockScene2D.ts b/packages/2d/src/runtime/components/__tests__/mockScene2D.tssimilarity index 100%rename from packages/2d/src/components/__tests__/mockScene2D.tsrename to packages/2d/src/runtime/components/__tests__/mockScene2D.tsdiff --git a/packages/2d/src/components/__tests__/query.test.tsx b/packages/2d/src/runtime/components/__tests__/query.test.tsxsimilarity index 100%rename from packages/2d/src/components/__tests__/query.test.tsxrename to packages/2d/src/runtime/components/__tests__/query.test.tsxdiff --git a/packages/2d/src/components/__tests__/state.test.tsx b/packages/2d/src/runtime/components/__tests__/state.test.tsxsimilarity index 100%rename from packages/2d/src/components/__tests__/state.test.tsxrename to packages/2d/src/runtime/components/__tests__/state.test.tsxdiff --git a/packages/2d/src/components/index.ts b/packages/2d/src/runtime/components/index.tssimilarity index 100%rename from packages/2d/src/components/index.tsrename to packages/2d/src/runtime/components/index.tsdiff --git a/packages/2d/src/components/types.ts b/packages/2d/src/runtime/components/types.tssimilarity index 100%rename from packages/2d/src/components/types.tsrename to packages/2d/src/runtime/components/types.tsdiff --git a/packages/2d/src/curves/ArcSegment.ts b/packages/2d/src/runtime/curves/ArcSegment.tssimilarity index 100%rename from packages/2d/src/curves/ArcSegment.tsrename to packages/2d/src/runtime/curves/ArcSegment.tsdiff --git a/packages/2d/src/curves/CircleSegment.ts b/packages/2d/src/runtime/curves/CircleSegment.tssimilarity index 100%rename from packages/2d/src/curves/CircleSegment.tsrename to packages/2d/src/runtime/curves/CircleSegment.tsdiff --git a/packages/2d/src/curves/CubicBezierSegment.ts b/packages/2d/src/runtime/curves/CubicBezierSegment.tssimilarity index 100%rename from packages/2d/src/curves/CubicBezierSegment.tsrename to packages/2d/src/runtime/curves/CubicBezierSegment.tsdiff --git a/packages/2d/src/curves/CurveDrawingInfo.ts b/packages/2d/src/runtime/curves/CurveDrawingInfo.tssimilarity index 100%rename from packages/2d/src/curves/CurveDrawingInfo.tsrename to packages/2d/src/runtime/curves/CurveDrawingInfo.tsdiff --git a/packages/2d/src/curves/CurvePoint.ts b/packages/2d/src/runtime/curves/CurvePoint.tssimilarity index 100%rename from packages/2d/src/curves/CurvePoint.tsrename to packages/2d/src/runtime/curves/CurvePoint.tsdiff --git a/packages/2d/src/curves/CurveProfile.ts b/packages/2d/src/runtime/curves/CurveProfile.tssimilarity index 100%rename from packages/2d/src/curves/CurveProfile.tsrename to packages/2d/src/runtime/curves/CurveProfile.tsdiff --git a/packages/2d/src/curves/KnotInfo.ts b/packages/2d/src/runtime/curves/KnotInfo.tssimilarity index 100%rename from packages/2d/src/curves/KnotInfo.tsrename to packages/2d/src/runtime/curves/KnotInfo.tsdiff --git a/packages/2d/src/curves/LineSegment.ts b/packages/2d/src/runtime/curves/LineSegment.tssimilarity index 100%rename from packages/2d/src/curves/LineSegment.tsrename to packages/2d/src/runtime/curves/LineSegment.tsdiff --git a/packages/2d/src/curves/Polynomial.ts b/packages/2d/src/runtime/curves/Polynomial.tssimilarity index 100%rename from packages/2d/src/curves/Polynomial.tsrename to packages/2d/src/runtime/curves/Polynomial.tsdiff --git a/packages/2d/src/curves/Polynomial2D.ts b/packages/2d/src/runtime/curves/Polynomial2D.tssimilarity index 100%rename from packages/2d/src/curves/Polynomial2D.tsrename to packages/2d/src/runtime/curves/Polynomial2D.tsdiff --git a/packages/2d/src/curves/PolynomialSegment.ts b/packages/2d/src/runtime/curves/PolynomialSegment.tssimilarity index 100%rename from packages/2d/src/curves/PolynomialSegment.tsrename to packages/2d/src/runtime/curves/PolynomialSegment.tsdiff --git a/packages/2d/src/curves/QuadBezierSegment.ts b/packages/2d/src/runtime/curves/QuadBezierSegment.tssimilarity index 100%rename from packages/2d/src/curves/QuadBezierSegment.tsrename to packages/2d/src/runtime/curves/QuadBezierSegment.tsdiff --git a/packages/2d/src/curves/Segment.ts b/packages/2d/src/runtime/curves/Segment.tssimilarity index 100%rename from packages/2d/src/curves/Segment.tsrename to packages/2d/src/runtime/curves/Segment.tsdiff --git a/packages/2d/src/curves/UniformPolynomialCurveSampler.ts b/packages/2d/src/runtime/curves/UniformPolynomialCurveSampler.tssimilarity index 100%rename from packages/2d/src/curves/UniformPolynomialCurveSampler.tsrename to packages/2d/src/runtime/curves/UniformPolynomialCurveSampler.tsdiff --git a/packages/2d/src/curves/createCurveProfileLerp.ts b/packages/2d/src/runtime/curves/createCurveProfileLerp.tssimilarity index 100%rename from packages/2d/src/curves/createCurveProfileLerp.tsrename to packages/2d/src/runtime/curves/createCurveProfileLerp.tsdiff --git a/packages/2d/src/curves/getBezierSplineProfile.ts b/packages/2d/src/runtime/curves/getBezierSplineProfile.tssimilarity index 100%rename from packages/2d/src/curves/getBezierSplineProfile.tsrename to packages/2d/src/runtime/curves/getBezierSplineProfile.tsdiff --git a/packages/2d/src/curves/getCircleProfile.ts b/packages/2d/src/runtime/curves/getCircleProfile.tssimilarity index 100%rename from packages/2d/src/curves/getCircleProfile.tsrename to packages/2d/src/runtime/curves/getCircleProfile.tsdiff --git a/packages/2d/src/curves/getPathProfile.ts b/packages/2d/src/runtime/curves/getPathProfile.tssimilarity index 100%rename from packages/2d/src/curves/getPathProfile.tsrename to packages/2d/src/runtime/curves/getPathProfile.tsdiff --git a/packages/2d/src/curves/getPointAtDistance.ts b/packages/2d/src/runtime/curves/getPointAtDistance.tssimilarity index 100%rename from packages/2d/src/curves/getPointAtDistance.tsrename to packages/2d/src/runtime/curves/getPointAtDistance.tsdiff --git a/packages/2d/src/curves/getPolylineProfile.test.ts b/packages/2d/src/runtime/curves/getPolylineProfile.test.tssimilarity index 100%rename from packages/2d/src/curves/getPolylineProfile.test.tsrename to packages/2d/src/runtime/curves/getPolylineProfile.test.tsdiff --git a/packages/2d/src/curves/getPolylineProfile.ts b/packages/2d/src/runtime/curves/getPolylineProfile.tssimilarity index 100%rename from packages/2d/src/curves/getPolylineProfile.tsrename to packages/2d/src/runtime/curves/getPolylineProfile.tsdiff --git a/packages/2d/src/curves/getRectProfile.ts b/packages/2d/src/runtime/curves/getRectProfile.tssimilarity index 100%rename from packages/2d/src/curves/getRectProfile.tsrename to packages/2d/src/runtime/curves/getRectProfile.tsdiff --git a/packages/2d/src/curves/index.ts b/packages/2d/src/runtime/curves/index.tssimilarity index 100%rename from packages/2d/src/curves/index.tsrename to packages/2d/src/runtime/curves/index.tsdiff --git a/packages/2d/src/decorators/canvasStyleSignal.ts b/packages/2d/src/runtime/decorators/canvasStyleSignal.tssimilarity index 100%rename from packages/2d/src/decorators/canvasStyleSignal.tsrename to packages/2d/src/runtime/decorators/canvasStyleSignal.tsdiff --git a/packages/2d/src/decorators/colorSignal.ts b/packages/2d/src/runtime/decorators/colorSignal.tssimilarity index 100%rename from packages/2d/src/decorators/colorSignal.tsrename to packages/2d/src/runtime/decorators/colorSignal.tsdiff --git a/packages/2d/src/decorators/compound.ts b/packages/2d/src/runtime/decorators/compound.tssimilarity index 100%rename from packages/2d/src/decorators/compound.tsrename to packages/2d/src/runtime/decorators/compound.tsdiff --git a/packages/2d/src/decorators/computed.ts b/packages/2d/src/runtime/decorators/computed.tssimilarity index 100%rename from packages/2d/src/decorators/computed.tsrename to packages/2d/src/runtime/decorators/computed.tsdiff --git a/packages/2d/src/decorators/defaultStyle.ts b/packages/2d/src/runtime/decorators/defaultStyle.tssimilarity index 100%rename from packages/2d/src/decorators/defaultStyle.tsrename to packages/2d/src/runtime/decorators/defaultStyle.tsdiff --git a/packages/2d/src/decorators/filtersSignal.ts b/packages/2d/src/runtime/decorators/filtersSignal.tssimilarity index 100%rename from packages/2d/src/decorators/filtersSignal.tsrename to packages/2d/src/runtime/decorators/filtersSignal.tsdiff --git a/packages/2d/src/decorators/index.ts b/packages/2d/src/runtime/decorators/index.tssimilarity index 100%rename from packages/2d/src/decorators/index.tsrename to packages/2d/src/runtime/decorators/index.tsdiff --git a/packages/2d/src/decorators/initializers.ts b/packages/2d/src/runtime/decorators/initializers.tssimilarity index 100%rename from packages/2d/src/decorators/initializers.tsrename to packages/2d/src/runtime/decorators/initializers.tsdiff --git a/packages/2d/src/decorators/signal.test.ts b/packages/2d/src/runtime/decorators/signal.test.tssimilarity index 100%rename from packages/2d/src/decorators/signal.test.tsrename to packages/2d/src/runtime/decorators/signal.test.tsdiff --git a/packages/2d/src/decorators/signal.ts b/packages/2d/src/runtime/decorators/signal.tssimilarity index 100%rename from packages/2d/src/decorators/signal.tsrename to packages/2d/src/runtime/decorators/signal.tsdiff --git a/packages/2d/src/decorators/spacingSignal.ts b/packages/2d/src/runtime/decorators/spacingSignal.tssimilarity index 100%rename from packages/2d/src/decorators/spacingSignal.tsrename to packages/2d/src/runtime/decorators/spacingSignal.tsdiff --git a/packages/2d/src/decorators/vector2Signal.ts b/packages/2d/src/runtime/decorators/vector2Signal.tssimilarity index 100%rename from packages/2d/src/decorators/vector2Signal.tsrename to packages/2d/src/runtime/decorators/vector2Signal.tsdiff --git a/packages/2d/src/globals.d.ts b/packages/2d/src/runtime/globals.d.tssimilarity index 100%rename from packages/2d/src/globals.d.tsrename to packages/2d/src/runtime/globals.d.tsdiff --git a/packages/2d/src/index.ts b/packages/2d/src/runtime/index.tssimilarity index 100%rename from packages/2d/src/index.tsrename to packages/2d/src/runtime/index.tsdiff --git a/packages/2d/src/jsx-dev-runtime.ts b/packages/2d/src/runtime/jsx-dev-runtime.tssimilarity index 100%rename from packages/2d/src/jsx-dev-runtime.tsrename to packages/2d/src/runtime/jsx-dev-runtime.tsdiff --git a/packages/2d/src/jsx-runtime.ts b/packages/2d/src/runtime/jsx-runtime.tssimilarity index 100%rename from packages/2d/src/jsx-runtime.tsrename to packages/2d/src/runtime/jsx-runtime.tsdiff --git a/packages/2d/src/parse-svg-path.d.ts b/packages/2d/src/runtime/parse-svg-path.d.tssimilarity index 100%rename from packages/2d/src/parse-svg-path.d.tsrename to packages/2d/src/runtime/parse-svg-path.d.tsdiff --git a/packages/2d/src/partials/Filter.ts b/packages/2d/src/runtime/partials/Filter.tssimilarity index 100%rename from packages/2d/src/partials/Filter.tsrename to packages/2d/src/runtime/partials/Filter.tsdiff --git a/packages/2d/src/partials/Gradient.ts b/packages/2d/src/runtime/partials/Gradient.tssimilarity index 100%rename from packages/2d/src/partials/Gradient.tsrename to packages/2d/src/runtime/partials/Gradient.tsdiff --git a/packages/2d/src/partials/Pattern.ts b/packages/2d/src/runtime/partials/Pattern.tssimilarity index 100%rename from packages/2d/src/partials/Pattern.tsrename to packages/2d/src/runtime/partials/Pattern.tsdiff --git a/packages/2d/src/partials/index.ts b/packages/2d/src/runtime/partials/index.tssimilarity index 100%rename from packages/2d/src/partials/index.tsrename to packages/2d/src/runtime/partials/index.tsdiff --git a/packages/2d/src/partials/types.ts b/packages/2d/src/runtime/partials/types.tssimilarity index 100%rename from packages/2d/src/partials/types.tsrename to packages/2d/src/runtime/partials/types.tsdiff --git a/packages/2d/src/scenes/Scene2D.ts b/packages/2d/src/runtime/scenes/Scene2D.tssimilarity index 100%rename from packages/2d/src/scenes/Scene2D.tsrename to packages/2d/src/runtime/scenes/Scene2D.tsdiff --git a/packages/2d/src/scenes/index.ts b/packages/2d/src/runtime/scenes/index.tssimilarity index 100%rename from packages/2d/src/scenes/index.tsrename to packages/2d/src/runtime/scenes/index.tsdiff --git a/packages/2d/src/scenes/makeScene2D.ts b/packages/2d/src/runtime/scenes/makeScene2D.tssimilarity index 100%rename from packages/2d/src/scenes/makeScene2D.tsrename to packages/2d/src/runtime/scenes/makeScene2D.tsdiff --git a/packages/2d/src/scenes/useScene2D.ts b/packages/2d/src/runtime/scenes/useScene2D.tssimilarity index 100%rename from packages/2d/src/scenes/useScene2D.tsrename to packages/2d/src/runtime/scenes/useScene2D.tsdiff --git a/packages/2d/src/runtime/tsconfig.json b/packages/2d/src/runtime/tsconfig.jsonnew file mode 100644index 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.jsonnew file mode 100644index 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.tssimilarity index 100%rename from packages/2d/src/utils/CanvasUtils.tsrename to packages/2d/src/runtime/utils/CanvasUtils.tsdiff --git a/packages/2d/src/utils/diff.test.ts b/packages/2d/src/runtime/utils/diff.test.tssimilarity index 100%rename from packages/2d/src/utils/diff.test.tsrename to packages/2d/src/runtime/utils/diff.test.tsdiff --git a/packages/2d/src/utils/diff.ts b/packages/2d/src/runtime/utils/diff.tssimilarity index 100%rename from packages/2d/src/utils/diff.tsrename to packages/2d/src/runtime/utils/diff.tsdiff --git a/packages/2d/src/utils/index.ts b/packages/2d/src/runtime/utils/index.tssimilarity index 100%rename from packages/2d/src/utils/index.tsrename to packages/2d/src/runtime/utils/index.tsdiff --git a/packages/2d/src/utils/is.ts b/packages/2d/src/runtime/utils/is.tssimilarity index 100%rename from packages/2d/src/utils/is.tsrename to packages/2d/src/runtime/utils/is.tsdiff --git a/packages/2d/src/utils/makeSignalExtensions.ts b/packages/2d/src/runtime/utils/makeSignalExtensions.tssimilarity index 100%rename from packages/2d/src/utils/makeSignalExtensions.tsrename to packages/2d/src/runtime/utils/makeSignalExtensions.tsdiff --git a/packages/2d/tsconfig.json b/packages/2d/src/tsconfig.base.jsonsimilarity index 56%rename from packages/2d/tsconfig.jsonrename to packages/2d/src/tsconfig.base.jsonindex 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.jsonnew file mode 100644index 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.jsondeleted file mode 100644index 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.tsindex 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.mjsindex 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.jsindex 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.jsindex 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.mjsdeleted file mode 100644index 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.mjsnew file mode 100644index 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,+ });+}