@git.zone/tspublish 1.10.2 → 1.11.0
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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.publishmodule.d.ts +12 -0
- package/dist_ts/classes.publishmodule.js +102 -19
- package/dist_ts/classes.tspublish.js +13 -9
- package/dist_ts/plugins.d.ts +4 -1
- package/dist_ts/plugins.js +6 -2
- package/npmextra.json +10 -4
- package/package.json +20 -17
- package/readme.md +51 -14
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.publishmodule.ts +126 -42
- package/ts/classes.tspublish.ts +15 -10
- package/ts/plugins.ts +6 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tspublish',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.11.0',
|
|
7
7
|
description: 'A tool to publish multiple, concise, and small packages from monorepos, specifically for TypeScript projects within a git environment.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxxQkFBcUI7SUFDM0IsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHdJQUF3STtDQUN0SixDQUFBIn0=
|
|
@@ -12,6 +12,10 @@ export interface IPublishModuleOptions {
|
|
|
12
12
|
[key: string]: string;
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
|
+
export interface IResolvedRegistry {
|
|
16
|
+
url: string;
|
|
17
|
+
accessLevel: string;
|
|
18
|
+
}
|
|
15
19
|
export declare class PublishModule {
|
|
16
20
|
tsPublishRef: TsPublish;
|
|
17
21
|
options: IPublishModuleOptions;
|
|
@@ -23,5 +27,13 @@ export declare class PublishModule {
|
|
|
23
27
|
createPublishModuleDir(): Promise<void>;
|
|
24
28
|
build(): Promise<void>;
|
|
25
29
|
createBinCliSetup(): Promise<void>;
|
|
30
|
+
/**
|
|
31
|
+
* Resolves the registries to publish to based on tspublish.json configuration.
|
|
32
|
+
* Supports:
|
|
33
|
+
* - "useBase": Use only registries from npmextra.json
|
|
34
|
+
* - "extendBase": Use base registries + additions, with exclusions via "-" prefix
|
|
35
|
+
* - Explicit registries: Direct registry URLs in format "url:accessLevel"
|
|
36
|
+
*/
|
|
37
|
+
private resolveRegistries;
|
|
26
38
|
publish(): Promise<void>;
|
|
27
39
|
}
|
|
@@ -13,9 +13,13 @@ export class PublishModule {
|
|
|
13
13
|
if (!this.options.packageSubFolder.startsWith('ts')) {
|
|
14
14
|
throw new Error('subFolder must start with "ts"');
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
const tspublishJsonPath = plugins.path.join(this.options.packageSubFolderFullPath, 'tspublish.json');
|
|
17
|
+
const tspublishJsonContent = await plugins.smartfs.file(tspublishJsonPath).encoding('utf8').read();
|
|
18
|
+
this.options.tsPublishJson = JSON.parse(tspublishJsonContent);
|
|
17
19
|
// the package.json of the parent mono repo
|
|
18
|
-
const
|
|
20
|
+
const packageJsonPath = plugins.path.join(this.options.monoRepoDir, 'package.json');
|
|
21
|
+
const packageJsonContent = await plugins.smartfs.file(packageJsonPath).encoding('utf8').read();
|
|
22
|
+
const monoRepoPackageJson = JSON.parse(packageJsonContent);
|
|
19
23
|
this.options.dependencies = {
|
|
20
24
|
...this.options.dependencies,
|
|
21
25
|
...(() => {
|
|
@@ -61,7 +65,12 @@ export class PublishModule {
|
|
|
61
65
|
return packageInfo.allVersions[0].version;
|
|
62
66
|
}
|
|
63
67
|
async createTsconfigJson() {
|
|
64
|
-
const
|
|
68
|
+
const tsconfigPath = plugins.path.join(paths.cwd, 'tsconfig.json');
|
|
69
|
+
let originalTsConfig = null;
|
|
70
|
+
if (await plugins.smartfs.file(tsconfigPath).exists()) {
|
|
71
|
+
const tsconfigContent = await plugins.smartfs.file(tsconfigPath).encoding('utf8').read();
|
|
72
|
+
originalTsConfig = JSON.parse(tsconfigContent);
|
|
73
|
+
}
|
|
65
74
|
if (originalTsConfig?.compilerOptions?.paths) {
|
|
66
75
|
for (const path of Object.keys(originalTsConfig.compilerOptions.paths)) {
|
|
67
76
|
originalTsConfig.compilerOptions.paths[path][0] = `.${originalTsConfig.compilerOptions.paths[path][0]}`;
|
|
@@ -127,19 +136,29 @@ export class PublishModule {
|
|
|
127
136
|
async createPublishModuleDir() {
|
|
128
137
|
logOngoing(`Creating publish directory for ${this.options.name}`);
|
|
129
138
|
this.options.publishModDirFullPath = plugins.path.join(this.options.monoRepoDir, `dist_publish_${this.options.packageSubFolder}`);
|
|
130
|
-
|
|
139
|
+
// Ensure empty directory
|
|
140
|
+
const publishDir = plugins.smartfs.directory(this.options.publishModDirFullPath);
|
|
141
|
+
if (await publishDir.exists()) {
|
|
142
|
+
await publishDir.recursive().delete();
|
|
143
|
+
}
|
|
144
|
+
await publishDir.recursive().create();
|
|
131
145
|
// package.json
|
|
132
|
-
const
|
|
133
|
-
await
|
|
146
|
+
const packageJsonPath = plugins.path.join(this.options.publishModDirFullPath, 'package.json');
|
|
147
|
+
await plugins.smartfs.file(packageJsonPath).encoding('utf8').write(await this.createPackageJson());
|
|
134
148
|
// tsconfig.json
|
|
135
|
-
const
|
|
136
|
-
await
|
|
149
|
+
const tsconfigJsonPath = plugins.path.join(this.options.publishModDirFullPath, 'tsconfig.json');
|
|
150
|
+
await plugins.smartfs.file(tsconfigJsonPath).encoding('utf8').write(await this.createTsconfigJson());
|
|
137
151
|
// ts subfolder, the folder that contains the source code and is being transpiled
|
|
138
|
-
|
|
152
|
+
const destSubFolder = plugins.path.join(this.options.publishModDirFullPath, this.options.packageSubFolder);
|
|
153
|
+
await plugins.smartfs.directory(this.options.packageSubFolderFullPath).recursive().copy(destSubFolder);
|
|
139
154
|
// readme
|
|
140
|
-
|
|
155
|
+
const readmeSrc = plugins.path.join(this.options.packageSubFolderFullPath, 'readme.md');
|
|
156
|
+
const readmeDest = plugins.path.join(this.options.publishModDirFullPath, 'readme.md');
|
|
157
|
+
await plugins.smartfs.file(readmeSrc).copy(readmeDest);
|
|
141
158
|
// license
|
|
142
|
-
|
|
159
|
+
const licenseSrc = plugins.path.join(this.options.monoRepoDir, 'license');
|
|
160
|
+
const licenseDest = plugins.path.join(this.options.publishModDirFullPath, 'license');
|
|
161
|
+
await plugins.smartfs.file(licenseSrc).copy(licenseDest);
|
|
143
162
|
// cli stuff
|
|
144
163
|
this.createBinCliSetup();
|
|
145
164
|
}
|
|
@@ -158,20 +177,84 @@ export class PublishModule {
|
|
|
158
177
|
const files = await this.tsPublishRef.giteaAssetsInstance.getFiles('git.zone', 'cli', 'assets/templates/cli/cli.js');
|
|
159
178
|
const indexPath = `./dist_${this.options.packageSubFolder}/index.js`;
|
|
160
179
|
const fileContent = atob(files[0].base64Content).replace('./dist_ts/index.js', indexPath);
|
|
161
|
-
|
|
180
|
+
const cliJsPath = plugins.path.join(this.options.publishModDirFullPath, 'cli.js');
|
|
181
|
+
await plugins.smartfs.file(cliJsPath).encoding('utf8').write(fileContent);
|
|
182
|
+
}
|
|
183
|
+
/**
|
|
184
|
+
* Resolves the registries to publish to based on tspublish.json configuration.
|
|
185
|
+
* Supports:
|
|
186
|
+
* - "useBase": Use only registries from npmextra.json
|
|
187
|
+
* - "extendBase": Use base registries + additions, with exclusions via "-" prefix
|
|
188
|
+
* - Explicit registries: Direct registry URLs in format "url:accessLevel"
|
|
189
|
+
*/
|
|
190
|
+
async resolveRegistries() {
|
|
191
|
+
const rawRegistries = this.options.tsPublishJson?.registries || [];
|
|
192
|
+
// Empty → skip publishing
|
|
193
|
+
if (rawRegistries.length === 0) {
|
|
194
|
+
return [];
|
|
195
|
+
}
|
|
196
|
+
const hasUseBase = rawRegistries.includes('useBase');
|
|
197
|
+
const hasExtendBase = rawRegistries.includes('extendBase');
|
|
198
|
+
let baseRegistries = [];
|
|
199
|
+
let baseAccessLevel = 'public';
|
|
200
|
+
// Load base registries from npmextra.json if needed
|
|
201
|
+
if (hasUseBase || hasExtendBase) {
|
|
202
|
+
const npmextraInstance = new plugins.npmextra.Npmextra(this.options.monoRepoDir);
|
|
203
|
+
const gitzoneConfig = npmextraInstance.dataFor('@git.zone/cli', {});
|
|
204
|
+
baseRegistries = gitzoneConfig?.release?.registries || [];
|
|
205
|
+
baseAccessLevel = gitzoneConfig?.release?.accessLevel || 'public';
|
|
206
|
+
if (baseRegistries.length === 0) {
|
|
207
|
+
throw new Error(`useBase/extendBase specified in tspublish.json but no registries configured in npmextra.json at @git.zone/cli.release.registries`);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
// useBase: Only base registries
|
|
211
|
+
if (hasUseBase) {
|
|
212
|
+
return baseRegistries.map((url) => ({ url, accessLevel: baseAccessLevel }));
|
|
213
|
+
}
|
|
214
|
+
// extendBase: Base registries + additions - exclusions
|
|
215
|
+
if (hasExtendBase) {
|
|
216
|
+
const exclusions = rawRegistries
|
|
217
|
+
.filter((r) => r.startsWith('-'))
|
|
218
|
+
.map((r) => r.slice(1)); // remove '-' prefix
|
|
219
|
+
const additions = rawRegistries.filter((r) => r !== 'extendBase' && !r.startsWith('-'));
|
|
220
|
+
// Filter out excluded base registries
|
|
221
|
+
const result = baseRegistries
|
|
222
|
+
.filter((url) => !exclusions.includes(url))
|
|
223
|
+
.map((url) => ({ url, accessLevel: baseAccessLevel }));
|
|
224
|
+
// Add explicit registries
|
|
225
|
+
for (const addition of additions) {
|
|
226
|
+
const parts = addition.split(':');
|
|
227
|
+
const url = parts[0];
|
|
228
|
+
const access = parts[1] || 'public';
|
|
229
|
+
result.push({ url, accessLevel: access });
|
|
230
|
+
}
|
|
231
|
+
return result;
|
|
232
|
+
}
|
|
233
|
+
// Explicit registries only (original behavior)
|
|
234
|
+
return rawRegistries.map((r) => {
|
|
235
|
+
const parts = r.split(':');
|
|
236
|
+
const url = parts[0];
|
|
237
|
+
const access = parts[1] || 'public';
|
|
238
|
+
return { url, accessLevel: access };
|
|
239
|
+
});
|
|
162
240
|
}
|
|
163
241
|
async publish() {
|
|
164
|
-
|
|
242
|
+
const registries = await this.resolveRegistries();
|
|
243
|
+
// Handle empty registries
|
|
244
|
+
if (registries.length === 0) {
|
|
245
|
+
logWarn(`No registries configured for ${this.options.name}. Skipping publish.`);
|
|
246
|
+
return;
|
|
247
|
+
}
|
|
248
|
+
logPublish(`Publishing ${this.options.name} v${this.options.version} to ${registries.length} registry(ies)...`);
|
|
165
249
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
166
250
|
executor: 'bash',
|
|
167
251
|
});
|
|
168
|
-
for (const registry of
|
|
169
|
-
const
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
await smartshellInstance.exec(`cd ${this.options.publishModDirFullPath} && pnpm publish ${registryAccessLevel === 'public' ? '--access public' : ''} --no-git-checks --registry https://${registryUrl}`);
|
|
252
|
+
for (const registry of registries) {
|
|
253
|
+
const registryUrl = registry.url.startsWith('https://') ? registry.url : `https://${registry.url}`;
|
|
254
|
+
logOngoing(`Publishing to ${registryUrl}...`);
|
|
255
|
+
await smartshellInstance.exec(`cd ${this.options.publishModDirFullPath} && pnpm publish ${registry.accessLevel === 'public' ? '--access public' : ''} --no-git-checks --registry ${registryUrl}`);
|
|
173
256
|
}
|
|
174
257
|
logSuccess(`Successfully published ${this.options.name} v${this.options.version}!`);
|
|
175
258
|
}
|
|
176
259
|
}
|
|
177
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.publishmodule.js","sourceRoot":"","sources":["../ts/classes.publishmodule.ts"],"names":[],"mappings":"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"}
|
|
260
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.publishmodule.js","sourceRoot":"","sources":["../ts/classes.publishmodule.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,23 +37,27 @@ export class TsPublish {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
async getModuleSubDirs(dirArg) {
|
|
40
|
-
|
|
40
|
+
// List all directories
|
|
41
|
+
const dirContents = await plugins.smartfs.directory(dirArg).list();
|
|
41
42
|
const publishModules = {};
|
|
42
|
-
for (const
|
|
43
|
-
|
|
43
|
+
for (const entry of dirContents) {
|
|
44
|
+
const subDirName = entry.name;
|
|
45
|
+
if (!subDirName.startsWith('ts')) {
|
|
44
46
|
continue;
|
|
45
47
|
}
|
|
46
|
-
|
|
47
|
-
const
|
|
48
|
-
|
|
48
|
+
// Check if this is a directory and has tspublish.json
|
|
49
|
+
const subDirPath = plugins.path.join(dirArg, subDirName);
|
|
50
|
+
const tspublishJsonPath = plugins.path.join(subDirPath, 'tspublish.json');
|
|
51
|
+
if (!(await plugins.smartfs.file(tspublishJsonPath).exists())) {
|
|
49
52
|
continue;
|
|
50
53
|
}
|
|
51
|
-
logPackage('Found module',
|
|
52
|
-
|
|
54
|
+
logPackage('Found module', subDirName);
|
|
55
|
+
const tspublishContent = await plugins.smartfs.file(tspublishJsonPath).encoding('utf8').read();
|
|
56
|
+
publishModules[subDirName] = JSON.parse(tspublishContent);
|
|
53
57
|
}
|
|
54
58
|
logSuccess(`Found ${Object.keys(publishModules).length} publish modules`);
|
|
55
59
|
logInfo('Ordering publish modules...');
|
|
56
60
|
return publishModules;
|
|
57
61
|
}
|
|
58
62
|
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy50c3B1Ymxpc2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLnRzcHVibGlzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUNuSixPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssVUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdkQsTUFBTSxPQUFPLFNBQVM7SUFHcEI7UUFDRSxJQUFJLENBQUMsbUJBQW1CLEdBQUcsSUFBSSxXQUFXLENBQUM7WUFDekMsWUFBWSxFQUFFLDBCQUEwQjtTQUN6QyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU0sS0FBSyxDQUFDLE9BQU8sQ0FBQyxjQUFzQjtRQUN6QyxTQUFTLENBQUMsOEJBQThCLENBQUMsQ0FBQztRQUMxQyxNQUFNLGNBQWMsR0FBRyxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUNuRSxPQUFPLENBQUMsU0FBUyxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDLE1BQU0sa0JBQWtCLENBQUMsQ0FBQztRQUN2RSxZQUFZLEVBQUUsQ0FBQztRQUNmLEtBQUssTUFBTSxhQUFhLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDO1lBQ3hELFVBQVUsQ0FBQyxjQUFjLEVBQUUsR0FBRyxhQUFhLE1BQU0sY0FBYyxDQUFDLGFBQWEsQ0FBQyxDQUFDLElB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
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import * as path from 'path';
|
|
2
2
|
export { path };
|
|
3
3
|
import * as consolecolor from '@push.rocks/consolecolor';
|
|
4
|
+
import * as npmextra from '@push.rocks/npmextra';
|
|
4
5
|
import * as smartfile from '@push.rocks/smartfile';
|
|
6
|
+
import { SmartFs } from '@push.rocks/smartfs';
|
|
5
7
|
import * as smartcli from '@push.rocks/smartcli';
|
|
6
8
|
import * as smartdelay from '@push.rocks/smartdelay';
|
|
7
9
|
import * as smartlog from '@push.rocks/smartlog';
|
|
@@ -9,4 +11,5 @@ import * as smartnpm from '@push.rocks/smartnpm';
|
|
|
9
11
|
import * as smartpath from '@push.rocks/smartpath';
|
|
10
12
|
import * as smartrequest from '@push.rocks/smartrequest';
|
|
11
13
|
import * as smartshell from '@push.rocks/smartshell';
|
|
12
|
-
|
|
14
|
+
declare const smartfs: SmartFs;
|
|
15
|
+
export { consolecolor, npmextra, smartfile, smartfs, smartcli, smartdelay, smartlog, smartnpm, smartpath, smartrequest, smartshell };
|
package/dist_ts/plugins.js
CHANGED
|
@@ -3,7 +3,9 @@ import * as path from 'path';
|
|
|
3
3
|
export { path };
|
|
4
4
|
// @push.rocks scope
|
|
5
5
|
import * as consolecolor from '@push.rocks/consolecolor';
|
|
6
|
+
import * as npmextra from '@push.rocks/npmextra';
|
|
6
7
|
import * as smartfile from '@push.rocks/smartfile';
|
|
8
|
+
import { SmartFs, SmartFsProviderNode } from '@push.rocks/smartfs';
|
|
7
9
|
import * as smartcli from '@push.rocks/smartcli';
|
|
8
10
|
import * as smartdelay from '@push.rocks/smartdelay';
|
|
9
11
|
import * as smartlog from '@push.rocks/smartlog';
|
|
@@ -11,5 +13,7 @@ import * as smartnpm from '@push.rocks/smartnpm';
|
|
|
11
13
|
import * as smartpath from '@push.rocks/smartpath';
|
|
12
14
|
import * as smartrequest from '@push.rocks/smartrequest';
|
|
13
15
|
import * as smartshell from '@push.rocks/smartshell';
|
|
14
|
-
|
|
15
|
-
|
|
16
|
+
// Create a pre-configured SmartFs instance for Node.js filesystem operations
|
|
17
|
+
const smartfs = new SmartFs(new SmartFsProviderNode());
|
|
18
|
+
export { consolecolor, npmextra, smartfile, smartfs, smartcli, smartdelay, smartlog, smartnpm, smartpath, smartrequest, smartshell };
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztBQUVoQixvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25FLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFFckQsNkVBQTZFO0FBQzdFLE1BQU0sT0FBTyxHQUFHLElBQUksT0FBTyxDQUFDLElBQUksbUJBQW1CLEVBQUUsQ0FBQyxDQUFDO0FBRXZELE9BQU8sRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLENBQUMifQ==
|
package/npmextra.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"
|
|
2
|
+
"@git.zone/cli": {
|
|
3
3
|
"projectType": "npm",
|
|
4
4
|
"module": {
|
|
5
5
|
"githost": "code.foss.global",
|
|
@@ -21,10 +21,16 @@
|
|
|
21
21
|
"module-management",
|
|
22
22
|
"developer-tools"
|
|
23
23
|
]
|
|
24
|
+
},
|
|
25
|
+
"release": {
|
|
26
|
+
"registries": [
|
|
27
|
+
"https://verdaccio.lossless.digital",
|
|
28
|
+
"https://registry.npmjs.org"
|
|
29
|
+
],
|
|
30
|
+
"accessLevel": "public"
|
|
24
31
|
}
|
|
25
32
|
},
|
|
26
|
-
"
|
|
27
|
-
"npmGlobalTools": []
|
|
28
|
-
"npmAccessLevel": "public"
|
|
33
|
+
"@ship.zone/szci": {
|
|
34
|
+
"npmGlobalTools": []
|
|
29
35
|
}
|
|
30
36
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tspublish",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.11.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A tool to publish multiple, concise, and small packages from monorepos, specifically for TypeScript projects within a git environment.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -8,15 +8,20 @@
|
|
|
8
8
|
"type": "module",
|
|
9
9
|
"author": "Task Venture Capital GmbH",
|
|
10
10
|
"license": "MIT",
|
|
11
|
+
"scripts": {
|
|
12
|
+
"test": "(tstest test/ --verbose --testlog --timeout 30)",
|
|
13
|
+
"build": "(tsbuild --web --allowimplicitany)",
|
|
14
|
+
"buildDocs": "(tsdoc)"
|
|
15
|
+
},
|
|
11
16
|
"bin": {
|
|
12
17
|
"tspublish": "./cli.js"
|
|
13
18
|
},
|
|
14
19
|
"devDependencies": {
|
|
15
|
-
"@git.zone/tsbuild": "^
|
|
16
|
-
"@git.zone/tsbundle": "^2.
|
|
17
|
-
"@git.zone/tsrun": "^
|
|
18
|
-
"@git.zone/tstest": "^
|
|
19
|
-
"@types/node": "^
|
|
20
|
+
"@git.zone/tsbuild": "^4.0.2",
|
|
21
|
+
"@git.zone/tsbundle": "^2.6.3",
|
|
22
|
+
"@git.zone/tsrun": "^2.0.1",
|
|
23
|
+
"@git.zone/tstest": "^3.1.3",
|
|
24
|
+
"@types/node": "^25.0.2"
|
|
20
25
|
},
|
|
21
26
|
"repository": {
|
|
22
27
|
"type": "git",
|
|
@@ -43,13 +48,15 @@
|
|
|
43
48
|
],
|
|
44
49
|
"dependencies": {
|
|
45
50
|
"@push.rocks/consolecolor": "^2.0.3",
|
|
46
|
-
"@push.rocks/
|
|
51
|
+
"@push.rocks/npmextra": "^5.3.3",
|
|
52
|
+
"@push.rocks/smartcli": "^4.0.19",
|
|
47
53
|
"@push.rocks/smartdelay": "^3.0.5",
|
|
48
|
-
"@push.rocks/smartfile": "^
|
|
49
|
-
"@push.rocks/
|
|
50
|
-
"@push.rocks/
|
|
54
|
+
"@push.rocks/smartfile": "^13.1.2",
|
|
55
|
+
"@push.rocks/smartfs": "^1.3.1",
|
|
56
|
+
"@push.rocks/smartlog": "^3.1.10",
|
|
57
|
+
"@push.rocks/smartnpm": "^2.0.6",
|
|
51
58
|
"@push.rocks/smartpath": "^6.0.0",
|
|
52
|
-
"@push.rocks/smartrequest": "^
|
|
59
|
+
"@push.rocks/smartrequest": "^5.0.1",
|
|
53
60
|
"@push.rocks/smartshell": "^3.3.0"
|
|
54
61
|
},
|
|
55
62
|
"keywords": [
|
|
@@ -64,9 +71,5 @@
|
|
|
64
71
|
"module-management",
|
|
65
72
|
"developer-tools"
|
|
66
73
|
],
|
|
67
|
-
"
|
|
68
|
-
|
|
69
|
-
"build": "(tsbuild --web --allowimplicitany)",
|
|
70
|
-
"buildDocs": "(tsdoc)"
|
|
71
|
-
}
|
|
72
|
-
}
|
|
74
|
+
"packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977"
|
|
75
|
+
}
|
package/readme.md
CHANGED
|
@@ -9,6 +9,10 @@
|
|
|
9
9
|
|
|
10
10
|
`@git.zone/tspublish` is your Swiss Army knife for managing and publishing multiple TypeScript packages from a monorepo. It automates the tedious parts of package publishing while giving you full control over the process. Whether you're maintaining a suite of microservices, a component library, or any collection of related packages, tspublish makes your life easier.
|
|
11
11
|
|
|
12
|
+
## Issue Reporting and Security
|
|
13
|
+
|
|
14
|
+
For reporting bugs, issues, or security vulnerabilities, please visit [community.foss.global/](https://community.foss.global/). This is the central community hub for all issue reporting. Developers who sign and comply with our contribution agreement and go through identification can also get a [code.foss.global/](https://code.foss.global/) account to submit Pull Requests directly.
|
|
15
|
+
|
|
12
16
|
### ✨ Key Features
|
|
13
17
|
|
|
14
18
|
- 📦 **Automatic Package Discovery** - Scans your monorepo for publishable packages
|
|
@@ -149,7 +153,11 @@ for (const [name, config] of Object.entries(modules)) {
|
|
|
149
153
|
|
|
150
154
|
### Registry Configuration
|
|
151
155
|
|
|
152
|
-
TSPublish supports multiple registries with different access levels:
|
|
156
|
+
TSPublish supports multiple registries with different access levels. You have three approaches:
|
|
157
|
+
|
|
158
|
+
#### 1️⃣ Explicit Registries
|
|
159
|
+
|
|
160
|
+
Define specific registries directly in your `tspublish.json`:
|
|
153
161
|
|
|
154
162
|
```json
|
|
155
163
|
{
|
|
@@ -161,6 +169,38 @@ TSPublish supports multiple registries with different access levels:
|
|
|
161
169
|
}
|
|
162
170
|
```
|
|
163
171
|
|
|
172
|
+
#### 2️⃣ Use Base Configuration (`useBase`)
|
|
173
|
+
|
|
174
|
+
Inherit registries from your project's `npmextra.json` configuration (managed by `gitzone config`):
|
|
175
|
+
|
|
176
|
+
```json
|
|
177
|
+
{
|
|
178
|
+
"registries": ["useBase"]
|
|
179
|
+
}
|
|
180
|
+
```
|
|
181
|
+
|
|
182
|
+
This reads from `npmextra.json` under `@git.zone/cli.release.registries`.
|
|
183
|
+
|
|
184
|
+
#### 3️⃣ Extend Base Configuration (`extendBase`)
|
|
185
|
+
|
|
186
|
+
Start with base registries and add/remove specific ones:
|
|
187
|
+
|
|
188
|
+
```json
|
|
189
|
+
{
|
|
190
|
+
"registries": [
|
|
191
|
+
"extendBase",
|
|
192
|
+
"custom-registry.example.com:public",
|
|
193
|
+
"-https://registry.npmjs.org" // Exclude this registry
|
|
194
|
+
]
|
|
195
|
+
}
|
|
196
|
+
```
|
|
197
|
+
|
|
198
|
+
The `-` prefix excludes a registry from the base configuration.
|
|
199
|
+
|
|
200
|
+
#### Empty Registries
|
|
201
|
+
|
|
202
|
+
If no registries are configured, the package will be built but **not published** (a warning is logged).
|
|
203
|
+
|
|
164
204
|
### Build Order Management
|
|
165
205
|
|
|
166
206
|
When packages depend on each other, use the `order` field to ensure correct build sequence:
|
|
@@ -346,30 +386,27 @@ interface ITsPublishJson {
|
|
|
346
386
|
- Check that all dependencies are installed
|
|
347
387
|
- Review the build output for specific errors
|
|
348
388
|
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
-
|
|
352
|
-
- 🔄 Automatic version bumping strategies
|
|
353
|
-
- 📊 Dry-run mode with detailed preview
|
|
354
|
-
- 🏷️ Git tag integration
|
|
355
|
-
- 📝 Changelog generation
|
|
356
|
-
- 🔐 Enhanced authentication handling
|
|
389
|
+
**useBase/extendBase error**
|
|
390
|
+
- Ensure your `npmextra.json` has registries configured at `@git.zone/cli.release.registries`
|
|
391
|
+
- Use `gitzone config add <registry-url>` to configure base registries
|
|
357
392
|
|
|
358
393
|
## License and Legal Information
|
|
359
394
|
|
|
360
|
-
This repository contains open-source code
|
|
395
|
+
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](./LICENSE) file.
|
|
361
396
|
|
|
362
397
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
|
363
398
|
|
|
364
399
|
### Trademarks
|
|
365
400
|
|
|
366
|
-
This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein.
|
|
401
|
+
This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH or third parties, and are not included within the scope of the MIT license granted herein.
|
|
402
|
+
|
|
403
|
+
Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines or the guidelines of the respective third-party owners, and any usage must be approved in writing. Third-party trademarks used herein are the property of their respective owners and used only in a descriptive manner, e.g. for an implementation of an API or similar.
|
|
367
404
|
|
|
368
405
|
### Company Information
|
|
369
406
|
|
|
370
|
-
Task Venture Capital GmbH
|
|
371
|
-
Registered at District
|
|
407
|
+
Task Venture Capital GmbH
|
|
408
|
+
Registered at District Court Bremen HRB 35230 HB, Germany
|
|
372
409
|
|
|
373
|
-
For any legal inquiries or
|
|
410
|
+
For any legal inquiries or further information, please contact us via email at hello@task.vc.
|
|
374
411
|
|
|
375
412
|
By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -16,6 +16,11 @@ export interface IPublishModuleOptions {
|
|
|
16
16
|
dependencies?: { [key: string]: string };
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
+
export interface IResolvedRegistry {
|
|
20
|
+
url: string;
|
|
21
|
+
accessLevel: string;
|
|
22
|
+
}
|
|
23
|
+
|
|
19
24
|
export class PublishModule {
|
|
20
25
|
tsPublishRef: TsPublish;
|
|
21
26
|
public options: IPublishModuleOptions;
|
|
@@ -34,14 +39,14 @@ export class PublishModule {
|
|
|
34
39
|
if (!this.options.packageSubFolder.startsWith('ts')) {
|
|
35
40
|
throw new Error('subFolder must start with "ts"');
|
|
36
41
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
);
|
|
42
|
+
const tspublishJsonPath = plugins.path.join(this.options.packageSubFolderFullPath, 'tspublish.json');
|
|
43
|
+
const tspublishJsonContent = await plugins.smartfs.file(tspublishJsonPath).encoding('utf8').read();
|
|
44
|
+
this.options.tsPublishJson = JSON.parse(tspublishJsonContent as string);
|
|
40
45
|
|
|
41
46
|
// the package.json of the parent mono repo
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
);
|
|
47
|
+
const packageJsonPath = plugins.path.join(this.options.monoRepoDir, 'package.json');
|
|
48
|
+
const packageJsonContent = await plugins.smartfs.file(packageJsonPath).encoding('utf8').read();
|
|
49
|
+
const monoRepoPackageJson = JSON.parse(packageJsonContent as string);
|
|
45
50
|
|
|
46
51
|
this.options.dependencies = {
|
|
47
52
|
...this.options.dependencies,
|
|
@@ -91,9 +96,12 @@ export class PublishModule {
|
|
|
91
96
|
}
|
|
92
97
|
|
|
93
98
|
public async createTsconfigJson() {
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
)
|
|
99
|
+
const tsconfigPath = plugins.path.join(paths.cwd, 'tsconfig.json');
|
|
100
|
+
let originalTsConfig: any = null;
|
|
101
|
+
if (await plugins.smartfs.file(tsconfigPath).exists()) {
|
|
102
|
+
const tsconfigContent = await plugins.smartfs.file(tsconfigPath).encoding('utf8').read();
|
|
103
|
+
originalTsConfig = JSON.parse(tsconfigContent as string);
|
|
104
|
+
}
|
|
97
105
|
if (originalTsConfig?.compilerOptions?.paths) {
|
|
98
106
|
for (const path of Object.keys(originalTsConfig.compilerOptions.paths)) {
|
|
99
107
|
originalTsConfig.compilerOptions.paths[
|
|
@@ -166,41 +174,35 @@ export class PublishModule {
|
|
|
166
174
|
this.options.monoRepoDir,
|
|
167
175
|
`dist_publish_${this.options.packageSubFolder}`
|
|
168
176
|
);
|
|
169
|
-
|
|
177
|
+
|
|
178
|
+
// Ensure empty directory
|
|
179
|
+
const publishDir = plugins.smartfs.directory(this.options.publishModDirFullPath);
|
|
180
|
+
if (await publishDir.exists()) {
|
|
181
|
+
await publishDir.recursive().delete();
|
|
182
|
+
}
|
|
183
|
+
await publishDir.recursive().create();
|
|
170
184
|
|
|
171
185
|
// package.json
|
|
172
|
-
const
|
|
173
|
-
|
|
174
|
-
await this.createPackageJson(),
|
|
175
|
-
'utf8'
|
|
176
|
-
);
|
|
177
|
-
await packageJson.write();
|
|
186
|
+
const packageJsonPath = plugins.path.join(this.options.publishModDirFullPath, 'package.json');
|
|
187
|
+
await plugins.smartfs.file(packageJsonPath).encoding('utf8').write(await this.createPackageJson());
|
|
178
188
|
|
|
179
189
|
// tsconfig.json
|
|
180
|
-
const
|
|
181
|
-
|
|
182
|
-
await this.createTsconfigJson(),
|
|
183
|
-
'utf8'
|
|
184
|
-
);
|
|
185
|
-
await tsconfigJson.write();
|
|
190
|
+
const tsconfigJsonPath = plugins.path.join(this.options.publishModDirFullPath, 'tsconfig.json');
|
|
191
|
+
await plugins.smartfs.file(tsconfigJsonPath).encoding('utf8').write(await this.createTsconfigJson());
|
|
186
192
|
|
|
187
193
|
// ts subfolder, the folder that contains the source code and is being transpiled
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
plugins.path.join(this.options.publishModDirFullPath, this.options.packageSubFolder)
|
|
191
|
-
);
|
|
194
|
+
const destSubFolder = plugins.path.join(this.options.publishModDirFullPath, this.options.packageSubFolder);
|
|
195
|
+
await plugins.smartfs.directory(this.options.packageSubFolderFullPath).recursive().copy(destSubFolder);
|
|
192
196
|
|
|
193
197
|
// readme
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
);
|
|
198
|
+
const readmeSrc = plugins.path.join(this.options.packageSubFolderFullPath, 'readme.md');
|
|
199
|
+
const readmeDest = plugins.path.join(this.options.publishModDirFullPath, 'readme.md');
|
|
200
|
+
await plugins.smartfs.file(readmeSrc).copy(readmeDest);
|
|
198
201
|
|
|
199
202
|
// license
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
);
|
|
203
|
+
const licenseSrc = plugins.path.join(this.options.monoRepoDir, 'license');
|
|
204
|
+
const licenseDest = plugins.path.join(this.options.publishModDirFullPath, 'license');
|
|
205
|
+
await plugins.smartfs.file(licenseSrc).copy(licenseDest);
|
|
204
206
|
|
|
205
207
|
// cli stuff
|
|
206
208
|
this.createBinCliSetup();
|
|
@@ -227,22 +229,104 @@ export class PublishModule {
|
|
|
227
229
|
);
|
|
228
230
|
const indexPath = `./dist_${this.options.packageSubFolder}/index.js`;
|
|
229
231
|
const fileContent = atob(files[0].base64Content).replace('./dist_ts/index.js', indexPath);
|
|
230
|
-
|
|
232
|
+
const cliJsPath = plugins.path.join(this.options.publishModDirFullPath, 'cli.js');
|
|
233
|
+
await plugins.smartfs.file(cliJsPath).encoding('utf8').write(fileContent);
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
/**
|
|
237
|
+
* Resolves the registries to publish to based on tspublish.json configuration.
|
|
238
|
+
* Supports:
|
|
239
|
+
* - "useBase": Use only registries from npmextra.json
|
|
240
|
+
* - "extendBase": Use base registries + additions, with exclusions via "-" prefix
|
|
241
|
+
* - Explicit registries: Direct registry URLs in format "url:accessLevel"
|
|
242
|
+
*/
|
|
243
|
+
private async resolveRegistries(): Promise<IResolvedRegistry[]> {
|
|
244
|
+
const rawRegistries = this.options.tsPublishJson?.registries || [];
|
|
245
|
+
|
|
246
|
+
// Empty → skip publishing
|
|
247
|
+
if (rawRegistries.length === 0) {
|
|
248
|
+
return [];
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
const hasUseBase = rawRegistries.includes('useBase');
|
|
252
|
+
const hasExtendBase = rawRegistries.includes('extendBase');
|
|
253
|
+
|
|
254
|
+
let baseRegistries: string[] = [];
|
|
255
|
+
let baseAccessLevel = 'public';
|
|
256
|
+
|
|
257
|
+
// Load base registries from npmextra.json if needed
|
|
258
|
+
if (hasUseBase || hasExtendBase) {
|
|
259
|
+
const npmextraInstance = new plugins.npmextra.Npmextra(this.options.monoRepoDir);
|
|
260
|
+
const gitzoneConfig = npmextraInstance.dataFor<any>('@git.zone/cli', {});
|
|
261
|
+
baseRegistries = gitzoneConfig?.release?.registries || [];
|
|
262
|
+
baseAccessLevel = gitzoneConfig?.release?.accessLevel || 'public';
|
|
263
|
+
|
|
264
|
+
if (baseRegistries.length === 0) {
|
|
265
|
+
throw new Error(
|
|
266
|
+
`useBase/extendBase specified in tspublish.json but no registries configured in npmextra.json at @git.zone/cli.release.registries`
|
|
267
|
+
);
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
// useBase: Only base registries
|
|
272
|
+
if (hasUseBase) {
|
|
273
|
+
return baseRegistries.map((url) => ({ url, accessLevel: baseAccessLevel }));
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
// extendBase: Base registries + additions - exclusions
|
|
277
|
+
if (hasExtendBase) {
|
|
278
|
+
const exclusions = rawRegistries
|
|
279
|
+
.filter((r) => r.startsWith('-'))
|
|
280
|
+
.map((r) => r.slice(1)); // remove '-' prefix
|
|
281
|
+
|
|
282
|
+
const additions = rawRegistries.filter((r) => r !== 'extendBase' && !r.startsWith('-'));
|
|
283
|
+
|
|
284
|
+
// Filter out excluded base registries
|
|
285
|
+
const result: IResolvedRegistry[] = baseRegistries
|
|
286
|
+
.filter((url) => !exclusions.includes(url))
|
|
287
|
+
.map((url) => ({ url, accessLevel: baseAccessLevel }));
|
|
288
|
+
|
|
289
|
+
// Add explicit registries
|
|
290
|
+
for (const addition of additions) {
|
|
291
|
+
const parts = addition.split(':');
|
|
292
|
+
const url = parts[0];
|
|
293
|
+
const access = parts[1] || 'public';
|
|
294
|
+
result.push({ url, accessLevel: access });
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
return result;
|
|
298
|
+
}
|
|
299
|
+
|
|
300
|
+
// Explicit registries only (original behavior)
|
|
301
|
+
return rawRegistries.map((r) => {
|
|
302
|
+
const parts = r.split(':');
|
|
303
|
+
const url = parts[0];
|
|
304
|
+
const access = parts[1] || 'public';
|
|
305
|
+
return { url, accessLevel: access };
|
|
306
|
+
});
|
|
231
307
|
}
|
|
232
308
|
|
|
233
309
|
public async publish() {
|
|
234
|
-
|
|
310
|
+
const registries = await this.resolveRegistries();
|
|
311
|
+
|
|
312
|
+
// Handle empty registries
|
|
313
|
+
if (registries.length === 0) {
|
|
314
|
+
logWarn(`No registries configured for ${this.options.name}. Skipping publish.`);
|
|
315
|
+
return;
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
logPublish(`Publishing ${this.options.name} v${this.options.version} to ${registries.length} registry(ies)...`);
|
|
235
319
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
236
320
|
executor: 'bash',
|
|
237
321
|
});
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
const registryUrl =
|
|
241
|
-
|
|
322
|
+
|
|
323
|
+
for (const registry of registries) {
|
|
324
|
+
const registryUrl = registry.url.startsWith('https://') ? registry.url : `https://${registry.url}`;
|
|
325
|
+
logOngoing(`Publishing to ${registryUrl}...`);
|
|
242
326
|
await smartshellInstance.exec(
|
|
243
327
|
`cd ${this.options.publishModDirFullPath} && pnpm publish ${
|
|
244
|
-
|
|
245
|
-
} --no-git-checks --registry
|
|
328
|
+
registry.accessLevel === 'public' ? '--access public' : ''
|
|
329
|
+
} --no-git-checks --registry ${registryUrl}`
|
|
246
330
|
);
|
|
247
331
|
}
|
|
248
332
|
logSuccess(`Successfully published ${this.options.name} v${this.options.version}!`);
|
package/ts/classes.tspublish.ts
CHANGED
|
@@ -43,22 +43,27 @@ export class TsPublish {
|
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
public async getModuleSubDirs(dirArg: string) {
|
|
46
|
-
|
|
46
|
+
// List all directories
|
|
47
|
+
const dirContents = await plugins.smartfs.directory(dirArg).list();
|
|
47
48
|
const publishModules: { [key: string]: interfaces.ITsPublishJson } = {};
|
|
48
|
-
|
|
49
|
-
|
|
49
|
+
|
|
50
|
+
for (const entry of dirContents) {
|
|
51
|
+
const subDirName = entry.name;
|
|
52
|
+
if (!subDirName.startsWith('ts')) {
|
|
50
53
|
continue;
|
|
51
54
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
+
|
|
56
|
+
// Check if this is a directory and has tspublish.json
|
|
57
|
+
const subDirPath = plugins.path.join(dirArg, subDirName);
|
|
58
|
+
const tspublishJsonPath = plugins.path.join(subDirPath, 'tspublish.json');
|
|
59
|
+
|
|
60
|
+
if (!(await plugins.smartfs.file(tspublishJsonPath).exists())) {
|
|
55
61
|
continue;
|
|
56
62
|
}
|
|
57
63
|
|
|
58
|
-
logPackage('Found module',
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
);
|
|
64
|
+
logPackage('Found module', subDirName);
|
|
65
|
+
const tspublishContent = await plugins.smartfs.file(tspublishJsonPath).encoding('utf8').read();
|
|
66
|
+
publishModules[subDirName] = JSON.parse(tspublishContent as string);
|
|
62
67
|
}
|
|
63
68
|
logSuccess(`Found ${Object.keys(publishModules).length} publish modules`);
|
|
64
69
|
logInfo('Ordering publish modules...');
|
package/ts/plugins.ts
CHANGED
|
@@ -4,7 +4,9 @@ export { path };
|
|
|
4
4
|
|
|
5
5
|
// @push.rocks scope
|
|
6
6
|
import * as consolecolor from '@push.rocks/consolecolor';
|
|
7
|
+
import * as npmextra from '@push.rocks/npmextra';
|
|
7
8
|
import * as smartfile from '@push.rocks/smartfile';
|
|
9
|
+
import { SmartFs, SmartFsProviderNode } from '@push.rocks/smartfs';
|
|
8
10
|
import * as smartcli from '@push.rocks/smartcli';
|
|
9
11
|
import * as smartdelay from '@push.rocks/smartdelay';
|
|
10
12
|
import * as smartlog from '@push.rocks/smartlog';
|
|
@@ -13,4 +15,7 @@ import * as smartpath from '@push.rocks/smartpath';
|
|
|
13
15
|
import * as smartrequest from '@push.rocks/smartrequest';
|
|
14
16
|
import * as smartshell from '@push.rocks/smartshell';
|
|
15
17
|
|
|
16
|
-
|
|
18
|
+
// Create a pre-configured SmartFs instance for Node.js filesystem operations
|
|
19
|
+
const smartfs = new SmartFs(new SmartFsProviderNode());
|
|
20
|
+
|
|
21
|
+
export { consolecolor, npmextra, smartfile, smartfs, smartcli, smartdelay, smartlog, smartnpm, smartpath, smartrequest, smartshell };
|