@automattic/vip 3.25.2-dev.0 → 3.25.2
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.
- package/AGENTS.md +0 -6
- package/CLAUDE.md +0 -1
- package/dist/bin/vip-db-phpmyadmin.js +11 -4
- package/dist/bin/vip-dev-env-exec.js +1 -18
- package/dist/bin/vip.js +69 -111
- package/dist/commands/phpmyadmin.js +64 -16
- package/dist/lib/cli/command.js +53 -224
- package/dist/lib/cli/config.js +5 -13
- package/dist/lib/cli/exit.js +1 -2
- package/dist/lib/dev-environment/dev-environment-cli.js +2 -9
- package/dist/lib/dev-environment/dev-environment-core.js +4 -62
- package/dist/lib/dev-environment/dev-environment-lando.js +10 -47
- package/npm-shrinkwrap.json +669 -928
- package/package.json +11 -14
- package/tsconfig.json +1 -7
- package/dist/bin/vip-sea.js +0 -19
- package/dist/lib/cli/internal-bin-loader.js +0 -81
- package/dist/lib/cli/runtime-mode.js +0 -21
- package/dist/lib/cli/sea-dispatch.js +0 -88
- package/dist/lib/cli/sea-runtime.js +0 -75
- package/dist/lib/dev-environment/lando-loader.js +0 -48
- package/docs/COMMANDER-MIGRATION.md +0 -55
- package/docs/SEA-BUILD-SIGNING.md +0 -171
- package/helpers/build-sea.js +0 -167
|
@@ -18,6 +18,10 @@ exports.removeProxyCache = removeProxyCache;
|
|
|
18
18
|
exports.validateDockerInstalled = validateDockerInstalled;
|
|
19
19
|
var _chalk = _interopRequireDefault(require("chalk"));
|
|
20
20
|
var _debug = _interopRequireDefault(require("debug"));
|
|
21
|
+
var _bootstrap = require("lando/lib/bootstrap");
|
|
22
|
+
var _lando = _interopRequireDefault(require("lando/lib/lando"));
|
|
23
|
+
var _utils = _interopRequireDefault(require("lando/plugins/lando-core/lib/utils"));
|
|
24
|
+
var _build = _interopRequireDefault(require("lando/plugins/lando-tooling/lib/build"));
|
|
21
25
|
var _nodeChild_process = require("node:child_process");
|
|
22
26
|
var _promises = require("node:dns/promises");
|
|
23
27
|
var _promises2 = require("node:fs/promises");
|
|
@@ -27,8 +31,6 @@ var _nodeUtil = require("node:util");
|
|
|
27
31
|
var _semver = require("semver");
|
|
28
32
|
var _devEnvironmentCore = require("./dev-environment-core");
|
|
29
33
|
var _dockerUtils = require("./docker-utils");
|
|
30
|
-
var _landoLoader = require("./lando-loader");
|
|
31
|
-
var _runtimeMode = require("../cli/runtime-mode");
|
|
32
34
|
var _devEnvironment = require("../constants/dev-environment");
|
|
33
35
|
var _env = _interopRequireDefault(require("../env"));
|
|
34
36
|
var _userError = _interopRequireDefault(require("../user-error"));
|
|
@@ -41,44 +43,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
|
|
|
41
43
|
const DEBUG_KEY = '@automattic/vip:bin:dev-environment';
|
|
42
44
|
const debug = (0, _debug.default)(DEBUG_KEY);
|
|
43
45
|
const execFileAsync = (0, _nodeUtil.promisify)(_nodeChild_process.execFile);
|
|
44
|
-
const unwrapLandoModuleDefault = loaded => {
|
|
45
|
-
if (loaded && typeof loaded === 'object' && 'default' in loaded) {
|
|
46
|
-
return loaded.default;
|
|
47
|
-
}
|
|
48
|
-
return loaded;
|
|
49
|
-
};
|
|
50
|
-
let landoConstructor = null;
|
|
51
|
-
let landoBuildTaskFn = null;
|
|
52
|
-
let landoUtilsModule = null;
|
|
53
|
-
let buildConfigFn = null;
|
|
54
|
-
const getLandoConstructor = () => {
|
|
55
|
-
if (!landoConstructor) {
|
|
56
|
-
landoConstructor = unwrapLandoModuleDefault((0, _landoLoader.loadLandoModule)('lando/lib/lando'));
|
|
57
|
-
}
|
|
58
|
-
return landoConstructor;
|
|
59
|
-
};
|
|
60
|
-
const getLandoBuildTask = () => {
|
|
61
|
-
if (!landoBuildTaskFn) {
|
|
62
|
-
landoBuildTaskFn = unwrapLandoModuleDefault((0, _landoLoader.loadLandoModule)('lando/plugins/lando-tooling/lib/build'));
|
|
63
|
-
}
|
|
64
|
-
return landoBuildTaskFn;
|
|
65
|
-
};
|
|
66
|
-
const getLandoUtils = () => {
|
|
67
|
-
if (!landoUtilsModule) {
|
|
68
|
-
landoUtilsModule = unwrapLandoModuleDefault((0, _landoLoader.loadLandoModule)('lando/plugins/lando-core/lib/utils'));
|
|
69
|
-
}
|
|
70
|
-
return landoUtilsModule;
|
|
71
|
-
};
|
|
72
|
-
const getLandoBuildConfig = () => {
|
|
73
|
-
if (!buildConfigFn) {
|
|
74
|
-
const loaded = (0, _landoLoader.loadLandoModule)('lando/lib/bootstrap');
|
|
75
|
-
buildConfigFn = loaded.buildConfig ?? loaded.default?.buildConfig ?? null;
|
|
76
|
-
if (!buildConfigFn) {
|
|
77
|
-
throw new Error('Unable to load Lando bootstrap buildConfig.');
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
return buildConfigFn;
|
|
81
|
-
};
|
|
82
46
|
const bannerLabelWidth = 18;
|
|
83
47
|
let logPathRegistered = false;
|
|
84
48
|
let resolvedLogPath = null;
|
|
@@ -182,7 +146,7 @@ const writeLogBanner = async config => {
|
|
|
182
146
|
});
|
|
183
147
|
const dockerVersions = await getDockerVersions(config);
|
|
184
148
|
const command = process.argv.slice(1).join(' ');
|
|
185
|
-
const bannerLines = ['=== VIP Dev Env Log ===', formatBannerLine('COMMAND', command), formatBannerLine('OS', `${_env.default.os.name} ${_env.default.os.version} ${_env.default.os.arch}`), formatBannerLine('NODE', _env.default.node.version), formatBannerLine('VIP-CLI', _env.default.app.version), formatBannerLine('
|
|
149
|
+
const bannerLines = ['=== VIP Dev Env Log ===', formatBannerLine('COMMAND', command), formatBannerLine('OS', `${_env.default.os.name} ${_env.default.os.version} ${_env.default.os.arch}`), formatBannerLine('NODE', _env.default.node.version), formatBannerLine('VIP-CLI', _env.default.app.version), formatBannerLine('DOCKER ENGINE', dockerVersions.engine), formatBannerLine('DOCKER COMPOSE', dockerVersions.compose), formatBannerLine('COMPOSE PLUGIN', dockerVersions.composePlugin), formatBannerLine('DOCKER BIN', config.dockerBin ?? 'unknown'), formatBannerLine('COMPOSE BIN', config.composeBin ?? 'unknown'), formatBannerLine('RAM', formatBytes((0, _nodeOs.totalmem)())), formatBannerLine('CPU', String((0, _nodeOs.cpus)().length)), '===', '', ''];
|
|
186
150
|
await (0, _promises2.writeFile)(logFilePath, bannerLines.join('\n'), {
|
|
187
151
|
flag: 'a'
|
|
188
152
|
});
|
|
@@ -193,7 +157,7 @@ const writeLogBanner = async config => {
|
|
|
193
157
|
*/
|
|
194
158
|
async function getLandoConfig(options = {}) {
|
|
195
159
|
// The path will be smth like `yarn/global/node_modules/lando/lib/lando.js`; we need the path up to `lando` (inclusive)
|
|
196
|
-
const landoPath = (0, _nodePath.dirname)((0, _nodePath.dirname)(
|
|
160
|
+
const landoPath = (0, _nodePath.dirname)((0, _nodePath.dirname)(require.resolve('lando')));
|
|
197
161
|
debug(`Getting Lando config, using paths '${landoPath}' for plugins`);
|
|
198
162
|
const isLandoDebugSelected = _debug.default.enabled(DEBUG_KEY);
|
|
199
163
|
const isAllDebugSelected = _debug.default.enabled('"*"');
|
|
@@ -237,7 +201,7 @@ async function getLandoConfig(options = {}) {
|
|
|
237
201
|
LANDO_HOST_GROUP_ID: process.platform === 'win32' ? '1000' : `${(0, _nodeOs.userInfo)().gid}`
|
|
238
202
|
}
|
|
239
203
|
};
|
|
240
|
-
return
|
|
204
|
+
return (0, _bootstrap.buildConfig)(config);
|
|
241
205
|
}
|
|
242
206
|
const appMap = new Map();
|
|
243
207
|
async function initLandoApplication(lando, instancePath) {
|
|
@@ -326,8 +290,7 @@ async function bootstrapLando(options = {}) {
|
|
|
326
290
|
}
|
|
327
291
|
registerLogPathOutput(config, Boolean(options.quiet));
|
|
328
292
|
await writeLogBanner(config);
|
|
329
|
-
const
|
|
330
|
-
const lando = new LandoClass(config);
|
|
293
|
+
const lando = new _lando.default(config);
|
|
331
294
|
_debug.default.log = (message, ...args) => {
|
|
332
295
|
lando.log.debug(message, ...args);
|
|
333
296
|
};
|
|
@@ -462,7 +425,7 @@ async function landoInfo(lando, instancePath, options = {}) {
|
|
|
462
425
|
const started = new Date();
|
|
463
426
|
try {
|
|
464
427
|
const app = await getLandoApplication(lando, instancePath);
|
|
465
|
-
const info =
|
|
428
|
+
const info = _utils.default.startTable(app);
|
|
466
429
|
const reachableServices = app.info.filter(service => service.urls.length);
|
|
467
430
|
reachableServices.forEach(service => info[`${service.service} urls`] = service.urls);
|
|
468
431
|
const health = await checkEnvHealth(lando, app);
|
|
@@ -675,7 +638,7 @@ async function landoExec(lando, instancePath, toolName, args, options) {
|
|
|
675
638
|
if (options.stdio) {
|
|
676
639
|
tool.stdio = options.stdio;
|
|
677
640
|
}
|
|
678
|
-
const task =
|
|
641
|
+
const task = (0, _build.default)(tool, lando);
|
|
679
642
|
const argv = {
|
|
680
643
|
// eslint-disable-next-line id-length
|
|
681
644
|
_: args
|