@scrypted/server 0.128.0 → 0.128.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -13,7 +13,6 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
13
13
|
const os_1 = __importDefault(require("os"));
|
|
14
14
|
const path_1 = __importDefault(require("path"));
|
|
15
15
|
const process_1 = __importDefault(require("process"));
|
|
16
|
-
const semver_1 = __importDefault(require("semver"));
|
|
17
16
|
const plugin_volume_1 = require("./plugin-volume");
|
|
18
17
|
function defaultNpmExec(args, options) {
|
|
19
18
|
let npm = 'npm';
|
|
@@ -32,8 +31,14 @@ function setNpmExecFunction(f) {
|
|
|
32
31
|
}
|
|
33
32
|
function getPluginNodePath(name) {
|
|
34
33
|
const pluginVolume = (0, plugin_volume_1.ensurePluginVolume)(name);
|
|
35
|
-
const
|
|
36
|
-
let
|
|
34
|
+
const abi = process_1.default.versions.modules;
|
|
35
|
+
let runtime = process_1.default.env.npm_config_runtime;
|
|
36
|
+
if (!runtime && process_1.default.versions.electron)
|
|
37
|
+
runtime = 'electron';
|
|
38
|
+
if (!runtime)
|
|
39
|
+
runtime = 'node';
|
|
40
|
+
const { platform, arch } = process_1.default;
|
|
41
|
+
let nodeVersionedDirectory = `n-${runtime}-v${abi}-${platform}-${arch}`;
|
|
37
42
|
const scryptedBase = process_1.default.env.SCRYPTED_BASE_VERSION;
|
|
38
43
|
if (scryptedBase)
|
|
39
44
|
nodeVersionedDirectory += '-' + scryptedBase;
|
|
@@ -94,7 +99,7 @@ async function installOptionalDependencies(console, packageJson) {
|
|
|
94
99
|
if (!de.isDirectory())
|
|
95
100
|
return;
|
|
96
101
|
if (de.name.startsWith('linux') || de.name.startsWith('darwin') || de.name.startsWith('win32')
|
|
97
|
-
|| de.name.startsWith('python') || de.name.startsWith('node')) {
|
|
102
|
+
|| de.name.startsWith('python') || de.name.startsWith('node') || de.name.startsWith('n-')) {
|
|
98
103
|
console.log('Removing old dependencies:', filePath);
|
|
99
104
|
try {
|
|
100
105
|
await fs_1.default.promises.rm(filePath, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-npm-dependencies.js","sourceRoot":"","sources":["../../src/plugin/plugin-npm-dependencies.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"plugin-npm-dependencies.js","sourceRoot":"","sources":["../../src/plugin/plugin-npm-dependencies.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,6 @@ import fs from 'fs';
|
|
|
4
4
|
import os from 'os';
|
|
5
5
|
import path from 'path';
|
|
6
6
|
import process from 'process';
|
|
7
|
-
import semver from 'semver';
|
|
8
7
|
import { ensurePluginVolume } from "./plugin-volume";
|
|
9
8
|
|
|
10
9
|
export function defaultNpmExec(args: string[], options: child_process.SpawnOptions) {
|
|
@@ -26,8 +25,16 @@ export function setNpmExecFunction(f: typeof npmExecFunction) {
|
|
|
26
25
|
|
|
27
26
|
export function getPluginNodePath(name: string) {
|
|
28
27
|
const pluginVolume = ensurePluginVolume(name);
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
|
|
29
|
+
const abi = process.versions.modules;
|
|
30
|
+
let runtime = process.env.npm_config_runtime;
|
|
31
|
+
if (!runtime && process.versions.electron)
|
|
32
|
+
runtime = 'electron';
|
|
33
|
+
if (!runtime)
|
|
34
|
+
runtime = 'node';
|
|
35
|
+
const { platform, arch } = process;
|
|
36
|
+
let nodeVersionedDirectory = `n-${runtime}-v${abi}-${platform}-${arch}`;
|
|
37
|
+
|
|
31
38
|
const scryptedBase = process.env.SCRYPTED_BASE_VERSION;
|
|
32
39
|
if (scryptedBase)
|
|
33
40
|
nodeVersionedDirectory += '-' + scryptedBase;
|
|
@@ -98,7 +105,7 @@ export async function installOptionalDependencies(console: Console, packageJson:
|
|
|
98
105
|
if (!de.isDirectory())
|
|
99
106
|
return;
|
|
100
107
|
if (de.name.startsWith('linux') || de.name.startsWith('darwin') || de.name.startsWith('win32')
|
|
101
|
-
|| de.name.startsWith('python') || de.name.startsWith('node')) {
|
|
108
|
+
|| de.name.startsWith('python') || de.name.startsWith('node') || de.name.startsWith('n-')) {
|
|
102
109
|
console.log('Removing old dependencies:', filePath);
|
|
103
110
|
try {
|
|
104
111
|
await fs.promises.rm(filePath, {
|