create-gasket-app 7.0.0-next.50 → 7.0.0-next.52
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/lib/scaffold/config-builder.js +10 -7
- package/lib/utils/logo.js +10 -10
- package/package.json +10 -10
|
@@ -376,9 +376,12 @@ export class ConfigBuilder {
|
|
|
376
376
|
return;
|
|
377
377
|
}
|
|
378
378
|
|
|
379
|
+
// If a prerelease version, strip the range prefix
|
|
380
|
+
const version = ver.includes('-') ? ver.replace(/^[\^~]/, '') : ver;
|
|
381
|
+
|
|
379
382
|
const blameId = `${key}.${dep}`;
|
|
380
383
|
if (!prev) {
|
|
381
|
-
existing[dep] =
|
|
384
|
+
existing[dep] = version;
|
|
382
385
|
setBlame(blameId);
|
|
383
386
|
return;
|
|
384
387
|
}
|
|
@@ -386,7 +389,7 @@ export class ConfigBuilder {
|
|
|
386
389
|
const blamed = this.blame.get(blameId);
|
|
387
390
|
const forced = this.force.has(blameId);
|
|
388
391
|
|
|
389
|
-
if (prev ===
|
|
392
|
+
if (prev === version) {
|
|
390
393
|
if (forced) return;
|
|
391
394
|
if (force) {
|
|
392
395
|
setBlame(blameId);
|
|
@@ -398,21 +401,21 @@ export class ConfigBuilder {
|
|
|
398
401
|
|
|
399
402
|
const prevName = blamed.join(', ');
|
|
400
403
|
if (!forced) {
|
|
401
|
-
const newer = force ?
|
|
402
|
-
const overridden = newer ===
|
|
404
|
+
const newer = force ? version : this.tryGetNewerRange(prev, version);
|
|
405
|
+
const overridden = newer === version;
|
|
403
406
|
if (overridden) {
|
|
404
|
-
existing[dep] =
|
|
407
|
+
existing[dep] = version;
|
|
405
408
|
setBlame(blameId);
|
|
406
409
|
}
|
|
407
410
|
}
|
|
408
411
|
|
|
409
|
-
if (!semver.validRange(prev) || !semver.validRange(
|
|
412
|
+
if (!semver.validRange(prev) || !semver.validRange(version) || !semver.intersects(prev, version)) {
|
|
410
413
|
let forceMsg = force ? '(forced)' : '';
|
|
411
414
|
forceMsg = forced && force ? '(cannot be forced)' : forceMsg;
|
|
412
415
|
this.warn(`
|
|
413
416
|
Conflicting versions for ${dep} in "${key}":
|
|
414
417
|
- ${prev} provided by ${prevName} ${forced && '(forced)' || ''}
|
|
415
|
-
- ${
|
|
418
|
+
- ${version} provided by ${name} ${forceMsg}
|
|
416
419
|
Using ${existing[dep]}, but this may cause unexpected behavior.
|
|
417
420
|
`);
|
|
418
421
|
}
|
package/lib/utils/logo.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
export const logo = `
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
█▀▀█
|
|
7
|
-
█▄▄█
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
2
|
+
▄▄▄▄████▀▀█▄
|
|
3
|
+
▄████▀▀▀▀▀▀█▄▄██
|
|
4
|
+
███▀ ▄▄▄▄▄ ▀██▌ ▄▄▄
|
|
5
|
+
▄███ ███▀▀▀▀██ ██ ██ ██
|
|
6
|
+
█▀▀█ ██▌ ▐█▌ ▄▀▀▀█▄ ▄█▀▀▀▄ ██ ▐██▀ ▄█▀▀█▄ ▀██▀▀
|
|
7
|
+
█▄▄█ ██▌ ▀▀██ ▐█▌ ▄▄▄▄██ ▀▀█▄▄▄ █████ ██▄▄██ ██
|
|
8
|
+
▀███ ███▄▄▄▄██ ██ ▀▄▄▄▀█▄ ▀▄▄▄█▀ ▄██▄ ██▄ ▀█▄▄▄▄ ▀█▄▄
|
|
9
|
+
███▄ ▀▀▀ ▀▀ ▄██▌
|
|
10
|
+
▀████▄▄▄▄▄▄█▀▀██
|
|
11
|
+
▀▀▀▀████▄▄█▀
|
|
12
12
|
`;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "create-gasket-app",
|
|
3
|
-
"version": "7.0.0-next.
|
|
3
|
+
"version": "7.0.0-next.52",
|
|
4
4
|
"description": "starter pack for creating a gasket app",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -33,14 +33,14 @@
|
|
|
33
33
|
},
|
|
34
34
|
"homepage": "https://github.com/godaddy/gasket/tree/main/packages/create-gasket-app",
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@gasket/core": "
|
|
37
|
-
"@gasket/plugin-command": "
|
|
38
|
-
"@gasket/plugin-docs": "
|
|
39
|
-
"@gasket/plugin-docusaurus": "
|
|
40
|
-
"@gasket/plugin-git": "
|
|
41
|
-
"@gasket/plugin-logger": "
|
|
42
|
-
"@gasket/plugin-metadata": "
|
|
43
|
-
"@gasket/utils": "
|
|
36
|
+
"@gasket/core": "7.0.0-next.52",
|
|
37
|
+
"@gasket/plugin-command": "7.0.0-next.52",
|
|
38
|
+
"@gasket/plugin-docs": "7.0.0-next.52",
|
|
39
|
+
"@gasket/plugin-docusaurus": "7.0.0-next.52",
|
|
40
|
+
"@gasket/plugin-git": "7.0.0-next.52",
|
|
41
|
+
"@gasket/plugin-logger": "7.0.0-next.52",
|
|
42
|
+
"@gasket/plugin-metadata": "7.0.0-next.52",
|
|
43
|
+
"@gasket/utils": "7.0.0-next.52",
|
|
44
44
|
"commander": "^12.0.0",
|
|
45
45
|
"deepmerge": "^4.3.1",
|
|
46
46
|
"glob": "^8.1.0",
|
|
@@ -83,5 +83,5 @@
|
|
|
83
83
|
"jest": {
|
|
84
84
|
"transform": {}
|
|
85
85
|
},
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "b6db6d098fc1fec4c0e6fd922391ccf0c63fb54f"
|
|
87
87
|
}
|