diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json index e7717bbdf..b1c20a0e6 100644 --- a/packages/cli/package-lock.json +++ b/packages/cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "scrypted", - "version": "1.0.50", + "version": "1.0.53", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "scrypted", - "version": "1.0.50", + "version": "1.0.53", "license": "ISC", "dependencies": { "@scrypted/types": "^0.0.6", @@ -393,9 +393,9 @@ } }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -876,9 +876,9 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 68e19abd6..5bc8f1097 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "scrypted", - "version": "1.0.50", + "version": "1.0.53", "description": "", "main": "./dist/packages/cli/src/main.js", "bin": { diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts index 1e9cbdc57..3f57a7a9e 100644 --- a/packages/cli/src/main.ts +++ b/packages/cli/src/main.ts @@ -142,7 +142,7 @@ async function main() { await serveMain(installVersion); } else if (process.argv[2] === 'install-server') { - const installDir = await installServe('latest'); + const installDir = await installServe(process.argv[3] || 'latest'); console.log('server installation successful:', installDir); } else if (process.argv[2] === 'login') { diff --git a/packages/cli/src/service.ts b/packages/cli/src/service.ts index ad64dc151..deaa6eceb 100644 --- a/packages/cli/src/service.ts +++ b/packages/cli/src/service.ts @@ -92,7 +92,7 @@ export async function serveMain(installVersion?: string) { const { installDir, volume } = cwdInstallDir(); if (!fs.existsSync('node_modules/@scrypted/server')) { install = true; - installVersion = 'latest'; + installVersion ||= 'latest'; console.log('Package @scrypted/server not found. Installing.'); } if (install) { diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 1bb627bc0..390fb0541 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,14 +1,15 @@ { "compilerOptions": { - "module": "commonjs", - "target": "ESNext", - "noImplicitAny": true, - "outDir": "./dist", - "esModuleInterop": true, - "sourceMap": true, - "declaration": true + "resolveJsonModule": true, + "module": "commonjs", + "target": "ESNext", + "noImplicitAny": true, + "outDir": "./dist", + "esModuleInterop": true, + "sourceMap": true, + "declaration": true }, "include": [ - "src/**/*" + "src/**/*" ], } \ No newline at end of file