diff --git a/src/bin/installPlugins.ts b/bin/installPlugins.ts similarity index 77% rename from src/bin/installPlugins.ts rename to bin/installPlugins.ts index c390ff5ff..65a3b7392 100644 --- a/src/bin/installPlugins.ts +++ b/bin/installPlugins.ts @@ -1,10 +1,10 @@ 'use strict'; import {writeFileSync} from 'fs' -import {manager, installedPluginsPath} from "../static/js/pluginfw/installer"; -import {PackageData} from "../node/types/PackageInfo"; +import {manager, installedPluginsPath} from "ep_etherpad-lite/static/js/pluginfw/installer"; +import {PackageData} from "ep_etherpad-lite/node/types/PackageInfo"; -const pluginsModule = require('../static/js/pluginfw/plugins'); +const pluginsModule = require('ep_etherpad-lite/static/js/pluginfw/plugins'); if (process.argv.length === 2) { console.error('Expected at least one argument!'); process.exit(1); diff --git a/bin/package.json b/bin/package.json index de6714251..121c3dc1b 100644 --- a/bin/package.json +++ b/bin/package.json @@ -30,7 +30,8 @@ "migrateDirtyDBtoRealDB": "node --import tsx migrateDirtyDBtoRealDB.ts", "rebuildPad": "node --import tsx rebuildPad.ts", "stalePlugins": "node --import tsx ./plugins/stalePlugins.ts", - "checkPlugins": "node --import tsx ./plugins/checkPlugins.ts" + "checkPlugins": "node --import tsx ./plugins/checkPlugins.ts", + "install-plugins": "node --import tsx ./installPlugins.ts" }, "author": "", "license": "ISC" diff --git a/package.json b/package.json index b83888018..9b099d5ec 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "test-ui:ui": "pnpm --filter ep_etherpad-lite run test-ui:ui", "test-admin": "pnpm --filter ep_etherpad-lite run test-admin", "test-admin:ui": "pnpm --filter ep_etherpad-lite run test-admin:ui", - "install-plugins": "pnpm --filter ep_etherpad-lite run install-plugins" + "install-plugins": "pnpm --filter bin run install-plugins" }, "dependencies": { "ep_etherpad-lite": "workspace:./src" diff --git a/src/package.json b/src/package.json index 306c9b761..214d3172e 100644 --- a/src/package.json +++ b/src/package.json @@ -118,7 +118,6 @@ "test-container": "mocha --import=tsx --timeout 5000 tests/container/specs/api", "dev": "node --import tsx node/server.ts", "prod": "node --import tsx node/server.ts", - "install-plugins": "node --import tsx bin/installPlugins.ts", "ts-check": "tsc --noEmit", "ts-check:watch": "tsc --noEmit --watch", "test-ui": "npx playwright test tests/frontend-new/specs", diff --git a/src/static/js/pluginfw/installer.ts b/src/static/js/pluginfw/installer.ts index 5cf4293bc..875b3e80c 100644 --- a/src/static/js/pluginfw/installer.ts +++ b/src/static/js/pluginfw/installer.ts @@ -19,7 +19,11 @@ import {PluginManager} from 'live-plugin-manager-pnpm'; const {findEtherpadRoot} = require('../../../node/utils/AbsolutePaths'); const logger = log4js.getLogger('plugins'); -export const manager = new PluginManager(); +export const pluginInstallPath = path.join(settings.root, 'src','plugin_packages'); + +export const manager = new PluginManager({ + pluginsPath: pluginInstallPath +}); export const installedPluginsPath = path.join(settings.root, 'var/installed_plugins.json');