From 7ad3acc20517cf6259a4810530daffe69b1dae13 Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Fri, 3 Feb 2023 08:57:37 +0800 Subject: [PATCH] [*] submodule --- taoyao-client/package-lock.json | 4 ++-- taoyao-client/package.json | 6 ++++-- taoyao-client/vite.config.js | 14 +++++++------- taoyao-media-server/.gitmodules | 2 ++ taoyao-media-server/README.md | 2 +- taoyao-media-server/package.json | 3 +-- taoyao-media-server/{ => src}/config.js | 0 taoyao-media-server/{ => src}/server.js | 0 taoyao-media-server/{ => src}/signal.js | 0 9 files changed, 17 insertions(+), 14 deletions(-) rename taoyao-media-server/{ => src}/config.js (100%) rename taoyao-media-server/{ => src}/server.js (100%) rename taoyao-media-server/{ => src}/signal.js (100%) diff --git a/taoyao-client/package-lock.json b/taoyao-client/package-lock.json index 3ecbc96..a35a657 100644 --- a/taoyao-client/package-lock.json +++ b/taoyao-client/package-lock.json @@ -1,6 +1,6 @@ { - "name": "client", - "version": "0.0.0", + "name": "taoyao-client", + "version": "1.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/taoyao-client/package.json b/taoyao-client/package.json index 82cd247..75ff02d 100644 --- a/taoyao-client/package.json +++ b/taoyao-client/package.json @@ -1,7 +1,9 @@ { - "name": "client", - "version": "0.0.0", + "name": "taoyao-client", + "author": "acgist", + "version": "1.0.0", "private": true, + "description": "taoyao client", "scripts": { "dev": "vite", "build": "vite build", diff --git a/taoyao-client/vite.config.js b/taoyao-client/vite.config.js index de5cb31..4d60b3a 100644 --- a/taoyao-client/vite.config.js +++ b/taoyao-client/vite.config.js @@ -1,14 +1,14 @@ -import { fileURLToPath, URL } from 'node:url' +import { fileURLToPath, URL } from "node:url"; -import { defineConfig } from 'vite' -import vue from '@vitejs/plugin-vue' +import { defineConfig } from "vite"; +import vue from "@vitejs/plugin-vue"; // https://vitejs.dev/config/ export default defineConfig({ plugins: [vue()], resolve: { alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) - } - } -}) + "@": fileURLToPath(new URL("./src", import.meta.url)), + }, + }, +}); diff --git a/taoyao-media-server/.gitmodules b/taoyao-media-server/.gitmodules index 5bac961..5ad8654 100644 --- a/taoyao-media-server/.gitmodules +++ b/taoyao-media-server/.gitmodules @@ -1,2 +1,4 @@ [submodule "mediasoup"] + path = mediasoup + url = git@github.com:acgist/mediasoup.git branch = taoyao diff --git a/taoyao-media-server/README.md b/taoyao-media-server/README.md index 85eb6fc..fe780a2 100644 --- a/taoyao-media-server/README.md +++ b/taoyao-media-server/README.md @@ -10,7 +10,7 @@ # git config -f .gitmodules submodule.mediasoup.branch taoyao # 更新 -git submodule init +git submodule init git submodule update # git submodule update --remote diff --git a/taoyao-media-server/package.json b/taoyao-media-server/package.json index a117036..bac57ef 100644 --- a/taoyao-media-server/package.json +++ b/taoyao-media-server/package.json @@ -3,10 +3,9 @@ "author": "acgist", "version": "1.0.0", "private": true, - "license": "All Rights Reserved", "description": "taoyao media server", "scripts": { - "start": "DEBUG=${DEBUG:='*mediasoup* *INFO* *WARN* *ERROR*'} INTERACTIVE=${INTERACTIVE:='true'} node server.js" + "start": "DEBUG=${DEBUG:='*mediasoup* *INFO* *WARN* *ERROR*'} INTERACTIVE=${INTERACTIVE:='true'} node src/server.js" }, "dependencies": { "mediasoup": "file:./mediasoup" diff --git a/taoyao-media-server/config.js b/taoyao-media-server/src/config.js similarity index 100% rename from taoyao-media-server/config.js rename to taoyao-media-server/src/config.js diff --git a/taoyao-media-server/server.js b/taoyao-media-server/src/server.js similarity index 100% rename from taoyao-media-server/server.js rename to taoyao-media-server/src/server.js diff --git a/taoyao-media-server/signal.js b/taoyao-media-server/src/signal.js similarity index 100% rename from taoyao-media-server/signal.js rename to taoyao-media-server/src/signal.js