OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

plugin: Fixes for CI

Browse Source
This commit is contained in:
Anmol Sethi 2020-11-03 21:53:16 -05:00
parent af73b96313
commit 706bc23f04
No known key found for this signature in database
GPG Key ID: 8CEF1878FF10ADEB
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/dev/test.sh
View File

@ -6,7 +6,7 @@ main() {
cd test/test-plugin
make -s out/index.js
cd $OLDPWD
cd "$OLDPWD"
mocha -r ts-node/register ./test/*.test.ts "$@"
}

10
src/node/plugin.ts
View File

@ -54,14 +54,14 @@ export class PluginAPI {
*/
public async applications(): Promise<Application[]> {
const apps = new Array<Application>()
for (const [_, p] of this.plugins) {
for (const [, p] of this.plugins) {
const pluginApps = await p.applications()
// Add plugin key to each app.
apps.push(
...pluginApps.map((app) => {
app = {...app, path: path.join(p.routerPath, app.path || "")}
app = {...app, iconPath: path.join(app.path || "", app.iconPath)}
app = { ...app, path: path.join(p.routerPath, app.path || "") }
app = { ...app, iconPath: path.join(app.path || "", app.iconPath) }
return {
...app,
plugin: {
@ -85,7 +85,7 @@ export class PluginAPI {
* mount mounts all plugin routers onto r.
*/
public mount(r: express.Router): void {
for (const [_, p] of this.plugins) {
for (const [, p] of this.plugins) {
r.use(`/${p.name}`, p.router())
}
}
@ -142,7 +142,7 @@ export class PluginAPI {
encoding: "utf8",
})
const packageJSON: PackageJSON = JSON.parse(str)
for (const [_, p] of this.plugins) {
for (const [, p] of this.plugins) {
if (p.name === packageJSON.name) {
this.logger.warn(
`ignoring duplicate plugin ${q(p.name)} at ${q(dir)}, using previously loaded ${q(p.modulePath)}`,

2
src/node/routes/index.ts
View File

@ -16,6 +16,7 @@ import { PluginAPI } from "../plugin"
import { getMediaMime, paths } from "../util"
import { WebsocketRequest } from "../wsRouter"
import * as domainProxy from "./domainProxy"
import * as apps from "./apps"
import * as health from "./health"
import * as login from "./login"
import * as proxy from "./pathProxy"
@ -23,7 +24,6 @@ import * as proxy from "./pathProxy"
import * as _static from "./static"
import * as update from "./update"
import * as vscode from "./vscode"
import * as apps from "./apps"
declare global {
// eslint-disable-next-line @typescript-eslint/no-namespace