From 852c9782d5ea24e9e9b33dc60d550d657b00bd19 Mon Sep 17 00:00:00 2001 From: cha0s Date: Sat, 2 Apr 2022 05:50:23 -0500 Subject: [PATCH] refactor: integrate persea --- packages/behavior-persea/package.json | 2 +- packages/math-persea/.gitignore | 116 ------------------ packages/math-persea/package.json | 36 ------ packages/math-persea/test/exists.js | 5 - .../{math-persea => math}/build/flecks.yml | 0 packages/math/package.json | 4 + .../src/persea}/components/range/index.jsx | 0 .../src/persea}/components/range/index.scss | 0 .../persea}/components/rectangle/index.jsx | 0 .../persea}/components/rectangle/index.scss | 0 .../persea}/components/vector-range/index.jsx | 0 .../components/vector-range/index.scss | 0 .../src/persea}/components/vector/index.jsx | 0 .../src/persea}/components/vector/index.scss | 0 .../src => math/src/persea}/index.js | 0 packages/physics-persea/package.json | 2 +- .../physics-persea/src/traits/emitted.jsx | 2 +- packages/timing-persea/package.json | 1 - .../components/animation-visualization.jsx | 2 +- .../src/controllers/animation/component.jsx | 2 +- .../timing-persea/src/traits/animated.jsx | 2 +- 21 files changed, 10 insertions(+), 164 deletions(-) delete mode 100644 packages/math-persea/.gitignore delete mode 100644 packages/math-persea/package.json delete mode 100644 packages/math-persea/test/exists.js rename packages/{math-persea => math}/build/flecks.yml (100%) rename packages/{math-persea/src => math/src/persea}/components/range/index.jsx (100%) rename packages/{math-persea/src => math/src/persea}/components/range/index.scss (100%) rename packages/{math-persea/src => math/src/persea}/components/rectangle/index.jsx (100%) rename packages/{math-persea/src => math/src/persea}/components/rectangle/index.scss (100%) rename packages/{math-persea/src => math/src/persea}/components/vector-range/index.jsx (100%) rename packages/{math-persea/src => math/src/persea}/components/vector-range/index.scss (100%) rename packages/{math-persea/src => math/src/persea}/components/vector/index.jsx (100%) rename packages/{math-persea/src => math/src/persea}/components/vector/index.scss (100%) rename packages/{math-persea/src => math/src/persea}/index.js (100%) diff --git a/packages/behavior-persea/package.json b/packages/behavior-persea/package.json index 300280c..525019d 100644 --- a/packages/behavior-persea/package.json +++ b/packages/behavior-persea/package.json @@ -26,7 +26,7 @@ "test.js.map" ], "dependencies": { - "@avocado/math-persea": "^3.0.0", + "@avocado/math": "^3.0.0", "@avocado/react": "^3.0.0", "@avocado/resource-persea": "^3.0.0", "@flecks/core": "^1.4.1", diff --git a/packages/math-persea/.gitignore b/packages/math-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/math-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/math-persea/package.json b/packages/math-persea/package.json deleted file mode 100644 index 30ab2d2..0000000 --- a/packages/math-persea/package.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "@avocado/math-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/math-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.css", - "index.css.map", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@avocado/react": "^3.0.0", - "@flecks/core": "^1.4.1", - "@flecks/react": "^1.4.1" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/math-persea/test/exists.js b/packages/math-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/math-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/math-persea/build/flecks.yml b/packages/math/build/flecks.yml similarity index 100% rename from packages/math-persea/build/flecks.yml rename to packages/math/build/flecks.yml diff --git a/packages/math/package.json b/packages/math/package.json index bc5d6b7..8b3cd8f 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -20,6 +20,8 @@ "build", "index.js", "index.js.map", + "persea.js", + "persea.js.map", "src", "test", "test.js", @@ -27,7 +29,9 @@ ], "dependencies": { "@avocado/code": "^3.0.0", + "@avocado/react": "^3.0.0", "@flecks/core": "^1.4.1", + "@flecks/react": "^1.4.1", "graham_scan": "^1.0.4" }, "devDependencies": { diff --git a/packages/math-persea/src/components/range/index.jsx b/packages/math/src/persea/components/range/index.jsx similarity index 100% rename from packages/math-persea/src/components/range/index.jsx rename to packages/math/src/persea/components/range/index.jsx diff --git a/packages/math-persea/src/components/range/index.scss b/packages/math/src/persea/components/range/index.scss similarity index 100% rename from packages/math-persea/src/components/range/index.scss rename to packages/math/src/persea/components/range/index.scss diff --git a/packages/math-persea/src/components/rectangle/index.jsx b/packages/math/src/persea/components/rectangle/index.jsx similarity index 100% rename from packages/math-persea/src/components/rectangle/index.jsx rename to packages/math/src/persea/components/rectangle/index.jsx diff --git a/packages/math-persea/src/components/rectangle/index.scss b/packages/math/src/persea/components/rectangle/index.scss similarity index 100% rename from packages/math-persea/src/components/rectangle/index.scss rename to packages/math/src/persea/components/rectangle/index.scss diff --git a/packages/math-persea/src/components/vector-range/index.jsx b/packages/math/src/persea/components/vector-range/index.jsx similarity index 100% rename from packages/math-persea/src/components/vector-range/index.jsx rename to packages/math/src/persea/components/vector-range/index.jsx diff --git a/packages/math-persea/src/components/vector-range/index.scss b/packages/math/src/persea/components/vector-range/index.scss similarity index 100% rename from packages/math-persea/src/components/vector-range/index.scss rename to packages/math/src/persea/components/vector-range/index.scss diff --git a/packages/math-persea/src/components/vector/index.jsx b/packages/math/src/persea/components/vector/index.jsx similarity index 100% rename from packages/math-persea/src/components/vector/index.jsx rename to packages/math/src/persea/components/vector/index.jsx diff --git a/packages/math-persea/src/components/vector/index.scss b/packages/math/src/persea/components/vector/index.scss similarity index 100% rename from packages/math-persea/src/components/vector/index.scss rename to packages/math/src/persea/components/vector/index.scss diff --git a/packages/math-persea/src/index.js b/packages/math/src/persea/index.js similarity index 100% rename from packages/math-persea/src/index.js rename to packages/math/src/persea/index.js diff --git a/packages/physics-persea/package.json b/packages/physics-persea/package.json index 776743a..9348804 100644 --- a/packages/physics-persea/package.json +++ b/packages/physics-persea/package.json @@ -29,7 +29,7 @@ "@avocado/entity": "^3.0.0", "@avocado/entity-persea": "^3.0.0", "@avocado/graphics": "^3.0.0", - "@avocado/math-persea": "^3.0.0", + "@avocado/math": "^3.0.0", "@avocado/react": "^3.0.0", "@avocado/resource-persea": "^3.0.0", "@flecks/core": "^1.4.1", diff --git a/packages/physics-persea/src/traits/emitted.jsx b/packages/physics-persea/src/traits/emitted.jsx index 58b6bfe..cd9959e 100644 --- a/packages/physics-persea/src/traits/emitted.jsx +++ b/packages/physics-persea/src/traits/emitted.jsx @@ -9,7 +9,7 @@ import { rangePropType, VectorRange, vectorRangePropType, -} from '@avocado/math-persea'; +} from '@avocado/math/persea'; import { hot, PropTypes, diff --git a/packages/timing-persea/package.json b/packages/timing-persea/package.json index ce79797..83ae6c9 100644 --- a/packages/timing-persea/package.json +++ b/packages/timing-persea/package.json @@ -28,7 +28,6 @@ "dependencies": { "@avocado/graphics": "^3.0.0", "@avocado/math": "^3.0.0", - "@avocado/math-persea": "^3.0.0", "@avocado/react": "^3.0.0", "@avocado/resource-persea": "^3.0.0", "@avocado/timing": "^3.0.0", diff --git a/packages/timing-persea/src/components/animation-visualization.jsx b/packages/timing-persea/src/components/animation-visualization.jsx index b42c544..804341a 100644 --- a/packages/timing-persea/src/components/animation-visualization.jsx +++ b/packages/timing-persea/src/components/animation-visualization.jsx @@ -4,7 +4,7 @@ import './animation-visualization.scss'; import {Container, Stage} from '@avocado/graphics'; import {Vector} from '@avocado/math'; -import {vectorPropType} from '@avocado/math-persea'; +import {vectorPropType} from '@avocado/math/persea'; import {AnimationView} from '@avocado/timing'; import { PropTypes, diff --git a/packages/timing-persea/src/controllers/animation/component.jsx b/packages/timing-persea/src/controllers/animation/component.jsx index ef49fb9..3d1e89e 100644 --- a/packages/timing-persea/src/controllers/animation/component.jsx +++ b/packages/timing-persea/src/controllers/animation/component.jsx @@ -10,7 +10,7 @@ import {Number} from '@avocado/react'; import { Vector as VectorComponent, vectorPropType, -} from '@avocado/math-persea'; +} from '@avocado/math/persea'; import {useJsonPatcher} from '@avocado/resource-persea'; import AnimationVisualization from '@avocado/timing-persea/components/animation-visualization'; diff --git a/packages/timing-persea/src/traits/animated.jsx b/packages/timing-persea/src/traits/animated.jsx index ce60812..0ac8a9b 100644 --- a/packages/timing-persea/src/traits/animated.jsx +++ b/packages/timing-persea/src/traits/animated.jsx @@ -2,7 +2,7 @@ import './animated.scss'; import {join} from 'path'; -import {Vector as VectorComponent} from '@avocado/math-persea'; +import {Vector as VectorComponent} from '@avocado/math/persea'; import {Number} from '@avocado/react'; import {JsonTabs, useJsonPatcher} from '@avocado/resource-persea'; import {