@stackbit/cms-core 0.1.26-gitcms.0 → 0.1.26-gitcms.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/content-store-utils.d.ts.map +1 -1
- package/dist/content-store-utils.js +11 -1
- package/dist/content-store-utils.js.map +1 -1
- package/dist/services/git.d.ts.map +1 -1
- package/dist/services/git.js +3 -1
- package/dist/services/git.js.map +1 -1
- package/package.json +2 -2
- package/src/content-store-utils.ts +11 -1
- package/src/services/git.ts +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-store-utils.d.ts","sourceRoot":"","sources":["../src/content-store-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,KAAK,EAA8F,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC/J,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,iBAAiB,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAgB,kCAAkC,CAAC,aAAa,EAAE,QAAQ,CAAC,sBAAsB,GAAG,MAAM,CAEzG;AAED,wBAAgB,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAEjF;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,CAAC,IAAI,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"content-store-utils.d.ts","sourceRoot":"","sources":["../src/content-store-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,KAAK,EAA8F,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC/J,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,iBAAiB,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAgB,kCAAkC,CAAC,aAAa,EAAE,QAAQ,CAAC,sBAAsB,GAAG,MAAM,CAEzG;AAED,wBAAgB,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAEjF;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,CAAC,IAAI,GAAG,OAAO,CAYhG;AAED,wBAAgB,yBAAyB,CAAC,IAAI,SAAS,iBAAiB,CAAC,SAAS,EAC9E,QAAQ,EAAE,iBAAiB,CAAC,oBAAoB,CAAC,IAAI,CAAC,EACtD,MAAM,CAAC,EAAE,MAAM,GAChB,iBAAiB,CAAC,gCAAgC,CAAC,IAAI,CAAC,GAAG,IAAI,CAiBjE;AAED,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EACpC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC/B,MAAM,CAAC,EAAE,MAAM,GAChB,KAAK,CAsGP;AAED,wBAAgB,0BAA0B,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAOpJ;AAED,wBAAgB,6BAA6B,CAAC,EAC1C,SAAS,EACZ,EAAE;IACC,SAAS,EAAE,QAAQ,CAAC,kBAAkB,EAAE,CAAC;CAC5C,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAOtD;AAED,wBAAgB,kDAAkD,CAC9D,iBAAiB,EAAE,iBAAiB,CAAC,iBAAiB,EACtD,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,EAAE,GACnC;IACC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC/B,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC;CAC5B,CAcA;AAED,wBAAgB,2CAA2C,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,kBAAkB,GAAG,yBAAyB,CAKtJ"}
|
|
@@ -16,7 +16,17 @@ function getContentSourceId(contentSourceType, srcProjectId) {
|
|
|
16
16
|
exports.getContentSourceId = getContentSourceId;
|
|
17
17
|
function getUserContextForSrcType(srcType, user) {
|
|
18
18
|
var _a;
|
|
19
|
-
|
|
19
|
+
if (!user) {
|
|
20
|
+
return user;
|
|
21
|
+
}
|
|
22
|
+
const connection = (_a = user === null || user === void 0 ? void 0 : user.connections) === null || _a === void 0 ? void 0 : _a.find((connection) => connection.type === srcType);
|
|
23
|
+
if (connection) {
|
|
24
|
+
return connection;
|
|
25
|
+
}
|
|
26
|
+
return {
|
|
27
|
+
email: user.email,
|
|
28
|
+
name: user.name
|
|
29
|
+
};
|
|
20
30
|
}
|
|
21
31
|
exports.getUserContextForSrcType = getUserContextForSrcType;
|
|
22
32
|
function getDocumentFieldForLocale(docField, locale) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-store-utils.js","sourceRoot":"","sources":["../src/content-store-utils.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,2CAAyC;AAMzC,SAAgB,kCAAkC,CAAC,aAA8C;IAC7F,OAAO,kBAAkB,CAAC,aAAa,CAAC,oBAAoB,EAAE,EAAE,aAAa,CAAC,YAAY,EAAE,CAAC,CAAC;AAClG,CAAC;AAFD,gFAEC;AAED,SAAgB,kBAAkB,CAAC,iBAAyB,EAAE,YAAoB;IAC9E,OAAO,iBAAiB,GAAG,GAAG,GAAG,YAAY,CAAC;AAClD,CAAC;AAFD,gDAEC;AAED,SAAgB,wBAAwB,CAAC,OAAe,EAAE,IAA6B;;IACnF,OAAO,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"content-store-utils.js","sourceRoot":"","sources":["../src/content-store-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/services/git.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC3G,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AASnC,qBAAa,UAAW,YAAW,mBAAmB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IAEpC,OAAO,CAAC,aAAa,CAAkB;gBAE3B,OAAO,EAAE;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,UAAU,CAAC;QACvB,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACtB;YAWa,MAAM;IAqBpB,OAAO,CAAC,IAAI;IAUN,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE;IAK7D,IAAI;YASU,UAAU;YAgBV,YAAY;
|
|
1
|
+
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/services/git.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC3G,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AASnC,qBAAa,UAAW,YAAW,mBAAmB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IAEpC,OAAO,CAAC,aAAa,CAAkB;gBAE3B,OAAO,EAAE;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,UAAU,CAAC;QACvB,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACtB;YAWa,MAAM;IAqBpB,OAAO,CAAC,IAAI;IAUN,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE;IAK7D,IAAI;YASU,UAAU;YAgBV,YAAY;IAgC1B,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAe/D,OAAO,CAAC,oBAAoB;IAiBtB,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAmBzB,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;CAkClD"}
|
package/dist/services/git.js
CHANGED
|
@@ -91,7 +91,9 @@ class GitService {
|
|
|
91
91
|
}));
|
|
92
92
|
await this.run.command('git', ['checkout', '-b', 'stackbit-publish-branch'], publishDir);
|
|
93
93
|
await this.run.command('git', ['add', ...filePaths], publishDir);
|
|
94
|
-
await this.run.command('git', ['commit', '--author', `${author.name || author.email} <${author.email}>`, `-m`, 'Publish'], publishDir)
|
|
94
|
+
await this.run.command('git', ['commit', '--author', `${author.name || author.email} <${author.email}>`, `-m`, 'Publish'], publishDir).catch(err => {
|
|
95
|
+
return;
|
|
96
|
+
});
|
|
95
97
|
await this.run.command('git', ['checkout', this.repoBranch], publishDir);
|
|
96
98
|
await this.run.command('git', ['merge', 'stackbit-publish-branch', this.repoBranch, '-Xtheirs'], publishDir);
|
|
97
99
|
await this.run.command('git', ['checkout', this.repoPublishBranch], publishDir);
|
package/dist/services/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/services/git.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/services/git.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stackbit/cms-core",
|
|
3
|
-
"version": "0.1.26-gitcms.
|
|
3
|
+
"version": "0.1.26-gitcms.2",
|
|
4
4
|
"description": "stackbit-dev",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"slugify": "^1.6.5",
|
|
49
49
|
"uuid": "^9.0.0"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "52eacf3acf159b0f9d841f9085a8b274a946e659"
|
|
52
52
|
}
|
|
@@ -15,7 +15,17 @@ export function getContentSourceId(contentSourceType: string, srcProjectId: stri
|
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
export function getUserContextForSrcType(srcType: string, user?: ContentStoreTypes.User): unknown {
|
|
18
|
-
|
|
18
|
+
if (!user) {
|
|
19
|
+
return user;
|
|
20
|
+
}
|
|
21
|
+
const connection = user?.connections?.find((connection) => connection.type === srcType);
|
|
22
|
+
if (connection) {
|
|
23
|
+
return connection;
|
|
24
|
+
}
|
|
25
|
+
return {
|
|
26
|
+
email: user.email,
|
|
27
|
+
name: user.name
|
|
28
|
+
};
|
|
19
29
|
}
|
|
20
30
|
|
|
21
31
|
export function getDocumentFieldForLocale<Type extends ContentStoreTypes.FieldType>(
|
package/src/services/git.ts
CHANGED
|
@@ -124,7 +124,9 @@ export class GitService implements GitServiceInterface {
|
|
|
124
124
|
|
|
125
125
|
await this.run.command('git', ['checkout', '-b', 'stackbit-publish-branch'], publishDir);
|
|
126
126
|
await this.run.command('git', ['add', ...filePaths], publishDir);
|
|
127
|
-
await this.run.command('git', ['commit', '--author', `${author.name || author.email} <${author.email}>`, `-m`, 'Publish'], publishDir)
|
|
127
|
+
await this.run.command('git', ['commit', '--author', `${author.name || author.email} <${author.email}>`, `-m`, 'Publish'], publishDir).catch(err => {
|
|
128
|
+
return;
|
|
129
|
+
});
|
|
128
130
|
|
|
129
131
|
await this.run.command('git', ['checkout', this.repoBranch], publishDir);
|
|
130
132
|
await this.run.command('git', ['merge', 'stackbit-publish-branch', this.repoBranch, '-Xtheirs'], publishDir);
|