Divide the repo into workspaces

baku89 · Jun 12, 2024 · e987830 · e987830
1 parent 8749520
commit e987830
Show file tree

Hide file tree

Showing 42 changed files with 582 additions and 1,017 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -43,15 +43,15 @@ jobs:
       - name: Build
         uses: borales/actions-yarn@v4
         with:
-          cmd: build:demo
+          cmd: build:doc
 
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:
           # Upload dist repository
-          path: './demo/dist'
+          path: './doc/dist'
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v1
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ node_modules
 
 lib
 *.tsbuildinfo
-demo/dist
+doc/dist
 
 *.log
 .vscode/launch.json
diff --git a/core/package.json b/core/package.json
@@ -0,0 +1,48 @@
+{
+	"name": "tethr",
+	"author": "Baku Hashimoto <mail@baku89.com> (https://baku89.com)",
+	"version": "0.2.0",
+	"description": "Controlls USB-connected cameras, webcam, and smartphone camera from browser",
+	"main": "lib/index.js",
+	"types": "lib/index.d.ts",
+	"repository": "https://github.com/baku89/tethr",
+	"sideEffects": false,
+	"keywords": [
+		"camera",
+		"webcam",
+		"tethered",
+		"photo",
+		"gphoto2",
+		"shooting",
+		"dslr",
+		"webusb",
+		"ptp"
+	],
+	"scripts": {
+		"build": "tsc",
+		"prepare": "npm run build"
+	},
+	"files": [
+		"lib"
+	],
+	"homepage": "https://baku89.github.io/tethr/",
+	"license": "MIT",
+	"dependencies": {
+		"bim": "^1.3.3",
+		"date-format-parse": "^0.2.7",
+		"eventemitter3": "^5.0.1",
+		"lodash": "^4.17.21",
+		"p-queue": "^8.0.1",
+		"p-timeout": "^6.1.2",
+		"sleep-promise": "^9.1.0",
+		"typescript-memoize": "^1.1.1"
+	},
+	"devDependencies": {
+		"@types/lodash": "^4.14.202",
+		"@types/w3c-image-capture": "^1.0.10",
+		"@types/w3c-web-usb": "^1.0.10",
+		"@typescript-eslint/eslint-plugin": "^6.19.1",
+		"@typescript-eslint/parser": "^6.19.1",
+		"linearly": "^0.21.0"
+	}
+}
diff --git a/src/DeviceInfo.ts → core/src/DeviceInfo.ts b/src/DeviceInfo.ts → core/src/DeviceInfo.ts
diff --git a/src/IFD.ts → core/src/IFD.ts b/src/IFD.ts → core/src/IFD.ts
diff --git a/src/PTPDataView.ts → core/src/PTPDataView.ts b/src/PTPDataView.ts → core/src/PTPDataView.ts
diff --git a/src/PTPDatacode.ts → core/src/PTPDatacode.ts b/src/PTPDatacode.ts → core/src/PTPDatacode.ts
diff --git a/src/PTPDevice.ts → core/src/PTPDevice.ts b/src/PTPDevice.ts → core/src/PTPDevice.ts
diff --git a/src/Tethr.ts → core/src/Tethr.ts b/src/Tethr.ts → core/src/Tethr.ts
diff --git a/src/TethrManager.ts → core/src/TethrManager.ts b/src/TethrManager.ts → core/src/TethrManager.ts
diff --git a/src/TethrObject.ts → core/src/TethrObject.ts b/src/TethrObject.ts → core/src/TethrObject.ts
diff --git a/src/TethrPTPUSB/TethrPTPUSB.ts → core/src/TethrPTPUSB/TethrPTPUSB.ts b/src/TethrPTPUSB/TethrPTPUSB.ts → core/src/TethrPTPUSB/TethrPTPUSB.ts
diff --git a/src/TethrPTPUSB/TethrPanasonic.ts → core/src/TethrPTPUSB/TethrPanasonic.ts b/src/TethrPTPUSB/TethrPanasonic.ts → core/src/TethrPTPUSB/TethrPanasonic.ts
diff --git a/src/TethrPTPUSB/TethrRicohTheta.ts → core/src/TethrPTPUSB/TethrRicohTheta.ts b/src/TethrPTPUSB/TethrRicohTheta.ts → core/src/TethrPTPUSB/TethrRicohTheta.ts
@@ -1,5 +1,4 @@
 import {BiMap} from 'bim'
-import {ConfigDesc} from 'src/Tethr'
 
 import {
 	ExposureMode,
@@ -9,6 +8,7 @@ import {
 	WhiteBalanceTable,
 } from '../configs'
 import {DatatypeCode, DevicePropCode} from '../PTPDatacode'
+import {ConfigDesc} from '../Tethr'
 import {TethrPTPUSB} from './TethrPTPUSB'
 
 enum DevicePropCodeRicohTheta {

diff --git a/src/TethrPTPUSB/TethrSigma.ts → core/src/TethrPTPUSB/TethrSigma.ts b/src/TethrPTPUSB/TethrSigma.ts → core/src/TethrPTPUSB/TethrSigma.ts
diff --git a/src/TethrPTPUSB/getVendorSpecificPTPUSB.ts → ...rc/TethrPTPUSB/getVendorSpecificPTPUSB.ts b/src/TethrPTPUSB/getVendorSpecificPTPUSB.ts → ...rc/TethrPTPUSB/getVendorSpecificPTPUSB.ts
diff --git a/src/TethrPTPUSB/index.ts → core/src/TethrPTPUSB/index.ts b/src/TethrPTPUSB/index.ts → core/src/TethrPTPUSB/index.ts
diff --git a/src/TethrStorage.ts → core/src/TethrStorage.ts b/src/TethrStorage.ts → core/src/TethrStorage.ts
diff --git a/src/TethrWebcam.ts → core/src/TethrWebcam.ts b/src/TethrWebcam.ts → core/src/TethrWebcam.ts
diff --git a/src/configs.ts → core/src/configs.ts b/src/configs.ts → core/src/configs.ts
diff --git a/src/index.ts → core/src/index.ts b/src/index.ts → core/src/index.ts
diff --git a/src/util.ts → core/src/util.ts b/src/util.ts → core/src/util.ts
diff --git a/core/tsconfig.json b/core/tsconfig.json
@@ -0,0 +1,7 @@
+{
+	"extends": "../tsconfig.json",
+	"compilerOptions": {
+		"outDir": "./lib/",
+		"rootDir": "src",
+	},
+}
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
diff --git a/demo/.eslintrc.js → doc/.eslintrc.js b/demo/.eslintrc.js → doc/.eslintrc.js
diff --git a/demo/env.d.ts → doc/env.d.ts b/demo/env.d.ts → doc/env.d.ts
diff --git a/demo/index.html → doc/index.html b/demo/index.html → doc/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />

diff --git a/doc/package.json b/doc/package.json
@@ -0,0 +1,23 @@
+{
+	"name": "@tethr/doc",
+	"version": "1.0.0",
+	"scripts": {
+		"dev": "vite",
+		"build": "vite build"
+	},
+	"devDependencies": {
+		"@types/file-saver": "^2.0.7",
+		"@types/wicg-file-system-access": "^2023.10.4",
+		"@vitejs/plugin-vue": "^5.0.3",
+		"@vue/eslint-config-prettier": "^9.0.0",
+		"@vue/eslint-config-typescript": "^12.0.0",
+		"@vue/tsconfig": "^0.5.1",
+		"eslint-plugin-vue": "^9.20.1",
+		"file-saver": "^2.0.5",
+		"stylus": "^0.63.0",
+		"vite": "^5.0.12",
+		"vue": "^3.4.15",
+		"vue-tsc": "^1.8.27"
+	},
+	"dependencies": {}
+}
diff --git a/demo/src/App.vue → doc/src/App.vue b/demo/src/App.vue → doc/src/App.vue
@@ -124,12 +124,12 @@
 </template>
 
 <script lang="ts" setup>
+import {useTethr} from '@tethr/vue3'
 import {saveAs} from 'file-saver'
 import {Tethr, TethrObject} from 'tethr'
 import {ref, watchEffect} from 'vue'
 
 import TethrConfig from './TethrConfig.vue'
-import {useTethr} from './useTethr'
 
 const folderHandler = ref<FileSystemDirectoryHandle | null>(null)
 
@@ -274,3 +274,4 @@ dl
 	button
 		width 100%
 </style>
+../../integrations/vue3/useTethr
diff --git a/demo/src/InputRange.vue → doc/src/InputRange.vue b/demo/src/InputRange.vue → doc/src/InputRange.vue
diff --git a/demo/src/TethrConfig.vue → doc/src/TethrConfig.vue b/demo/src/TethrConfig.vue → doc/src/TethrConfig.vue
diff --git a/demo/src/main.ts → doc/src/main.ts b/demo/src/main.ts → doc/src/main.ts
diff --git a/demo/src/style.styl → doc/src/style.styl b/demo/src/style.styl → doc/src/style.styl
diff --git a/doc/tsconfig.json b/doc/tsconfig.json
@@ -0,0 +1,13 @@
+{
+	"extends": ["@vue/tsconfig/tsconfig.dom", "../tsconfig"],
+	"include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
+	"compilerOptions": {
+		"baseUrl": ".",
+		"lib": ["esnext", "dom", "dom.iterable"],
+		"paths": {
+			"tethr": ["../core/src"],
+			"@tethr/vue3": ["../integrations/vue3"],
+		},
+	},
+	"references": [{"path": ".."}],
+}
diff --git a/demo/vite.config.ts → doc/vite.config.ts b/demo/vite.config.ts → doc/vite.config.ts
@@ -8,7 +8,8 @@ export default defineConfig({
 	plugins: [vue()],
 	resolve: {
 		alias: {
-			tethr: path.resolve('./src'),
+			tethr: path.resolve('../core/src'),
+			'@tethr/vue3': path.resolve('../integrations/vue3'),
 		},
 	},
 	define: {

diff --git a/integrations/vue3/package.json b/integrations/vue3/package.json
@@ -0,0 +1,17 @@
+{
+	"name": "@tethr/vue3",
+	"version": "1.0.0",
+	"main": "lib/index.js",
+	"types": "lib/index.d.ts",
+	"scripts": {
+		"build": "tsc",
+		"prepare": "npm run build"
+	},
+	"files": [
+		"index.js"
+	],
+	"dependencies": {
+		"vue": "^3.0.0",
+		"tethr": "^0.2.0"
+	}
+}
diff --git a/demo/src/useTethr.ts → integrations/vue3/src/index.ts b/demo/src/useTethr.ts → integrations/vue3/src/index.ts
diff --git a/integrations/vue3/tsconfig.json b/integrations/vue3/tsconfig.json
@@ -0,0 +1,7 @@
+{
+	"extends": "../../tsconfig.json",
+	"compilerOptions": {
+		"outDir": "./lib/",
+		"rootDir": "src",
+	},
+}
diff --git a/package.json b/package.json
@@ -1,75 +1,24 @@
 {
-	"name": "tethr",
-	"author": "Baku Hashimoto <mail@baku89.com> (https://baku89.com)",
-	"version": "0.2.0",
-	"description": "Tethers USB-connected cameras, webcam, and smartphone camera from browser",
-	"main": "lib/index.js",
-	"types": "lib/index.d.ts",
-	"repository": "https://github.com/baku89/tethr",
-	"sideEffects": false,
-	"keywords": [
-		"camera",
-		"webcam",
-		"tethered",
-		"photo",
-		"shooting",
-		"dslr",
-		"webusb",
-		"ptp"
-	],
+	"name": "@tethr/monorepo",
+	"version": "0.0.0",
+	"private": true,
 	"scripts": {
-		"dev": "vite serve demo",
-		"lint": "eslint --fix src --ext .ts --ignore-path .gitignore",
-		"lint:demo": "eslint --fix demo/src --ext .ts,.vue --ignore-path .gitignore",
-		"format": "prettier --write src",
-		"format:demo": "prettier --wite demo/src",
-		"fix": "npm run format && npm run lint",
-		"fix:demo": "npm run format:demo && npm run lint:demo",
-		"build": "tsc --p tsconfig.json",
-		"build:demo": "vue-tsc --p demo/tsconfig.json --noEmit && vite build demo",
-		"prepare": "npm run build"
+		"dev": "npm run dev --w doc",
+		"build": "npm run build --w core",
+		"build:doc": "npm run build --w doc"
 	},
-	"files": [
-		"lib"
+	"workspaces": [
+		"core",
+		"doc",
+		"integrations/*"
 	],
-	"homepage": "https://baku89.github.io/tethr/",
-	"license": "MIT",
-	"dependencies": {
-		"bim": "^1.3.3",
-		"date-format-parse": "^0.2.7",
-		"eventemitter3": "^5.0.1",
-		"lodash": "^4.17.21",
-		"p-queue": "^8.0.1",
-		"p-timeout": "^6.1.2",
-		"sleep-promise": "^9.1.0",
-		"typescript-memoize": "^1.1.1"
-	},
 	"devDependencies": {
-		"@types/file-saver": "^2.0.7",
-		"@types/lodash": "^4.14.202",
-		"@types/w3c-image-capture": "^1.0.10",
-		"@types/w3c-web-usb": "^1.0.10",
-		"@types/wicg-file-system-access": "^2023.10.4",
-		"@typescript-eslint/eslint-plugin": "^6.19.1",
-		"@typescript-eslint/parser": "^6.19.1",
-		"@vitejs/plugin-vue": "^5.0.3",
-		"@vue/eslint-config-prettier": "^9.0.0",
-		"@vue/eslint-config-typescript": "^12.0.0",
-		"@vue/tsconfig": "^0.5.1",
+		"typescript": "^5.4.5",
 		"eslint": "^8.56.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-import": "^2.29.1",
 		"eslint-plugin-simple-import-sort": "^10.0.0",
 		"eslint-plugin-unused-imports": "^3.0.0",
-		"eslint-plugin-vue": "^9.20.1",
-		"file-saver": "^2.0.5",
-		"linearly": "^0.21.0",
-		"npm-run-all": "^4.1.5",
-		"prettier": "^3.2.4",
-		"stylus": "^0.62.0",
-		"typescript": "^5.4.5",
-		"vite": "^5.0.12",
-		"vue": "^3.4.15",
-		"vue-tsc": "^1.8.27"
+		"prettier": "^3.2.4"
 	}
 }
diff --git a/tsconfig.common.json b/tsconfig.common.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,9 +1,18 @@
 {
-	"extends": "./tsconfig.common",
 	"compilerOptions": {
-		"outDir": "./lib/",
-		"rootDir": "./src",
-		"composite": true,
+		"target": "es2022",
+		"module": "esnext",
+		"strict": true,
+		"importHelpers": true,
+		"moduleResolution": "node",
+		"skipLibCheck": true,
+		"verbatimModuleSyntax": false,
+		"experimentalDecorators": true,
+		"esModuleInterop": true,
+		"allowSyntheticDefaultImports": true,
+		"sourceMap": true,
+		"baseUrl": ".",
+		"lib": ["esnext", "dom", "dom.iterable"]
 	},
-	"include": ["src/**/*.ts"],
+	"exclude": ["node_modules"]
 }