@mikeyt23/node-cli-utils 2.0.0-beta.1 → 2.0.0-beta.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/dist/cjs/GitUtility.d.ts +7 -0
- package/dist/cjs/GitUtility.d.ts.map +1 -0
- package/dist/cjs/GitUtility.js +49 -0
- package/dist/cjs/TarballUtility.d.ts +17 -7
- package/dist/cjs/TarballUtility.d.ts.map +1 -1
- package/dist/cjs/TarballUtility.js +18 -24
- package/dist/cjs/certUtils.d.ts +53 -17
- package/dist/cjs/certUtils.d.ts.map +1 -1
- package/dist/cjs/certUtils.js +175 -111
- package/dist/cjs/dbMigrationUtils.js +44 -54
- package/dist/cjs/dotnetUtils.d.ts.map +1 -1
- package/dist/cjs/dotnetUtils.js +4 -2
- package/dist/cjs/esmSpecific.d.mts +5 -0
- package/dist/cjs/esmSpecific.d.mts.map +1 -1
- package/dist/cjs/esmSpecific.mjs +6 -1
- package/dist/cjs/generalUtils.d.ts +268 -26
- package/dist/cjs/generalUtils.d.ts.map +1 -1
- package/dist/cjs/generalUtils.js +522 -106
- package/dist/cjs/generalUtilsInternal.d.ts +9 -3
- package/dist/cjs/generalUtilsInternal.d.ts.map +1 -1
- package/dist/cjs/generalUtilsInternal.js +159 -59
- package/dist/cjs/hostsUtils.d.ts +16 -0
- package/dist/cjs/hostsUtils.d.ts.map +1 -0
- package/dist/cjs/hostsUtils.js +82 -0
- package/dist/cjs/runWhileParentAlive.js +7 -9
- package/dist/esm/GitUtility.d.ts +7 -0
- package/dist/esm/GitUtility.d.ts.map +1 -0
- package/dist/esm/GitUtility.js +43 -0
- package/dist/esm/TarballUtility.d.ts +17 -7
- package/dist/esm/TarballUtility.d.ts.map +1 -1
- package/dist/esm/TarballUtility.js +21 -25
- package/dist/esm/certUtils.d.ts +53 -17
- package/dist/esm/certUtils.d.ts.map +1 -1
- package/dist/esm/certUtils.js +172 -86
- package/dist/esm/dbMigrationUtils.js +45 -55
- package/dist/esm/dotnetUtils.d.ts.map +1 -1
- package/dist/esm/dotnetUtils.js +4 -2
- package/dist/esm/esmSpecific.d.mts +5 -0
- package/dist/esm/esmSpecific.d.mts.map +1 -1
- package/dist/esm/esmSpecific.mjs +6 -1
- package/dist/esm/generalUtils.d.ts +268 -26
- package/dist/esm/generalUtils.d.ts.map +1 -1
- package/dist/esm/generalUtils.js +490 -105
- package/dist/esm/generalUtilsInternal.d.ts +9 -3
- package/dist/esm/generalUtilsInternal.d.ts.map +1 -1
- package/dist/esm/generalUtilsInternal.js +150 -57
- package/dist/esm/hostsUtils.d.ts +16 -0
- package/dist/esm/hostsUtils.d.ts.map +1 -0
- package/dist/esm/hostsUtils.js +69 -0
- package/dist/esm/runWhileParentAlive.js +8 -10
- package/package.json +4 -2
package/dist/esm/certUtils.js
CHANGED
|
@@ -1,28 +1,33 @@
|
|
|
1
1
|
import fs from 'node:fs';
|
|
2
2
|
import fsp from 'node:fs/promises';
|
|
3
3
|
import path from 'node:path';
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
import { Emoji, ensureDirectory, getPowershellHackArgs, isPlatformMac, isPlatformWindows, logIf, red, requireString, requireValidPath, simpleSpawnSync, spawnAsync, stringToNonEmptyLines, whichSync } from './generalUtils.js';
|
|
5
|
+
const defaultCertLogOptions = {
|
|
6
|
+
logSpawnOutput: false,
|
|
7
|
+
logTraceMessages: false,
|
|
8
|
+
logElevatedPermissionsMessage: true,
|
|
9
|
+
logSuccess: true
|
|
10
|
+
};
|
|
8
11
|
/**
|
|
9
12
|
* Wrapper function for calling openssl to generate a self-signed cert to be used for developing a local website with trusted https.
|
|
10
13
|
* @param url The url to generate a cert for. This will be used as the common name (CN) in the cert as well as the filename for the generated cert files.
|
|
11
|
-
* @param
|
|
14
|
+
* @param options Options for generating the cert.
|
|
15
|
+
* @returns The path to the generated pfx file.
|
|
12
16
|
*/
|
|
13
|
-
export async function generateCertWithOpenSsl(url,
|
|
14
|
-
|
|
17
|
+
export async function generateCertWithOpenSsl(url, options) {
|
|
18
|
+
requireString('url', url);
|
|
15
19
|
throwIfMaybeBadUrlChars(url);
|
|
16
|
-
const isMac =
|
|
17
|
-
const
|
|
18
|
-
|
|
20
|
+
const isMac = isPlatformMac();
|
|
21
|
+
const mergedOptions = { ...defaultCertLogOptions, outputDirectory: './cert', ...options };
|
|
22
|
+
const spawnArgs = { cwd: mergedOptions.outputDirectory, stdio: mergedOptions.logSpawnOutput ? 'inherit' : 'pipe' };
|
|
23
|
+
logIf(mergedOptions.logTraceMessages, 'checking if openssl is installed');
|
|
19
24
|
let brewOpenSslPath = '';
|
|
20
25
|
if (!isMac) {
|
|
21
|
-
const openSslPath =
|
|
26
|
+
const openSslPath = whichSync('openssl').location;
|
|
22
27
|
if (!openSslPath) {
|
|
23
28
|
throw Error('openssl is required but was not found');
|
|
24
29
|
}
|
|
25
|
-
|
|
30
|
+
logIf(mergedOptions.logTraceMessages, `using openssl at: ${openSslPath}`);
|
|
26
31
|
}
|
|
27
32
|
else if (isMac) {
|
|
28
33
|
const brewOpenSslDirectory = getBrewOpensslPath();
|
|
@@ -34,77 +39,148 @@ export async function generateCertWithOpenSsl(url, outputDirectory = './cert') {
|
|
|
34
39
|
throw Error(`openssl (brew version) is required but was not found at: ${brewOpenSslPath}`);
|
|
35
40
|
}
|
|
36
41
|
else {
|
|
37
|
-
|
|
42
|
+
logIf(mergedOptions.logTraceMessages, `using openssl at: ${brewOpenSslPath}`);
|
|
38
43
|
}
|
|
39
44
|
}
|
|
40
|
-
|
|
41
|
-
const keyName = url + '.key';
|
|
45
|
+
ensureDirectory(mergedOptions.outputDirectory);
|
|
42
46
|
const crtName = url + '.crt';
|
|
47
|
+
const keyName = url + '.key';
|
|
43
48
|
const pfxName = url + '.pfx';
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
49
|
+
const sanCnfName = url + '.cnf';
|
|
50
|
+
const filesToCheck = [crtName, keyName, pfxName, sanCnfName];
|
|
51
|
+
for (const file of filesToCheck) {
|
|
52
|
+
const filePath = path.join(mergedOptions.outputDirectory, file);
|
|
53
|
+
if (fs.existsSync(filePath)) {
|
|
54
|
+
throw Error(`${Emoji.Stop} File ${filePath} already exists. Delete or rename all of the following files from '${mergedOptions.outputDirectory}' if you want to generate a new cert: ${filesToCheck.join(', ')}.`);
|
|
55
|
+
}
|
|
47
56
|
}
|
|
48
|
-
|
|
57
|
+
logIf(mergedOptions.logTraceMessages, `writing ${sanCnfName} file for use with openssl command`);
|
|
49
58
|
const sanCnfContents = getSanCnfFileContents(url);
|
|
50
|
-
const sanCnfPath = path.join(outputDirectory,
|
|
59
|
+
const sanCnfPath = path.join(mergedOptions.outputDirectory, sanCnfName);
|
|
51
60
|
await fsp.writeFile(sanCnfPath, sanCnfContents);
|
|
52
|
-
|
|
53
|
-
const genKeyAndCrtArgs = `req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout ${keyName} -out ${crtName} -subj /CN=${url} -config
|
|
61
|
+
logIf(mergedOptions.logTraceMessages, `attempting to generate cert ${pfxName}`);
|
|
62
|
+
const genKeyAndCrtArgs = `req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout ${keyName} -out ${crtName} -subj /CN=${url} -config ${sanCnfName}`.split(' ');
|
|
54
63
|
const command = isMac ? brewOpenSslPath : 'openssl';
|
|
55
|
-
let result = await
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
}
|
|
59
|
-
log('- converting key and crt to pfx');
|
|
64
|
+
let result = await spawnAsync(command, genKeyAndCrtArgs, spawnArgs);
|
|
65
|
+
throwIfSpawnResultError(result);
|
|
66
|
+
logIf(mergedOptions.logTraceMessages, 'converting key and crt to pfx');
|
|
60
67
|
const convertToPfxArgs = `pkcs12 -certpbe AES-256-CBC -export -out ${pfxName} -aes256 -inkey ${keyName} -in ${crtName} -password pass:`.split(' ');
|
|
61
|
-
result = await
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
}
|
|
68
|
+
result = await spawnAsync(command, convertToPfxArgs, spawnArgs);
|
|
69
|
+
throwIfSpawnResultError(result);
|
|
70
|
+
const pfxPath = path.join(mergedOptions.outputDirectory, pfxName);
|
|
71
|
+
logIf(mergedOptions.logSuccess, `${Emoji.GreenCheck} Successfully generated cert: ${pfxPath}`);
|
|
72
|
+
return pfxPath;
|
|
65
73
|
}
|
|
66
74
|
/**
|
|
67
|
-
* Uses Powershell to install a cert to the local machine's trusted root store. Must have
|
|
68
|
-
*
|
|
69
|
-
*
|
|
70
|
-
* @param urlOrCertFilename The url or cert filename to install. The url + '.pfx' or the cert filename passed must match a file that exists in the certDirectory.
|
|
71
|
-
* @param certDirectory The directory to look for the cert file in. Defaults to './cert'.
|
|
75
|
+
* Uses Powershell to install a cert to the local machine's trusted root store. Must have elevated permissions.
|
|
76
|
+
* If the cert is already installed, this function will do nothing.
|
|
77
|
+
* @param pfxPath The path to the pfx file to install.
|
|
72
78
|
*/
|
|
73
|
-
export async function winInstallCert(
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
export async function winInstallCert(pfxPath, options) {
|
|
80
|
+
if (!isPlatformWindows()) {
|
|
81
|
+
throw Error('winInstallCert is only supported on Windows');
|
|
82
|
+
}
|
|
83
|
+
validatePfxPath(pfxPath);
|
|
84
|
+
const mergedOptions = { ...defaultCertLogOptions, ...options };
|
|
85
|
+
logIf(mergedOptions.logElevatedPermissionsMessage, getRequiresElevatedPermissionsMessage(true));
|
|
86
|
+
if (await winCertIsInstalled({ pfxPath }, mergedOptions)) {
|
|
87
|
+
const certInfo = await winGetPfxInfo(pfxPath);
|
|
88
|
+
logIf(mergedOptions.logTraceMessages, `${Emoji.Warning} certificate '${pfxPath}' with subject '${certInfo.subject}' is already installed - to install it again, first uninstall it manually or with the winUninstallCert function`);
|
|
83
89
|
return;
|
|
84
90
|
}
|
|
85
|
-
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
|
|
91
|
+
logIf(mergedOptions.logTraceMessages, `installing cert '${pfxPath}'`);
|
|
92
|
+
const psCommandArgs = getPowershellHackArgs(`Import-PfxCertificate -FilePath '${pfxPath}' -CertStoreLocation Cert:\\LocalMachine\\Root`);
|
|
93
|
+
const result = await spawnAsync('powershell', psCommandArgs, { stdio: mergedOptions.logSpawnOutput ? 'inherit' : 'pipe' });
|
|
94
|
+
throwIfSpawnResultError(result);
|
|
95
|
+
logIf(mergedOptions.logSuccess, `${Emoji.GreenCheck} Successfully installed cert: ${pfxPath}`);
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* Uses Powershell to check if a cert is already installed to the local machine's trusted root store.
|
|
99
|
+
* Uses the subject of the cert in order to avoid false negatives from regenerating the same self-signed cert
|
|
100
|
+
* with the same subject but different thumbprint. Note that this method is geared towards use with certs generated
|
|
101
|
+
* with the {@link generateCertWithOpenSsl} function, so this may not work using subject if your subject is not precisely "`CN=<url>`".
|
|
102
|
+
* @param identifier The subject or path to the pfx file of the cert to check.
|
|
103
|
+
* @returns `true` if the cert is already installed, `false` otherwise.
|
|
104
|
+
*/
|
|
105
|
+
export async function winCertIsInstalled(identifier, options) {
|
|
106
|
+
if (!isPlatformWindows()) {
|
|
107
|
+
throw new Error('winCertIsInstalled is only supported on Windows');
|
|
108
|
+
}
|
|
109
|
+
const mergedOptions = { ...defaultCertLogOptions, ...options };
|
|
110
|
+
let psCommandArgs;
|
|
111
|
+
// Get the count of certs installed with the same subject as the one we're trying to install
|
|
112
|
+
if (typeof identifier === 'string') {
|
|
113
|
+
requireString('subject', identifier);
|
|
114
|
+
validateSubject(identifier);
|
|
115
|
+
const subject = identifier.startsWith('CN=') ? identifier : `CN=${identifier}`;
|
|
116
|
+
psCommandArgs = getPowershellHackArgs(`Write-Host (Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Subject -eq '${subject}' } | Measure-Object).Count`);
|
|
89
117
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
118
|
+
else if ('pfxPath' in identifier) {
|
|
119
|
+
validatePfxPath(identifier.pfxPath);
|
|
120
|
+
psCommandArgs = getPowershellHackArgs(`Write-Host (Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Subject -eq (Get-PfxCertificate -FilePath '${identifier.pfxPath}').Subject } | Measure-Object).Count`);
|
|
121
|
+
}
|
|
122
|
+
const tracePart = (typeof identifier === 'string') ? `subject ${identifier}` : `pfxPath ${identifier.pfxPath}`;
|
|
123
|
+
logIf(mergedOptions.logTraceMessages, `checking if cert with ${tracePart} is already installed`);
|
|
124
|
+
const result = await spawnAsync('powershell', psCommandArgs, { stdio: 'pipe' });
|
|
125
|
+
throwIfSpawnResultError(result);
|
|
126
|
+
const lines = stringToNonEmptyLines(result.stdout);
|
|
127
|
+
if (lines.length !== 1) {
|
|
128
|
+
throw new Error(`Unexpected output from powershell command to check if the cert is already installed: ${result.stdout}`);
|
|
94
129
|
}
|
|
130
|
+
return lines[0].trim() !== '0';
|
|
95
131
|
}
|
|
96
132
|
/**
|
|
97
|
-
* Uses Powershell to uninstall a cert from the local machine's trusted root store. Must have
|
|
98
|
-
* @param
|
|
133
|
+
* Uses Powershell to uninstall a cert from the local machine's trusted root store. Must have elevated permissions.
|
|
134
|
+
* @param identifier The subject, thumbprint or path to the pfx file of the cert to uninstall.
|
|
135
|
+
* @param options Options for uninstalling the cert.
|
|
99
136
|
*/
|
|
100
|
-
export async function winUninstallCert(
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
137
|
+
export async function winUninstallCert(identifier, options) {
|
|
138
|
+
if (!isPlatformWindows()) {
|
|
139
|
+
throw new Error('winUninstallCert is only supported on Windows');
|
|
140
|
+
}
|
|
141
|
+
const mergedOptions = { ...defaultCertLogOptions, ...options };
|
|
142
|
+
logIf(mergedOptions.logElevatedPermissionsMessage, getRequiresElevatedPermissionsMessage(false));
|
|
143
|
+
let psCommandArgs;
|
|
144
|
+
if (typeof identifier === 'string') {
|
|
145
|
+
requireString('subject', identifier);
|
|
146
|
+
validateSubject(identifier);
|
|
147
|
+
psCommandArgs = getPowershellHackArgs(`Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Subject -match '${identifier}' } | Remove-Item`);
|
|
148
|
+
}
|
|
149
|
+
else if ('thumbprint' in identifier) {
|
|
150
|
+
validateNoQuotes('thumbprint', identifier.thumbprint);
|
|
151
|
+
psCommandArgs = getPowershellHackArgs(`Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Thumbprint -eq '${identifier.thumbprint}' } | Remove-Item`);
|
|
152
|
+
}
|
|
153
|
+
else if ('pfxPath' in identifier) {
|
|
154
|
+
validatePfxPath(identifier.pfxPath);
|
|
155
|
+
psCommandArgs = getPowershellHackArgs(`$thumbprint = (Get-PfxCertificate -FilePath '${identifier.pfxPath}').Thumbprint; Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Thumbprint -eq $thumbprint } | Remove-Item`);
|
|
156
|
+
}
|
|
157
|
+
const tracePart = typeof identifier === 'string' ? `'${identifier}'` : JSON.stringify(identifier);
|
|
158
|
+
logIf(mergedOptions.logTraceMessages, `uninstalling cert ${tracePart}`);
|
|
159
|
+
const result = await spawnAsync('powershell', psCommandArgs, { stdio: mergedOptions.logSpawnOutput ? 'inherit' : 'pipe' });
|
|
160
|
+
throwIfSpawnResultError(result);
|
|
161
|
+
logIf(mergedOptions.logSuccess, `${Emoji.GreenCheck} Successfully uninstalled cert`);
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
* Uses Powershell to get info about a cert.
|
|
165
|
+
* @param pfxPath The path to the pfx file to get info for.
|
|
166
|
+
* @returns The subject, thumbprint and pfxPath of the cert.
|
|
167
|
+
*/
|
|
168
|
+
export async function winGetPfxInfo(pfxPath) {
|
|
169
|
+
if (!isPlatformWindows()) {
|
|
170
|
+
throw new Error('winGetPfxInfo is only supported on Windows');
|
|
107
171
|
}
|
|
172
|
+
validatePfxPath(pfxPath);
|
|
173
|
+
const psCommandArgs = getPowershellHackArgs(`Get-PfxCertificate -FilePath '${pfxPath}' | Select-Object -Property Subject, Thumbprint, @{Name='PfxPath';Expression={'${pfxPath}'}} | ConvertTo-Json`);
|
|
174
|
+
const result = await spawnAsync('powershell', psCommandArgs, { stdio: 'pipe' });
|
|
175
|
+
throwIfSpawnResultError(result);
|
|
176
|
+
const json = result.stdout.trim();
|
|
177
|
+
const parsedJson = JSON.parse(json);
|
|
178
|
+
const certInfo = {
|
|
179
|
+
subject: parsedJson.Subject,
|
|
180
|
+
thumbprint: parsedJson.Thumbprint,
|
|
181
|
+
pfxPath: parsedJson.PfxPath
|
|
182
|
+
};
|
|
183
|
+
return certInfo;
|
|
108
184
|
}
|
|
109
185
|
/**
|
|
110
186
|
* Does not actually do anything - just outputs the manual instructions for installing a cert for use by chrome on linux.
|
|
@@ -114,32 +190,12 @@ export function linuxInstallCert() {
|
|
|
114
190
|
Manual Instructions:
|
|
115
191
|
- In Chrome, go to chrome://settings/certificates
|
|
116
192
|
- Select Authorities -> import
|
|
117
|
-
- Select your generated .crt file (in the ./cert/ directory by default - if you haven't generated it, see the generateCertWithOpenSsl
|
|
193
|
+
- Select your generated .crt file (in the ./cert/ directory by default - if you haven't generated it, see the generateCertWithOpenSsl function)
|
|
118
194
|
- Check box for "Trust certificate for identifying websites"
|
|
119
195
|
- Click OK
|
|
120
196
|
- Reload site`;
|
|
121
197
|
console.log(instructions);
|
|
122
198
|
}
|
|
123
|
-
/**
|
|
124
|
-
* Uses Powershell to check if a cert is already installed to the local machine's trusted root store.
|
|
125
|
-
* @param urlOrSubject The url or subject of the cert to check. If the cert was installed with the winInstallCert method, this will be the url passed to that method.
|
|
126
|
-
* @returns `true` if the cert is already installed, `false` otherwise.
|
|
127
|
-
*/
|
|
128
|
-
export async function winCertAlreadyInstalled(urlOrSubject) {
|
|
129
|
-
const psCommand = `${powershellHackPrefix}Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Subject -match '${urlOrSubject}' }`;
|
|
130
|
-
// The stdio option of 'pipe' is important here - if left to default of spawnAsync ('inherit'), stdout will be empty
|
|
131
|
-
const result = await nodeCliUtils.spawnAsync('powershell', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', psCommand], { stdio: ['inherit', 'pipe', 'pipe'] });
|
|
132
|
-
if (result.code !== 0) {
|
|
133
|
-
throw Error(`powershell command to find installed cert failed with exit code ${result.code}`);
|
|
134
|
-
}
|
|
135
|
-
const lines = nodeCliUtils.stringToNonEmptyLines(result.stdout);
|
|
136
|
-
for (const line of lines) {
|
|
137
|
-
if (line.includes(urlOrSubject)) {
|
|
138
|
-
return true;
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
return false;
|
|
142
|
-
}
|
|
143
199
|
function throwIfMaybeBadUrlChars(url, varName = 'url') {
|
|
144
200
|
if (url.includes(' ')) {
|
|
145
201
|
throw Error(`${varName} should not contain spaces`);
|
|
@@ -152,7 +208,7 @@ function throwIfMaybeBadUrlChars(url, varName = 'url') {
|
|
|
152
208
|
}
|
|
153
209
|
}
|
|
154
210
|
function getBrewOpensslPath() {
|
|
155
|
-
const brewResult =
|
|
211
|
+
const brewResult = simpleSpawnSync('brew', ['--prefix', 'openssl']);
|
|
156
212
|
if (brewResult.error) {
|
|
157
213
|
throw Error('error attempting to find openssl installed by brew');
|
|
158
214
|
}
|
|
@@ -164,6 +220,36 @@ function getBrewOpensslPath() {
|
|
|
164
220
|
function getSanCnfFileContents(url) {
|
|
165
221
|
return sanCnfTemplate.replace(/{{url}}/g, url);
|
|
166
222
|
}
|
|
223
|
+
function validateSubject(subject) {
|
|
224
|
+
if (subject.includes('\\') || subject.includes('/') || subject.endsWith('.pfx')) {
|
|
225
|
+
throw new Error(`The subject appears to be a file path, which is not allowed. Did you mean to pass something like this instead: { pfxPath: '${subject}' } ?`);
|
|
226
|
+
}
|
|
227
|
+
validateNoQuotes('subject', subject);
|
|
228
|
+
}
|
|
229
|
+
function validateNoQuotes(name, value) {
|
|
230
|
+
if (value.includes("'") || value.includes('"')) {
|
|
231
|
+
throw new Error(`The value passed for '${name}' contains a single or double quote, which is not allowed.`);
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
function throwIfSpawnResultError(result) {
|
|
235
|
+
if (result.code !== 0) {
|
|
236
|
+
// There won't be any stderr if stdio was set to 'inherit', so we're checking first
|
|
237
|
+
if (result.stderr) {
|
|
238
|
+
console.error(red('Error:'), result.stderr);
|
|
239
|
+
}
|
|
240
|
+
throw Error(`Spawned command failed with exit code ${result.code}`);
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
function validatePfxPath(pfxPath) {
|
|
244
|
+
if (!pfxPath.endsWith('.pfx')) {
|
|
245
|
+
throw new Error('pfxPath must end with .pfx');
|
|
246
|
+
}
|
|
247
|
+
requireValidPath('pfxPath', pfxPath);
|
|
248
|
+
validateNoQuotes('pfxPath', pfxPath);
|
|
249
|
+
}
|
|
250
|
+
function getRequiresElevatedPermissionsMessage(isInstall = true) {
|
|
251
|
+
return `${Emoji.Info} Important: ${isInstall ? '' : 'un'}installing a certificate requires elevated permissions`;
|
|
252
|
+
}
|
|
167
253
|
// Newer cert requirements force the need for "extension info" with DNS and IP info, but openssl v1.x doesn't support that with the
|
|
168
254
|
// CLI option -addext, so we're using a san.cnf file instead and passing this into the CLI command with the -config option.
|
|
169
255
|
const sanCnfTemplate = `[req]
|
|
@@ -182,4 +268,4 @@ DNS.1 = {{url}}
|
|
|
182
268
|
IP.1 = 127.0.0.1
|
|
183
269
|
|
|
184
270
|
`;
|
|
185
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydFV0aWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NlcnRVdGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxTQUFTLENBQUE7QUFDeEIsT0FBTyxHQUFHLE1BQU0sa0JBQWtCLENBQUE7QUFDbEMsT0FBTyxJQUFJLE1BQU0sV0FBVyxDQUFBO0FBQzVCLE9BQU8sS0FBSyxZQUFZLE1BQU0sbUJBQW1CLENBQUE7QUFDakQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBRXZDLE1BQU0sb0JBQW9CLEdBQUcsMENBQTBDLENBQUE7QUFDdkUsTUFBTSxvQkFBb0IsR0FBRyx3RkFBd0YsQ0FBQTtBQUVySDs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSx1QkFBdUIsQ0FBQyxHQUFXLEVBQUUsa0JBQTBCLFFBQVE7SUFDM0YsWUFBWSxDQUFDLGFBQWEsQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDdEMsdUJBQXVCLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDNUIsTUFBTSxLQUFLLEdBQUcsWUFBWSxDQUFDLGFBQWEsRUFBRSxDQUFBO0lBQzFDLE1BQU0sU0FBUyxHQUFHLEVBQUUsR0FBRyxFQUFFLGVBQWUsRUFBRSxDQUFBO0lBRTFDLEdBQUcsQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFBO0lBQ3pDLElBQUksZUFBZSxHQUFXLEVBQUUsQ0FBQTtJQUNoQyxJQUFJLENBQUMsS0FBSyxFQUFFO1FBQ1YsTUFBTSxXQUFXLEdBQUcsWUFBWSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxRQUFRLENBQUE7UUFDOUQsSUFBSSxDQUFDLFdBQVcsRUFBRTtZQUNoQixNQUFNLEtBQUssQ0FBQyx1Q0FBdUMsQ0FBQyxDQUFBO1NBQ3JEO1FBQ0QsR0FBRyxDQUFDLHVCQUF1QixXQUFXLEVBQUUsQ0FBQyxDQUFBO0tBQzFDO1NBQU0sSUFBSSxLQUFLLEVB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
|
|
271
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certUtils.js","sourceRoot":"","sources":["../../src/certUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getConfirmation, log, requireString, requireValidPath, spawnAsync } from './generalUtils.js';
|
|
1
|
+
import { Emoji, getConfirmation, log, requireString, requireValidPath, spawnAsync } from './generalUtils.js';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import fs from 'node:fs';
|
|
4
4
|
import fsp from 'node:fs/promises';
|
|
@@ -81,7 +81,7 @@ async function deleteScriptFileIfEmpty(scriptPath) {
|
|
|
81
81
|
await fsp.unlink(scriptPath);
|
|
82
82
|
}
|
|
83
83
|
else {
|
|
84
|
-
log(
|
|
84
|
+
log(`${Emoji.Warning} Skipping deletion of non-empty script file: ${scriptPath}`);
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
}
|
|
@@ -99,7 +99,7 @@ async function getLastMigrationName(projectPath, dbContextName) {
|
|
|
99
99
|
});
|
|
100
100
|
log(`Found migrations: ${migrationNamesWithTimestamps.map(m => m.name).join(', ')}`);
|
|
101
101
|
log(`Found timestamps: ${migrationNamesWithTimestamps.map(m => m.timestamp).join(', ')}`);
|
|
102
|
-
const sortedMigrationNames = migrationNamesWithTimestamps.sort((a, b) => a.timestamp.localeCompare(b.timestamp));
|
|
102
|
+
const sortedMigrationNames = [...migrationNamesWithTimestamps].sort((a, b) => a.timestamp.localeCompare(b.timestamp));
|
|
103
103
|
const lastMigrationName = sortedMigrationNames[sortedMigrationNames.length - 1].name;
|
|
104
104
|
return lastMigrationName;
|
|
105
105
|
}
|
|
@@ -112,7 +112,7 @@ function getMigrationsDirectory(projectDirectory, dbContextName) {
|
|
|
112
112
|
function getScriptPath(projectDirectory, migrationName, isUp) {
|
|
113
113
|
return path.join(projectDirectory, `Scripts/${migrationName}${isUp ? '' : '_Down'}.sql`);
|
|
114
114
|
}
|
|
115
|
-
async function
|
|
115
|
+
async function getCSharpMigrationFilePath(projectDirectory, dbContextName, migrationName) {
|
|
116
116
|
const migrationsOutputDir = getMigrationsDirectory(projectDirectory, dbContextName);
|
|
117
117
|
if (!fs.existsSync(migrationsOutputDir)) {
|
|
118
118
|
throw new Error(`Unable to add migration C# boilerplate - could not find migrations output directory: ${migrationsOutputDir}`);
|
|
@@ -129,66 +129,56 @@ async function addDbMigrationBoilerplate(projectDirectory, dbContextName, migrat
|
|
|
129
129
|
const filename = filenames[0];
|
|
130
130
|
const filePath = path.join(migrationsOutputDir, filename);
|
|
131
131
|
if (!fs.existsSync(filePath)) {
|
|
132
|
-
throw new Error(`Issue generating file path for migration (
|
|
133
|
-
}
|
|
134
|
-
log(`Adding boilerplate to file 📄${filePath}`);
|
|
135
|
-
const usingLine = 'using MikeyT.DbMigrations;';
|
|
136
|
-
const upLine = `MigrationScriptRunner.RunScript(migrationBuilder, "${migrationName}.sql");`;
|
|
137
|
-
const downLine = `MigrationScriptRunner.RunScript(migrationBuilder, "${migrationName}_Down.sql");`;
|
|
138
|
-
const fileContents = await fsp.readFile(filePath, { encoding: 'utf8' });
|
|
139
|
-
const lines = fileContents.replaceAll('\r', '').split('\n');
|
|
140
|
-
const newLines = [];
|
|
141
|
-
newLines.push(lines[0].trim());
|
|
142
|
-
newLines.push(usingLine);
|
|
143
|
-
let addUpLine = false;
|
|
144
|
-
let addDownLine = false;
|
|
145
|
-
let skipNextLineIfBlank = false;
|
|
146
|
-
for (let i = 1; i < lines.length; i++) {
|
|
147
|
-
if (skipNextLineIfBlank && lines[i].trim().length === 0) {
|
|
148
|
-
skipNextLineIfBlank = false;
|
|
149
|
-
continue;
|
|
150
|
-
}
|
|
151
|
-
if (addUpLine) {
|
|
152
|
-
const newLine = lines[i].replace('{', `{\n\t\t\t${upLine}`);
|
|
153
|
-
newLines.push(newLine);
|
|
154
|
-
addUpLine = false;
|
|
155
|
-
skipNextLineIfBlank = true;
|
|
156
|
-
continue;
|
|
157
|
-
}
|
|
158
|
-
if (addDownLine) {
|
|
159
|
-
const newLine = lines[i].replace('{', `{\n\t\t\t${downLine}`);
|
|
160
|
-
newLines.push(newLine);
|
|
161
|
-
addDownLine = false;
|
|
162
|
-
skipNextLineIfBlank = true;
|
|
163
|
-
continue;
|
|
164
|
-
}
|
|
165
|
-
newLines.push(lines[i]);
|
|
166
|
-
if (lines[i].includes('void Up')) {
|
|
167
|
-
addUpLine = true;
|
|
168
|
-
}
|
|
169
|
-
if (lines[i].includes('void Down')) {
|
|
170
|
-
addDownLine = true;
|
|
171
|
-
}
|
|
132
|
+
throw new Error(`Issue generating file path for migration (bad file path): ${filePath}`);
|
|
172
133
|
}
|
|
173
|
-
|
|
134
|
+
return filePath;
|
|
135
|
+
}
|
|
136
|
+
async function addDbMigrationBoilerplate(projectDirectory, dbContextName, migrationName) {
|
|
137
|
+
const filePath = await getCSharpMigrationFilePath(projectDirectory, dbContextName, migrationName);
|
|
138
|
+
log(`Replacing file contents with boilerplate for file 📄${filePath}`);
|
|
139
|
+
const newFileContents = cSharpMigrationFileTemplate
|
|
140
|
+
.replaceAll(contextNamePlaceholder, dbContextName)
|
|
141
|
+
.replaceAll(migrationNamePlaceholder, migrationName);
|
|
174
142
|
await fsp.writeFile(filePath, newFileContents, { encoding: 'utf8' });
|
|
175
|
-
log(`Updated file with boilerplate - please ensure it is correct:
|
|
143
|
+
log(`Updated file with boilerplate - please ensure it is correct: 📄${filePath}`);
|
|
176
144
|
const upScriptPath = path.join(projectDirectory, `Scripts/${migrationName}.sql`);
|
|
177
145
|
const downScriptPath = path.join(projectDirectory, `Scripts/${migrationName}_Down.sql`);
|
|
178
146
|
log('\nCreating corresponding empty sql files (no action will be taken if they already exist):');
|
|
179
147
|
log(` - 📄${upScriptPath}`);
|
|
180
148
|
log(` - 📄${downScriptPath}\n`);
|
|
181
|
-
|
|
182
|
-
|
|
149
|
+
await writeEmptySqlFileIfNotExists(upScriptPath, 'Up');
|
|
150
|
+
await writeEmptySqlFileIfNotExists(downScriptPath, 'Down');
|
|
151
|
+
}
|
|
152
|
+
async function writeEmptySqlFileIfNotExists(scriptPath, scriptType) {
|
|
153
|
+
if (!fs.existsSync(scriptPath)) {
|
|
154
|
+
await fsp.writeFile(scriptPath, '', { encoding: 'utf8' });
|
|
183
155
|
}
|
|
184
156
|
else {
|
|
185
|
-
log(
|
|
157
|
+
log(`Skipping ${scriptType} sql script (already exists)`);
|
|
186
158
|
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
159
|
+
}
|
|
160
|
+
const contextNamePlaceholder = '{{context_name}}';
|
|
161
|
+
const migrationNamePlaceholder = '{{migration_name}}';
|
|
162
|
+
const cSharpMigrationFileTemplate = `using Microsoft.EntityFrameworkCore.Migrations;
|
|
163
|
+
using MikeyT.DbMigrations;
|
|
164
|
+
|
|
165
|
+
#nullable disable
|
|
166
|
+
|
|
167
|
+
namespace DbMigrator.Migrations.${contextNamePlaceholder}Migrations
|
|
168
|
+
{
|
|
169
|
+
public partial class ${migrationNamePlaceholder} : Migration
|
|
170
|
+
{
|
|
171
|
+
protected override void Up(MigrationBuilder migrationBuilder)
|
|
172
|
+
{
|
|
173
|
+
MigrationScriptRunner.RunScript(migrationBuilder, "${migrationNamePlaceholder}.sql");
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
protected override void Down(MigrationBuilder migrationBuilder)
|
|
177
|
+
{
|
|
178
|
+
MigrationScriptRunner.RunScript(migrationBuilder, "${migrationNamePlaceholder}_Down.sql");
|
|
179
|
+
}
|
|
192
180
|
}
|
|
193
181
|
}
|
|
194
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dbMigrationUtils.js","sourceRoot":"","sources":["../../src/dbMigrationUtils.ts"],"names":[],"mappings":"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"}
|
|
182
|
+
|
|
183
|
+
`;
|
|
184
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dbMigrationUtils.js","sourceRoot":"","sources":["../../src/dbMigrationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnetUtils.d.ts","sourceRoot":"","sources":["../../src/dotnetUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dotnetUtils.d.ts","sourceRoot":"","sources":["../../src/dotnetUtils.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,iBAGpD;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,GAAE,MAAa,EAAE,aAAa,GAAE,MAAkB,EAAE,SAAS,GAAE,MAAkB,EAAE,GAAG,CAAC,EAAE,MAAM,iBAY7I;AAED;;GAEG;AACH,wBAAsB,2BAA2B,kBAShD;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,kBAG5C"}
|
package/dist/esm/dotnetUtils.js
CHANGED
|
@@ -23,7 +23,9 @@ export async function dotnetPublish(projectPath = './', configuration = 'Release
|
|
|
23
23
|
requireValidPath('cwd', cwd);
|
|
24
24
|
}
|
|
25
25
|
const args = ['publish', projectPath, '-c', configuration, '-o', outputDir];
|
|
26
|
-
|
|
26
|
+
const traceMessage = `running dotnet ${args.join(' ')}`;
|
|
27
|
+
const traceAdditional = cwd ? ` in cwd ${cwd}` : '';
|
|
28
|
+
trace(`${traceMessage}${traceAdditional}`);
|
|
27
29
|
await spawnAsync('dotnet', args, { cwd: cwd });
|
|
28
30
|
}
|
|
29
31
|
/**
|
|
@@ -49,4 +51,4 @@ export async function configureDotnetDevCerts() {
|
|
|
49
51
|
await spawnAsync('dotnet', ['dev-certs', 'https', '--clean']);
|
|
50
52
|
await spawnAsync('dotnet', ['dev-certs', 'https', '-t']);
|
|
51
53
|
}
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG90bmV0VXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZG90bmV0VXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQU10Rzs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxXQUFXLENBQUMsV0FBbUI7SUFDbkQsZ0JBQWdCLENBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFBO0lBQzVDLE1BQU0sVUFBVSxDQUFDLFFBQVEsRUFBRSxDQUFDLE9BQU8sRUFBRSxXQUFXLENBQUMsRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0FBQzlFLENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGFBQWEsQ0FBQyxjQUFzQixJQUFJLEVBQUUsZ0JBQXdCLFNBQVMsRUFBRSxZQUFvQixTQUFTLEVBQUUsR0FBWTtJQUM1SSxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDNUMsYUFBYSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUNyQyxhQUFhLENBQUMsZUFBZSxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQzdDLElBQUksR0FBRyxFQUFFO1FBQ1AsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0tBQzdCO0lBQ0QsTUFBTSxJQUFJLEdBQUcsQ0FBQyxTQUFTLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBQzNFLE1BQU0sWUFBWSxHQUFHLGtCQUFrQixJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUE7SUFDdkQsTUFBTSxlQUFlLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxXQUFXLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7SUFDbkQsS0FBSyxDQUFDLEdBQUcsWUFBWSxHQUFHLGVBQWUsRUFBRSxDQUFDLENBQUE7SUFDMUMsTUFBTSxVQUFVLENBQUMsUUFBUSxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFBO0FBQ2hELENBQUM7QUFFRDs7R0FFRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsMkJBQTJCO0lBQy9DLE1BQU0sU0FBUyxHQUFHLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxRQUFRLENBQUE7SUFDakQsSUFBSSxTQUFTLEVBQUU7UUFDYixHQUFHLENBQUMsK0NBQStDLENBQUMsQ0FBQTtLQUNyRDtTQUFNO1FBQ0wsR0FBRyxDQUFDLDZDQUE2QyxDQUFDLENBQUE7S0FDbkQ7SUFDRCxNQUFNLElBQUksR0FBRyxDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsU0FBUyxFQUFFLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBQTtJQUNoRixNQUFNLFVBQVUsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUE7QUFDbEMsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLHVCQUF1QjtJQUMzQyxNQUFNLFVBQVUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxXQUFXLEVBQUUsT0FBTyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUE7SUFDN0QsTUFBTSxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUMsV0FBVyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFBO0FBQzFELENBQUMifQ==
|
|
@@ -1,2 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Only dynamically import this if ESM is detected. This allows a CJS-specific build to avoid
|
|
3
|
+
* an error it would otherwise encounter when parsing import.meta.url.
|
|
4
|
+
* @returns the file path of the currently executing script
|
|
5
|
+
*/
|
|
1
6
|
export declare const getImportMetaUrlFilePath: () => string;
|
|
2
7
|
//# sourceMappingURL=esmSpecific.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"esmSpecific.d.mts","sourceRoot":"","sources":["../../src/esmSpecific.mts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,cAGpC,CAAA"}
|
|
1
|
+
{"version":3,"file":"esmSpecific.d.mts","sourceRoot":"","sources":["../../src/esmSpecific.mts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,cAGpC,CAAA"}
|
package/dist/esm/esmSpecific.mjs
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { fileURLToPath } from 'node:url';
|
|
2
|
+
/**
|
|
3
|
+
* Only dynamically import this if ESM is detected. This allows a CJS-specific build to avoid
|
|
4
|
+
* an error it would otherwise encounter when parsing import.meta.url.
|
|
5
|
+
* @returns the file path of the currently executing script
|
|
6
|
+
*/
|
|
2
7
|
export const getImportMetaUrlFilePath = () => {
|
|
3
8
|
// @ts-ignore
|
|
4
9
|
return fileURLToPath(import.meta.url);
|
|
5
10
|
};
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXNtU3BlY2lmaWMubWpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2VzbVNwZWNpZmljLm10cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBRXhDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FBRyxHQUFHLEVBQUU7SUFDM0MsYUFBYTtJQUNiLE9BQU8sYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7QUFDdkMsQ0FBQyxDQUFBIn0=
|