@solar-angular/builder 18.0.1 → 18.0.3
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/builders.json +1 -1
- package/deploy/builder.js +19 -21
- package/deploy/builder.js.map +1 -1
- package/deploy/interface.js +1 -2
- package/index.js +1 -3
- package/index.js.map +1 -1
- package/package.json +11 -2
package/builders.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"$schema": "../../../node_modules/@angular-devkit/architect/src/builders-schema.json",
|
|
3
3
|
"builders": {
|
|
4
4
|
"deploy": {
|
|
5
|
-
"implementation": "./deploy/builder",
|
|
5
|
+
"implementation": "./deploy/builder.js",
|
|
6
6
|
"schema": "./deploy/schema.json",
|
|
7
7
|
"description": "Deploy application"
|
|
8
8
|
}
|
package/deploy/builder.js
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const path = require("node:path");
|
|
11
|
-
const ora_1 = require("ora");
|
|
1
|
+
import { createBuilder } from '@angular-devkit/architect';
|
|
2
|
+
import { workspaces } from '@angular-devkit/core';
|
|
3
|
+
import { NodeJsSyncHost } from '@angular-devkit/core/node';
|
|
4
|
+
import * as dotenv from 'dotenv';
|
|
5
|
+
import * as fs from 'fs/promises';
|
|
6
|
+
import inquirer from 'inquirer';
|
|
7
|
+
import * as path from 'node:path';
|
|
8
|
+
import ora from 'ora';
|
|
9
|
+
import SftpClient from 'ssh2-sftp-client';
|
|
12
10
|
async function askUsername() {
|
|
13
|
-
const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
|
|
14
11
|
const { username } = await inquirer.prompt([
|
|
15
12
|
{
|
|
16
13
|
type: 'input',
|
|
@@ -21,7 +18,6 @@ async function askUsername() {
|
|
|
21
18
|
return username;
|
|
22
19
|
}
|
|
23
20
|
async function askPassword() {
|
|
24
|
-
const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
|
|
25
21
|
const { password } = await inquirer.prompt([{
|
|
26
22
|
type: 'password',
|
|
27
23
|
name: 'password',
|
|
@@ -31,7 +27,7 @@ async function askPassword() {
|
|
|
31
27
|
return password;
|
|
32
28
|
}
|
|
33
29
|
function createSpinner(text) {
|
|
34
|
-
return (
|
|
30
|
+
return ora({
|
|
35
31
|
text,
|
|
36
32
|
// The below 2 options are needed because otherwise CTRL+C will be delayed
|
|
37
33
|
// when the underlying process is sync.
|
|
@@ -41,8 +37,8 @@ function createSpinner(text) {
|
|
|
41
37
|
});
|
|
42
38
|
}
|
|
43
39
|
async function callWebhook(options, app, env) {
|
|
44
|
-
const https = await
|
|
45
|
-
const os = await
|
|
40
|
+
const https = await import('https');
|
|
41
|
+
const os = await import('os');
|
|
46
42
|
const { hostname, pathname, search } = new URL(options.webhook);
|
|
47
43
|
const { username } = os.userInfo();
|
|
48
44
|
const size = await getDirectorySize(options.localPath);
|
|
@@ -96,9 +92,13 @@ async function uninstallRemoteApp(sftp, remotePath) {
|
|
|
96
92
|
}
|
|
97
93
|
}
|
|
98
94
|
async function getDefaultConfigurationName(target, workspaceRoot) {
|
|
99
|
-
const { workspace } = await
|
|
95
|
+
const { workspace } = await workspaces.readWorkspace(workspaceRoot + '/angular.json', workspaces.createWorkspaceHost(new NodeJsSyncHost()));
|
|
100
96
|
return workspace.projects.get(target.project).targets.get(target.target).defaultConfiguration;
|
|
101
97
|
}
|
|
98
|
+
async function getOutputPath(target, context) {
|
|
99
|
+
const { outputPath } = await context.getTargetOptions(target);
|
|
100
|
+
return path.resolve(process.cwd(), `${outputPath.base}/${outputPath.browser || 'browser'}`);
|
|
101
|
+
}
|
|
102
102
|
async function getDirectorySize(dirPath) {
|
|
103
103
|
let totalSize = 0;
|
|
104
104
|
async function readDirRecursive(currentPath) {
|
|
@@ -116,7 +116,7 @@ async function getDirectorySize(dirPath) {
|
|
|
116
116
|
await readDirRecursive(dirPath);
|
|
117
117
|
return totalSize / (1024 * 1024); // MB
|
|
118
118
|
}
|
|
119
|
-
|
|
119
|
+
export default createBuilder(async (options, context) => {
|
|
120
120
|
const target = context.target;
|
|
121
121
|
const env = target.configuration || await getDefaultConfigurationName(target, context.workspaceRoot);
|
|
122
122
|
const processEnv = {};
|
|
@@ -146,7 +146,6 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
|
|
|
146
146
|
console.log('');
|
|
147
147
|
}
|
|
148
148
|
let spinner = createSpinner('Establishing remote connection...').start();
|
|
149
|
-
const SftpClient = await Promise.resolve().then(() => require('ssh2-sftp-client'));
|
|
150
149
|
const sftp = new SftpClient();
|
|
151
150
|
try {
|
|
152
151
|
await sftp.connect(options);
|
|
@@ -156,8 +155,7 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
|
|
|
156
155
|
spinner.succeed('The old application uninstall completed.').stop();
|
|
157
156
|
spinner = createSpinner('Deploying new application to remote...').start();
|
|
158
157
|
if (!options.localPath) {
|
|
159
|
-
|
|
160
|
-
options.localPath = `${outputOptions.base}/${outputOptions.browser}`;
|
|
158
|
+
options.localPath = await getOutputPath(buildTarget, context);
|
|
161
159
|
}
|
|
162
160
|
await sftp.uploadDir(options.localPath, options.remotePath, {
|
|
163
161
|
useFastput: true
|
package/deploy/builder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../packages/builder/src/deploy/builder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../packages/builder/src/deploy/builder.ts"],"names":[],"mappings":"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"}
|
package/deploy/interface.js
CHANGED
package/index.js
CHANGED
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/builder/src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/builder/src/index.ts"],"names":[],"mappings":"AAAA,eAAe,KAAK,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@solar-angular/builder",
|
|
3
|
-
"version": "18.0.
|
|
4
|
-
"type": "commonjs",
|
|
3
|
+
"version": "18.0.3",
|
|
5
4
|
"builders": "./builders.json",
|
|
6
5
|
"publishConfig": {
|
|
7
6
|
"access": "public"
|
|
@@ -17,6 +16,16 @@
|
|
|
17
16
|
"@types/ssh2-sftp-client": "^9.0.0",
|
|
18
17
|
"@angular-devkit/architect": "^0.1802"
|
|
19
18
|
},
|
|
19
|
+
"exports": {
|
|
20
|
+
"./package.json": "./package.json",
|
|
21
|
+
".": {
|
|
22
|
+
"types": "./index.d.ts",
|
|
23
|
+
"import": "./index.js"
|
|
24
|
+
},
|
|
25
|
+
"./deploy/builder": "./deploy/builder.js"
|
|
26
|
+
},
|
|
20
27
|
"types": "./index.d.ts",
|
|
28
|
+
"module": "./index.js",
|
|
29
|
+
"type": "module",
|
|
21
30
|
"main": "./index.js"
|
|
22
31
|
}
|