diff --git a/.dockerignore b/.dockerignore index b874796..f67b580 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,4 +12,4 @@ data tmp **/dist packages/bridge/main.js -apps/ignis-server/server/plugins/*/plugin/main.js +apps/ignis-server/server/plugins/*/obsidian/main.js diff --git a/.gitignore b/.gitignore index 03d3003..3c8f672 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ investigation/ vaults/ packages/*/dist/ packages/bridge/main.js -apps/ignis-server/server/plugins/*/plugin/main.js +apps/ignis-server/server/plugins/*/obsidian/main.js demo-vaults/ data/ diff --git a/apps/ignis-server/Dockerfile b/apps/ignis-server/Dockerfile index 161f03c..6f83376 100644 --- a/apps/ignis-server/Dockerfile +++ b/apps/ignis-server/Dockerfile @@ -58,7 +58,7 @@ COPY packages/bridge/styles.css ./packages/bridge/ 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/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 +COPY --from=build /app/apps/ignis-server/server/plugins/headless-sync/obsidian/main.js ./apps/ignis-server/server/plugins/headless-sync/obsidian/main.js RUN chmod +x /app/apps/ignis-server/scripts/entrypoint.sh diff --git a/apps/ignis-server/server/plugins/headless-sync/index.js b/apps/ignis-server/server/plugins/headless-sync/index.js index 4a4e679..9141cd4 100644 --- a/apps/ignis-server/server/plugins/headless-sync/index.js +++ b/apps/ignis-server/server/plugins/headless-sync/index.js @@ -11,7 +11,7 @@ module.exports = { version: "0.3.0", //TODO: add server plugin manifest - obsidianPlugin: path.join(__dirname, "plugin"), + obsidianPlugin: path.join(__dirname, "obsidian"), _ctx: null, _obStatus: null, diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/manifest.json b/apps/ignis-server/server/plugins/headless-sync/obsidian/manifest.json similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/manifest.json rename to apps/ignis-server/server/plugins/headless-sync/obsidian/manifest.json diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/src/api.js b/apps/ignis-server/server/plugins/headless-sync/obsidian/src/api.js similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/src/api.js rename to apps/ignis-server/server/plugins/headless-sync/obsidian/src/api.js diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/src/auth.js b/apps/ignis-server/server/plugins/headless-sync/obsidian/src/auth.js similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/src/auth.js rename to apps/ignis-server/server/plugins/headless-sync/obsidian/src/auth.js diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/src/core-sync-guard.js b/apps/ignis-server/server/plugins/headless-sync/obsidian/src/core-sync-guard.js similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/src/core-sync-guard.js rename to apps/ignis-server/server/plugins/headless-sync/obsidian/src/core-sync-guard.js diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/src/log-viewer.js b/apps/ignis-server/server/plugins/headless-sync/obsidian/src/log-viewer.js similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/src/log-viewer.js rename to apps/ignis-server/server/plugins/headless-sync/obsidian/src/log-viewer.js diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/src/main.js b/apps/ignis-server/server/plugins/headless-sync/obsidian/src/main.js similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/src/main.js rename to apps/ignis-server/server/plugins/headless-sync/obsidian/src/main.js diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/src/settings-tab.js b/apps/ignis-server/server/plugins/headless-sync/obsidian/src/settings-tab.js similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/src/settings-tab.js rename to apps/ignis-server/server/plugins/headless-sync/obsidian/src/settings-tab.js diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/src/sync-status-bar.js b/apps/ignis-server/server/plugins/headless-sync/obsidian/src/sync-status-bar.js similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/src/sync-status-bar.js rename to apps/ignis-server/server/plugins/headless-sync/obsidian/src/sync-status-bar.js diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/src/ws-listener.js b/apps/ignis-server/server/plugins/headless-sync/obsidian/src/ws-listener.js similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/src/ws-listener.js rename to apps/ignis-server/server/plugins/headless-sync/obsidian/src/ws-listener.js diff --git a/apps/ignis-server/server/plugins/headless-sync/plugin/styles.css b/apps/ignis-server/server/plugins/headless-sync/obsidian/styles.css similarity index 100% rename from apps/ignis-server/server/plugins/headless-sync/plugin/styles.css rename to apps/ignis-server/server/plugins/headless-sync/obsidian/styles.css diff --git a/build.js b/build.js index a75727a..ab62834 100644 --- a/build.js +++ b/build.js @@ -18,7 +18,7 @@ Promise.all([ "server", "plugins", "headless-sync", - "plugin", + "obsidian", "src", "main.js", ), @@ -31,7 +31,7 @@ Promise.all([ "server", "plugins", "headless-sync", - "plugin", + "obsidian", "main.js", ), format: "cjs",