diff --git a/.dockerignore b/.dockerignore index e288e25..b874796 100644 --- a/.dockerignore +++ b/.dockerignore @@ -11,5 +11,5 @@ demo-vaults data tmp **/dist -packages/bridge-plugin/main.js +packages/bridge/main.js apps/ignis-server/server/plugins/*/plugin/main.js diff --git a/.gitignore b/.gitignore index f1c2415..03d3003 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ dist/ investigation/ vaults/ packages/*/dist/ -packages/bridge-plugin/main.js +packages/bridge/main.js apps/ignis-server/server/plugins/*/plugin/main.js demo-vaults/ data/ diff --git a/apps/ignis-server/Dockerfile b/apps/ignis-server/Dockerfile index 95592fc..161f03c 100644 --- a/apps/ignis-server/Dockerfile +++ b/apps/ignis-server/Dockerfile @@ -9,7 +9,7 @@ COPY package.json package-lock.json ./ COPY packages/services/package.json ./packages/services/ COPY packages/shim/package.json ./packages/shim/ COPY packages/ui/package.json ./packages/ui/ -COPY packages/bridge-plugin/package.json ./packages/bridge-plugin/ +COPY packages/bridge/package.json ./packages/bridge/ COPY packages/server-core/package.json ./packages/server-core/ COPY apps/ignis-server/package.json ./apps/ignis-server/ @@ -38,7 +38,7 @@ COPY package.json package-lock.json ./ COPY packages/services/package.json ./packages/services/ COPY packages/shim/package.json ./packages/shim/ COPY packages/ui/package.json ./packages/ui/ -COPY packages/bridge-plugin/package.json ./packages/bridge-plugin/ +COPY packages/bridge/package.json ./packages/bridge/ COPY packages/server-core/package.json ./packages/server-core/ COPY apps/ignis-server/package.json ./apps/ignis-server/ @@ -51,13 +51,13 @@ COPY images/ ./images/ COPY packages/server-core/src/ ./packages/server-core/src/ # Bridge plugin: manifest + styles for auto-install into vaults; built main.js comes from the build stage. -COPY packages/bridge-plugin/manifest.json ./packages/bridge-plugin/ -COPY packages/bridge-plugin/styles.css ./packages/bridge-plugin/ +COPY packages/bridge/manifest.json ./packages/bridge/ +COPY packages/bridge/styles.css ./packages/bridge/ # Built artifacts from the build stage. COPY --from=build /app/packages/shim/dist/shim-loader.js ./packages/shim/dist/shim-loader.js COPY --from=build /app/packages/ui/dist/ignis-ui.js ./packages/ui/dist/ignis-ui.js -COPY --from=build /app/packages/bridge-plugin/main.js ./packages/bridge-plugin/main.js +COPY --from=build /app/packages/bridge/main.js ./packages/bridge/main.js COPY --from=build /app/apps/ignis-server/server/plugins/headless-sync/plugin/main.js ./apps/ignis-server/server/plugins/headless-sync/plugin/main.js RUN chmod +x /app/apps/ignis-server/scripts/entrypoint.sh diff --git a/apps/ignis-server/server/bridge-plugin.js b/apps/ignis-server/server/bridge-plugin.js index a1193cf..b82011d 100644 --- a/apps/ignis-server/server/bridge-plugin.js +++ b/apps/ignis-server/server/bridge-plugin.js @@ -6,7 +6,7 @@ const { } = require("./plugin-system/obsidian-plugin"); const BRIDGE_PLUGIN_ID = "ignis-bridge"; -const BRIDGE_PLUGIN_DIR = path.join(__dirname, "..", "..", "..", "packages", "bridge-plugin"); +const BRIDGE_PLUGIN_DIR = path.join(__dirname, "..", "..", "..", "packages", "bridge"); // .ignis metadata helpers diff --git a/build.js b/build.js index ee6cc29..737e849 100644 --- a/build.js +++ b/build.js @@ -8,8 +8,8 @@ Promise.all([ // Build ignis-ui.js (delegated to packages/ui) require("./packages/ui/build.js"), - // Build ignis-bridge plugin (delegated to packages/bridge-plugin) - require("./packages/bridge-plugin/build.js"), + // Build ignis-bridge plugin (delegated to packages/bridge) + require("./packages/bridge/build.js"), // Build headless-sync bundled plugin esbuild.build({ diff --git a/package-lock.json b/package-lock.json index 3da0f56..f0d4a48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ignis-monorepo", - "version": "0.8.1", + "version": "0.8.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ignis-monorepo", - "version": "0.8.1", + "version": "0.8.2", "workspaces": [ "packages/*", "apps/*" @@ -498,8 +498,8 @@ "resolved": "apps/ignis-server", "link": true }, - "node_modules/@ignis/bridge-plugin": { - "resolved": "packages/bridge-plugin", + "node_modules/@ignis/bridge": { + "resolved": "packages/bridge", "link": true }, "node_modules/@ignis/server-core": { @@ -4428,9 +4428,17 @@ "node": ">= 14" } }, + "packages/bridge": { + "name": "@ignis/bridge", + "version": "0.0.0-internal", + "devDependencies": { + "esbuild": "^0.20.0" + } + }, "packages/bridge-plugin": { "name": "@ignis/bridge-plugin", "version": "0.0.0-internal", + "extraneous": true, "devDependencies": { "esbuild": "^0.20.0" } diff --git a/packages/bridge-plugin/build.js b/packages/bridge/build.js similarity index 100% rename from packages/bridge-plugin/build.js rename to packages/bridge/build.js diff --git a/packages/bridge-plugin/manifest.json b/packages/bridge/manifest.json similarity index 100% rename from packages/bridge-plugin/manifest.json rename to packages/bridge/manifest.json diff --git a/packages/bridge-plugin/package.json b/packages/bridge/package.json similarity index 82% rename from packages/bridge-plugin/package.json rename to packages/bridge/package.json index 2ff2478..c98f2c4 100644 --- a/packages/bridge-plugin/package.json +++ b/packages/bridge/package.json @@ -1,5 +1,5 @@ { - "name": "@ignis/bridge-plugin", + "name": "@ignis/bridge", "version": "0.0.0-internal", "private": true, "scripts": { diff --git a/packages/bridge-plugin/src/demo-guards.js b/packages/bridge/src/demo-guards.js similarity index 100% rename from packages/bridge-plugin/src/demo-guards.js rename to packages/bridge/src/demo-guards.js diff --git a/packages/bridge-plugin/src/file-actions.js b/packages/bridge/src/file-actions.js similarity index 100% rename from packages/bridge-plugin/src/file-actions.js rename to packages/bridge/src/file-actions.js diff --git a/packages/bridge-plugin/src/main.js b/packages/bridge/src/main.js similarity index 100% rename from packages/bridge-plugin/src/main.js rename to packages/bridge/src/main.js diff --git a/packages/bridge-plugin/src/plugin-registry.js b/packages/bridge/src/plugin-registry.js similarity index 100% rename from packages/bridge-plugin/src/plugin-registry.js rename to packages/bridge/src/plugin-registry.js diff --git a/packages/bridge-plugin/src/settings/general-tab.js b/packages/bridge/src/settings/general-tab.js similarity index 100% rename from packages/bridge-plugin/src/settings/general-tab.js rename to packages/bridge/src/settings/general-tab.js diff --git a/packages/bridge-plugin/src/settings/inject.js b/packages/bridge/src/settings/inject.js similarity index 100% rename from packages/bridge-plugin/src/settings/inject.js rename to packages/bridge/src/settings/inject.js diff --git a/packages/bridge-plugin/src/settings/plugin-tabs.js b/packages/bridge/src/settings/plugin-tabs.js similarity index 100% rename from packages/bridge-plugin/src/settings/plugin-tabs.js rename to packages/bridge/src/settings/plugin-tabs.js diff --git a/packages/bridge-plugin/src/settings/server-plugins-tab.js b/packages/bridge/src/settings/server-plugins-tab.js similarity index 100% rename from packages/bridge-plugin/src/settings/server-plugins-tab.js rename to packages/bridge/src/settings/server-plugins-tab.js diff --git a/packages/bridge-plugin/src/settings/settings-ui.js b/packages/bridge/src/settings/settings-ui.js similarity index 100% rename from packages/bridge-plugin/src/settings/settings-ui.js rename to packages/bridge/src/settings/settings-ui.js diff --git a/packages/bridge-plugin/src/status-bar.js b/packages/bridge/src/status-bar.js similarity index 100% rename from packages/bridge-plugin/src/status-bar.js rename to packages/bridge/src/status-bar.js diff --git a/packages/bridge-plugin/src/workspace-picker.js b/packages/bridge/src/workspace-picker.js similarity index 100% rename from packages/bridge-plugin/src/workspace-picker.js rename to packages/bridge/src/workspace-picker.js diff --git a/packages/bridge-plugin/styles.css b/packages/bridge/styles.css similarity index 100% rename from packages/bridge-plugin/styles.css rename to packages/bridge/styles.css