From c72647c1e52046910159a0a3924beef2bd512456 Mon Sep 17 00:00:00 2001 From: Aria Minaei Date: Fri, 18 Jun 2021 19:54:35 +0200 Subject: [PATCH] Update package.json files --- packages/dataverse/package.json | 8 +- packages/plugin-r3f/package.json | 5 + packages/react/.gitignore | 1 - packages/react/LICENSE | 203 ------------------------------- packages/react/package.json | 35 ------ packages/react/src/index.ts | 78 ------------ packages/react/tsconfig.json | 19 --- theatre/core/package.json | 19 ++- theatre/studio/package.json | 19 +-- yarn.lock | 30 ----- 10 files changed, 38 insertions(+), 379 deletions(-) delete mode 100644 packages/react/.gitignore delete mode 100644 packages/react/LICENSE delete mode 100644 packages/react/package.json delete mode 100644 packages/react/src/index.ts delete mode 100644 packages/react/tsconfig.json diff --git a/packages/dataverse/package.json b/packages/dataverse/package.json index 45c7dd4..0fe0176 100644 --- a/packages/dataverse/package.json +++ b/packages/dataverse/package.json @@ -1,12 +1,17 @@ { "name": "@theatre/dataverse", - "version": "1.0.0-dev", + "version": "1.0.0-dev.1", "license": "Apache-2.0", "author": { "name": "Aria Minaei", "email": "aria@theatrejs.com", "url": "https://github.com/AriaMinaei" }, + "repository": { + "type": "git", + "url": "https://github.com/AriaMinaei/theatre", + "directory": "packages/dataverse" + }, "source": "src/index.ts", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -22,7 +27,6 @@ "@types/jest": "^26.0.23", "@types/lodash-es": "^4.17.4", "@types/node": "^15.6.2", - "@types/react": "^17.0.9", "typescript": "^4.3.2" }, "dependencies": { diff --git a/packages/plugin-r3f/package.json b/packages/plugin-r3f/package.json index d867898..e559806 100644 --- a/packages/plugin-r3f/package.json +++ b/packages/plugin-r3f/package.json @@ -14,6 +14,11 @@ "url": "https://github.com/AriaMinaei" } ], + "repository": { + "type": "git", + "url": "https://github.com/AriaMinaei/theatre", + "directory": "packages/plugin-r3f" + }, "source": "src/index.tsx", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/react/.gitignore b/packages/react/.gitignore deleted file mode 100644 index 3e22129..0000000 --- a/packages/react/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/dist \ No newline at end of file diff --git a/packages/react/LICENSE b/packages/react/LICENSE deleted file mode 100644 index 6b0b127..0000000 --- a/packages/react/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/packages/react/package.json b/packages/react/package.json deleted file mode 100644 index efab402..0000000 --- a/packages/react/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "@theatre/react", - "version": "0.1.0-dev", - "private": "true", - "license": "Apache-2.0", - "author": "TheaterJS Oy", - "source": "src/index.ts", - "main": "dist/index.js", - "exports": "./dist/index.modern.js", - "module": "dist/index.module.js", - "unpkg": "dist/index.umd.js", - "scripts": { - "build": "microbundle", - "dev": "microbundle watch" - }, - "peerDependencies": { - "@theatre/studio": "*", - "@types/react": "^17.0.3", - "react": "^17.0.2" - }, - "devDependencies": { - "@types/jest": "^26.0.23", - "@types/lodash": "^4.14.170", - "@types/lodash-es": "^4.17.4", - "@types/node": "^15.6.2", - "@types/react": "^17.0.9", - "microbundle": "^0.13.0", - "react": "^17.0.2", - "theatre": "*", - "typescript": "^4.3.2" - }, - "dependencies": { - "lodash-es": "^4.17.21" - } -} diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts deleted file mode 100644 index 4bc32a7..0000000 --- a/packages/react/src/index.ts +++ /dev/null @@ -1,78 +0,0 @@ -// // import {val} from '@theatre/shared/utils/DataVerse/Atom' -// // import type IDerivation from '@theatre/shared/utils/DataVerse/derivations/IDerivation' -// // import prism from '@theatre/shared/utils/DataVerse/derivations/prism/prism' -// // import {TickerContext} from '@theatre/shared/utils/react/TickerContext' -// import {useContext, useEffect, useMemo, useState} from "react" - -// export function usePrism(fn: () => T, deps: unknown[]): T { -// const derivation = useMemo(() => prism(fn), deps) - -// return useDerivation(derivation) -// } - -// export const useVal: typeof val = (p) => { -// return usePrism(() => val(p), [p]) -// } - -// /** -// * Based mostly on https://github.com/facebook/react/blob/a511dc7090523ee49ce21a08e55c41917d8af311/packages/use-subscription/src/useSubscription.js -// */ -// function useDerivation(der: IDerivation): T { -// const ticker = useContext(TickerContext) - -// const [state, setState] = useState(() => der.getValue()) - -// useEffect(() => { -// let untapped = false -// const untap = der.changes(ticker).tap((newValue) => { -// if (untapped) return -// setState(() => newValue) -// }) - -// setState(() => der.getValue()) - -// return () => { -// untapped = true -// untap() -// } -// }, [der, ticker]) - -// return state -// } - -// // /** -// // * This makes sure the prism derivation remains hot as long as the -// // * component calling the hook is alive, but it does not -// // * return the value of the derivation, and it does not -// // * re-render the component if the value of the derivation changes. -// // */ -// // export function usePrismWithoutReRender( -// // fn: () => T, -// // deps: unknown[], -// // ): IDerivation { -// // const derivation = useMemo(() => prism(fn), deps) - -// // return useDerivationWithoutReRender(derivation) -// // } - -// // /** -// // * This makes sure the derivation remains hot as long as the -// // * component calling the hook is alive, but it does not -// // * return the value of the derivation, and it does not -// // * re-render the component if the value of the derivation changes. -// // */ -// // export function useDerivationWithoutReRender( -// // der: IDerivation, -// // ): IDerivation { -// // useEffect(() => { -// // const untap = der.keepHot() - -// // return () => { -// // untap() -// // } -// // }, [der]) - -// // return der -// // } - -export {} diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json deleted file mode 100644 index cf4e057..0000000 --- a/packages/react/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "compilerOptions": { - "outDir": "dist", - "module": "ESNext", - "target": "ESNext", - "lib": ["es2017", "dom", "ESNext"], - "jsx": "react", - "moduleResolution": "node", - "baseUrl": ".", - "allowSyntheticDefaultImports": true, - "strict": true, - "noEmit": true, - "skipLibCheck": true, - "isolatedModules": true, - "types": ["jest"] - }, - "include": ["./src/**/*"], - "exclude": ["**/node_modules", "**/.*", "./xeno", "./dist", "./.temp"] -} diff --git a/theatre/core/package.json b/theatre/core/package.json index 6bce5a1..e9fe5bb 100644 --- a/theatre/core/package.json +++ b/theatre/core/package.json @@ -1,7 +1,20 @@ { "name": "@theatre/core", - "main": "dist/index.js", + "version": "0.4.0-dev.1", "license": "Apache-2.0", + "description": "Motion design editor for the web", + "repository": { + "type": "git", + "url": "https://github.com/AriaMinaei/theatre", + "directory": "theatre/core" + }, + "author": { + "name": "TheaterJS Oy", + "email": "hello@theatrejs.com", + "url": "https://www.theatrejs.com" + }, + "main": "dist/index.js", + "types": "dist/index.d.ts", "files": [ "dist/index.js", "dist/index.d.ts", @@ -10,10 +23,8 @@ "scripts": { "prepack": "cd .. && yarn run prepare" }, + "sideEffects": true, "dependencies": { "@theatre/dataverse": "workspace:*" - }, - "devDependencies": { - "typescript": "^4.3.2" } } diff --git a/theatre/studio/package.json b/theatre/studio/package.json index be272be..687310d 100644 --- a/theatre/studio/package.json +++ b/theatre/studio/package.json @@ -1,8 +1,18 @@ { "name": "@theatre/studio", - "version": "0.3.0-dev.1", + "version": "0.4.0-dev.1", "license": "AGPL-3.0-only", - "description": "", + "description": "Motion design editor for the web", + "repository": { + "type": "git", + "url": "https://github.com/AriaMinaei/theatre", + "directory": "theatre/studio" + }, + "author": { + "name": "TheaterJS Oy", + "email": "hello@theatrejs.com", + "url": "https://www.theatrejs.com" + }, "main": "dist/index.js", "types": "dist/index.d.ts", "files": [ @@ -13,12 +23,7 @@ "scripts": { "prepack": "cd .. && yarn run prepare" }, - "repository": { - "type": "https", - "url": "https://github.com/AriaMinaei/theatrejs" - }, "sideEffects": true, - "author": "TheaterJS Oy", "dependencies": { "@theatre/dataverse": "workspace:*" }, diff --git a/yarn.lock b/yarn.lock index 660b0c3..8d8d492 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3744,7 +3744,6 @@ __metadata: resolution: "@theatre/core@workspace:theatre/core" dependencies: "@theatre/dataverse": "workspace:*" - typescript: ^4.3.2 languageName: unknown linkType: soft @@ -3768,7 +3767,6 @@ __metadata: "@types/jest": ^26.0.23 "@types/lodash-es": ^4.17.4 "@types/node": ^15.6.2 - "@types/react": ^17.0.9 lodash-es: ^4.17.21 typescript: ^4.3.2 languageName: unknown @@ -3804,27 +3802,6 @@ __metadata: languageName: unknown linkType: soft -"@theatre/react@workspace:packages/react": - version: 0.0.0-use.local - resolution: "@theatre/react@workspace:packages/react" - dependencies: - "@types/jest": ^26.0.23 - "@types/lodash": ^4.14.170 - "@types/lodash-es": ^4.17.4 - "@types/node": ^15.6.2 - "@types/react": ^17.0.9 - lodash-es: ^4.17.21 - microbundle: ^0.13.0 - react: ^17.0.2 - theatre: "*" - typescript: ^4.3.2 - peerDependencies: - "@theatre/studio": "*" - "@types/react": ^17.0.3 - react: ^17.0.2 - languageName: unknown - linkType: soft - "@theatre/shared@workspace:theatre/shared": version: 0.0.0-use.local resolution: "@theatre/shared@workspace:theatre/shared" @@ -19359,13 +19336,6 @@ resolve@1.17.0: languageName: unknown linkType: soft -"theatre@npm:*": - version: 0.2.3 - resolution: "theatre@npm:0.2.3" - checksum: a5aba0a490920c52451b0143b81c99c781cd2dc9250b885bbd498ba30360ca4c723a89a6bafc9e92c2c5496b66a04d4714b159a6e6bf337b7f5b6c3a79ff0ca6 - languageName: node - linkType: hard - "three-stdlib@npm:^2.0.1": version: 2.0.5 resolution: "three-stdlib@npm:2.0.5"