@proteinjs/build 1.0.22 → 1.0.24
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/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,28 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.0.24](https://github.com/proteinjs/build/compare/@proteinjs/build@1.0.23...@proteinjs/build@1.0.24) (2024-04-22)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* `versionWorkspace` shoud pull before attempting to version a package ([ba5b683](https://github.com/proteinjs/build/commit/ba5b68357f0f1fae3c4494d931505b4088ccc8e2))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [1.0.23](https://github.com/proteinjs/build/compare/@proteinjs/build@1.0.22...@proteinjs/build@1.0.23) (2024-04-22)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* `versionWorkspace` shouldn't clean before installing (that can mess with more complicated build processes like @proteinjs/reflection-build-test-b). instead, just delete the package-lock pre-install ([8ceb1cd](https://github.com/proteinjs/build/commit/8ceb1cd6387a2bb91bbb0a381a73be70ed8f931c))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
6
28
|
## [1.0.22](https://github.com/proteinjs/build/compare/@proteinjs/build@1.0.21...@proteinjs/build@1.0.22) (2024-04-22)
|
|
7
29
|
|
|
8
30
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versionWorkspace.d.ts","sourceRoot":"","sources":["../../src/versionWorkspace.ts"],"names":[],"mappings":"AAQA,wBAAsB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"versionWorkspace.d.ts","sourceRoot":"","sources":["../../src/versionWorkspace.ts"],"names":[],"mappings":"AAQA,wBAAsB,gBAAgB,kBA6BrC"}
|
|
@@ -97,31 +97,34 @@ function versionWorkspace() {
|
|
|
97
97
|
_i = 0, filteredPackageNames_1 = filteredPackageNames;
|
|
98
98
|
_b.label = 2;
|
|
99
99
|
case 2:
|
|
100
|
-
if (!(_i < filteredPackageNames_1.length)) return [3 /*break*/,
|
|
100
|
+
if (!(_i < filteredPackageNames_1.length)) return [3 /*break*/, 9];
|
|
101
101
|
packageName = filteredPackageNames_1[_i];
|
|
102
102
|
localPackage = packageMap[packageName];
|
|
103
|
-
return [4 /*yield*/,
|
|
103
|
+
return [4 /*yield*/, pull(localPackage)];
|
|
104
104
|
case 3:
|
|
105
|
+
_b.sent();
|
|
106
|
+
return [4 /*yield*/, bumpDependencies(localPackage, packageMap, packageGraph)];
|
|
107
|
+
case 4:
|
|
105
108
|
dependenciesChanged = _b.sent();
|
|
106
109
|
if (!dependenciesChanged)
|
|
107
|
-
return [3 /*break*/,
|
|
110
|
+
return [3 /*break*/, 8];
|
|
108
111
|
return [4 /*yield*/, buildAndTest(localPackage)];
|
|
109
|
-
case 4:
|
|
110
|
-
_b.sent();
|
|
111
|
-
if (localPackage.packageJson.private)
|
|
112
|
-
return [3 /*break*/, 7];
|
|
113
|
-
return [4 /*yield*/, pushChanges(localPackage)];
|
|
114
112
|
case 5:
|
|
115
113
|
_b.sent();
|
|
116
|
-
|
|
114
|
+
if (localPackage.packageJson.private)
|
|
115
|
+
return [3 /*break*/, 8];
|
|
116
|
+
return [4 /*yield*/, push(localPackage)];
|
|
117
117
|
case 6:
|
|
118
118
|
_b.sent();
|
|
119
|
-
|
|
119
|
+
return [4 /*yield*/, publish(localPackage)];
|
|
120
120
|
case 7:
|
|
121
|
+
_b.sent();
|
|
122
|
+
_b.label = 8;
|
|
123
|
+
case 8:
|
|
121
124
|
_i++;
|
|
122
125
|
return [3 /*break*/, 2];
|
|
123
|
-
case
|
|
124
|
-
case
|
|
126
|
+
case 9: return [4 /*yield*/, pushMetarepo(workspacePath)];
|
|
127
|
+
case 10:
|
|
125
128
|
_b.sent();
|
|
126
129
|
logger.info("> Finished versioning workspace (".concat(workspacePath, ")"));
|
|
127
130
|
return [2 /*return*/];
|
|
@@ -192,15 +195,15 @@ function setDependencyVersion(dependencyPackageName, currentVersion, newVersion,
|
|
|
192
195
|
function buildAndTest(localPackage) {
|
|
193
196
|
var _a;
|
|
194
197
|
return __awaiter(this, void 0, void 0, function () {
|
|
195
|
-
var packageDir;
|
|
198
|
+
var packageDir, packageLockPath;
|
|
196
199
|
return __generator(this, function (_b) {
|
|
197
200
|
switch (_b.label) {
|
|
198
201
|
case 0:
|
|
199
202
|
packageDir = path.dirname(localPackage.filePath);
|
|
200
|
-
|
|
203
|
+
packageLockPath = path.resolve(packageDir, 'package-lock.json');
|
|
204
|
+
return [4 /*yield*/, util_node_1.Fs.deleteFolder(packageLockPath)];
|
|
201
205
|
case 1:
|
|
202
206
|
_b.sent();
|
|
203
|
-
logger.info("(".concat(localPackage.name, ") cleaned"));
|
|
204
207
|
return [4 /*yield*/, (0, util_node_1.cmd)('npm', ['install'], { cwd: packageDir }, { logPrefix: "[".concat(localPackage.name, "] ") })];
|
|
205
208
|
case 2:
|
|
206
209
|
_b.sent();
|
|
@@ -220,7 +223,23 @@ function buildAndTest(localPackage) {
|
|
|
220
223
|
});
|
|
221
224
|
});
|
|
222
225
|
}
|
|
223
|
-
function
|
|
226
|
+
function pull(localPackage) {
|
|
227
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
228
|
+
var packageDir;
|
|
229
|
+
return __generator(this, function (_a) {
|
|
230
|
+
switch (_a.label) {
|
|
231
|
+
case 0:
|
|
232
|
+
packageDir = path.dirname(localPackage.filePath);
|
|
233
|
+
return [4 /*yield*/, (0, util_node_1.cmd)('git', ['pull'], { cwd: packageDir }, { logPrefix: "[".concat(localPackage.name, "] ") })];
|
|
234
|
+
case 1:
|
|
235
|
+
_a.sent();
|
|
236
|
+
logger.info("(".concat(localPackage.name, ") pulled latest changes"));
|
|
237
|
+
return [2 /*return*/];
|
|
238
|
+
}
|
|
239
|
+
});
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
function push(localPackage) {
|
|
224
243
|
return __awaiter(this, void 0, void 0, function () {
|
|
225
244
|
var packageDir, latestCommitSha, repoInfo, commit, tagName;
|
|
226
245
|
return __generator(this, function (_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versionWorkspace.js","sourceRoot":"","sources":["../../src/versionWorkspace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA4B;AAC5B,+CAAoC;AACpC,kDAA0F;AAC1F,wCAAwC;AAGxC,IAAM,MAAM,GAAG,IAAI,aAAM,CAAC,mBAAmB,CAAC,CAAC;AAE/C,SAAsB,gBAAgB;;;;;;oBAC9B,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;oBACqB,qBAAM,uBAAW,CAAC,oBAAoB,CAAC,aAAa,CAAC,EAAA;;oBAAxG,KAAmD,SAAqD,EAAtG,UAAU,gBAAA,EAAE,YAAY,kBAAA,EAAE,kBAAkB,wBAAA;oBAC9C,oBAAoB,GAAG,kBAAkB,CAAC,MAAM,CAAC,UAAA,WAAW;;wBAChE,IAAM,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;wBAC7C,OAAO,CAAC,CAAC,CAAA,MAAA,YAAY,CAAC,WAAW,CAAC,OAAO,0CAAE,KAAK,CAAA;+BAC3C,CAAC,CAAC,CAAA,MAAA,YAAY,CAAC,WAAW,CAAC,OAAO,0CAAE,KAAK,CAAA;+BACzC,WAAW,IAAI,mBAAmB,CACtC;oBACH,CAAC,CAAC,CAAC;oBAEH,MAAM,CAAC,IAAI,CAAC,kCAA2B,aAAa,MAAG,CAAC,CAAC;0BACb,EAApB,6CAAoB;;;yBAApB,CAAA,kCAAoB,CAAA;oBAAnC,WAAW;oBACZ,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"versionWorkspace.js","sourceRoot":"","sources":["../../src/versionWorkspace.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@proteinjs/build",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.24",
|
|
4
4
|
"description": "Workspace build tools",
|
|
5
5
|
"main": "./dist/generated/index.js",
|
|
6
6
|
"types": "./dist/generated/index.d.ts",
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"webpack": "5.90.0",
|
|
49
49
|
"webpack-cli": "5.1.4"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "3a1bf2bb09489437f2323094a654cffb859bf189"
|
|
52
52
|
}
|
package/src/versionWorkspace.ts
CHANGED
|
@@ -20,6 +20,7 @@ export async function versionWorkspace() {
|
|
|
20
20
|
logger.info(`> Versioning workspace (${workspacePath})`);
|
|
21
21
|
for (let packageName of filteredPackageNames) {
|
|
22
22
|
const localPackage = packageMap[packageName];
|
|
23
|
+
await pull(localPackage);
|
|
23
24
|
const dependenciesChanged = await bumpDependencies(localPackage, packageMap, packageGraph);
|
|
24
25
|
if (!dependenciesChanged)
|
|
25
26
|
continue;
|
|
@@ -28,7 +29,7 @@ export async function versionWorkspace() {
|
|
|
28
29
|
if (localPackage.packageJson.private)
|
|
29
30
|
continue;
|
|
30
31
|
|
|
31
|
-
await
|
|
32
|
+
await push(localPackage);
|
|
32
33
|
await publish(localPackage);
|
|
33
34
|
}
|
|
34
35
|
|
|
@@ -101,8 +102,8 @@ function setDependencyVersion(dependencyPackageName: string, currentVersion: Dep
|
|
|
101
102
|
|
|
102
103
|
async function buildAndTest(localPackage: LocalPackage) {
|
|
103
104
|
const packageDir = path.dirname(localPackage.filePath);
|
|
104
|
-
|
|
105
|
-
|
|
105
|
+
const packageLockPath = path.resolve(packageDir, 'package-lock.json');
|
|
106
|
+
await Fs.deleteFolder(packageLockPath);
|
|
106
107
|
await cmd('npm', ['install'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
|
|
107
108
|
logger.info(`(${localPackage.name}) installed latest dependency versions (${packageDir})`);
|
|
108
109
|
await cmd('npm', ['run', 'build'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
|
|
@@ -113,7 +114,13 @@ async function buildAndTest(localPackage: LocalPackage) {
|
|
|
113
114
|
}
|
|
114
115
|
}
|
|
115
116
|
|
|
116
|
-
async function
|
|
117
|
+
async function pull(localPackage: LocalPackage) {
|
|
118
|
+
const packageDir = path.dirname(localPackage.filePath);
|
|
119
|
+
await cmd('git', ['pull'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
|
|
120
|
+
logger.info(`(${localPackage.name}) pulled latest changes`);
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
async function push(localPackage: LocalPackage): Promise<Commit> {
|
|
117
124
|
const packageDir = path.dirname(localPackage.filePath);
|
|
118
125
|
await cmd('git', ['add', '.'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
|
|
119
126
|
await cmd('git', ['commit', '-m', `chore(version): bumping dependency versions [skip ci]`], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
|