@stackbit/dev-common 1.0.41-staging.1 → 1.0.42
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/.tsbuildinfo +1 -1
- package/dist/cms/content-store-adapter.d.ts +0 -3
- package/dist/cms/content-store-adapter.d.ts.map +1 -1
- package/dist/cms/content-store-adapter.js +56 -21
- package/dist/cms/content-store-adapter.js.map +1 -1
- package/dist/cms/contentful/contentful.js.map +1 -1
- package/dist/cms/git/git-based-assets-manager.js +0 -1
- package/dist/cms/git/git-based-assets-manager.js.map +1 -1
- package/dist/cms/git/git-cms-utils.js +0 -1
- package/dist/cms/git/git-cms-utils.js.map +1 -1
- package/dist/cms/git/git.d.ts +1 -1
- package/dist/cms/git/git.d.ts.map +1 -1
- package/dist/cms/git/git.js +1 -2
- package/dist/cms/git/git.js.map +1 -1
- package/dist/cms/sanity/sanity.d.ts +1 -1
- package/dist/cms/sanity/sanity.d.ts.map +1 -1
- package/dist/cms/sanity/sanity.js +0 -1
- package/dist/cms/sanity/sanity.js.map +1 -1
- package/dist/runner/editor.js.map +1 -1
- package/dist/services/annotations/annotation-tree-parser.d.ts +1 -1
- package/dist/services/annotations/annotation-tree-parser.d.ts.map +1 -1
- package/dist/services/annotations/annotation-tree-parser.js +2 -2
- package/dist/services/annotations/annotation-tree-parser.js.map +1 -1
- package/dist/services/annotations/annotation-utils.d.ts +2 -8
- package/dist/services/annotations/annotation-utils.d.ts.map +1 -1
- package/dist/services/annotations/annotation-utils.js +1 -25
- package/dist/services/annotations/annotation-utils.js.map +1 -1
- package/dist/services/presets-service.d.ts +2 -2
- package/dist/services/presets-service.js +5 -6
- package/dist/services/presets-service.js.map +1 -1
- package/dist/services/response-errors.js +0 -1
- package/dist/services/response-errors.js.map +1 -1
- package/dist/services/socket-service.d.ts +1 -1
- package/dist/services/socket-service.d.ts.map +1 -1
- package/dist/services/socket-service.js +0 -1
- package/dist/services/socket-service.js.map +1 -1
- package/dist/utils/cms-utils.js +0 -1
- package/dist/utils/cms-utils.js.map +1 -1
- package/dist/utils/code-utils.d.ts +0 -1
- package/dist/utils/code-utils.d.ts.map +1 -1
- package/dist/utils/code-utils.js +22 -22
- package/dist/utils/code-utils.js.map +1 -1
- package/dist/utils/file-utils.js +5 -6
- package/dist/utils/file-utils.js.map +1 -1
- package/dist/utils/integration-utils.js +1 -2
- package/dist/utils/integration-utils.js.map +1 -1
- package/dist/utils/pages.js +0 -1
- package/dist/utils/pages.js.map +1 -1
- package/dist/utils/proxy-utils.js +6 -7
- package/dist/utils/proxy-utils.js.map +1 -1
- package/dist/utils/remote-content-source.d.ts.map +1 -1
- package/dist/utils/remote-content-source.js.map +1 -1
- package/dist/utils/schema-assets-manager.js +1 -2
- package/dist/utils/schema-assets-manager.js.map +1 -1
- package/dist/utils/schema-utils.d.ts.map +1 -1
- package/dist/utils/schema-utils.js.map +1 -1
- package/dist/utils/version-utils.js +7 -8
- package/dist/utils/version-utils.js.map +1 -1
- package/package.json +20 -23
- package/src/cms/content-store-adapter.ts +61 -22
- package/src/cms/git/git.js +1 -1
- package/src/services/annotations/annotation-tree-parser.js +2 -1
- package/src/services/annotations/annotation-utils.js +1 -27
- package/src/utils/file-utils.js +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-content-source.d.ts","sourceRoot":"","sources":["../../src/utils/remote-content-source.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,MAAM,MAAM,SAAS,GAAG;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,QAAQ,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,uBAAuB,0EAAiF,sBAAsB,yBAuB1I,CAAC;AAEF,eAAO,MAAM,2BAA2B;
|
|
1
|
+
{"version":3,"file":"remote-content-source.d.ts","sourceRoot":"","sources":["../../src/utils/remote-content-source.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,MAAM,MAAM,SAAS,GAAG;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,QAAQ,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,uBAAuB,0EAAiF,sBAAsB,yBAuB1I,CAAC;AAEF,eAAO,MAAM,2BAA2B,mCAIrC;IACC,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAClB,KAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,CAsB1E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-content-source.js","sourceRoot":"","sources":["../../src/utils/remote-content-source.ts"],"names":[],"mappings":";;;;;;AAAA,6BAA0B;AAC1B,+BAA4B;AAC5B,oDAA4B;AAC5B,kDAA0B;AAE1B,iDAAsD;AA8B/C,MAAM,uBAAuB,GAAG,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,OAAO,EAA0B,EAAE,EAAE;IAC3I,IAAI;
|
|
1
|
+
{"version":3,"file":"remote-content-source.js","sourceRoot":"","sources":["../../src/utils/remote-content-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.handleSchemaAssets =
|
|
6
|
+
exports.handleSchemaAssets = handleSchemaAssets;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
9
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
@@ -87,7 +87,6 @@ async function handleSchemaAssets({ models, presets, rootDir, stackbitYamlDir, l
|
|
|
87
87
|
presets: mappedPresets
|
|
88
88
|
};
|
|
89
89
|
}
|
|
90
|
-
exports.handleSchemaAssets = handleSchemaAssets;
|
|
91
90
|
function isRemoteUrl(url) {
|
|
92
91
|
return url.match(/^https?:\/\//i);
|
|
93
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-assets-manager.js","sourceRoot":"","sources":["../../src/utils/schema-assets-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema-assets-manager.js","sourceRoot":"","sources":["../../src/utils/schema-assets-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-utils.d.ts","sourceRoot":"","sources":["../../src/utils/schema-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAElD,eAAO,MAAM,gBAAgB,WAAY,
|
|
1
|
+
{"version":3,"file":"schema-utils.d.ts","sourceRoot":"","sources":["../../src/utils/schema-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAElD,eAAO,MAAM,gBAAgB,WAAY,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC;WACvE,KAAK,GAAG,UAAU;aAAW,MAAM;kBAAgB,MAAM;GAS5F,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-utils.js","sourceRoot":"","sources":["../../src/utils/schema-utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,gBAAgB,GAAG,CAAC,MAA0E,EAAE,EAAE;IAC3G,MAAM,SAAS,GAAgF,EAAE,CAAC;IAClG,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"schema-utils.js","sourceRoot":"","sources":["../../src/utils/schema-utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,gBAAgB,GAAG,CAAC,MAA0E,EAAE,EAAE;IAC3G,MAAM,SAAS,GAAgF,EAAE,CAAC;IAClG,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxD,KAAK,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACpE,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gBACpD,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;YACrD,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B"}
|
|
@@ -3,7 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.getVersionsForStackbitPackages = getVersionsForStackbitPackages;
|
|
7
|
+
exports.getNewerVersionsForStackbitPackages = getNewerVersionsForStackbitPackages;
|
|
8
|
+
exports.getLocalStackbitPackageVersions = getLocalStackbitPackageVersions;
|
|
9
|
+
exports.checkAndLogNewerVersions = checkAndLogNewerVersions;
|
|
10
|
+
exports.checkAndLogContentSourceVersions = checkAndLogContentSourceVersions;
|
|
7
11
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
12
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
9
13
|
const chalk_1 = __importDefault(require("chalk"));
|
|
@@ -23,7 +27,6 @@ async function getVersionsForStackbitPackages(logger) {
|
|
|
23
27
|
return {};
|
|
24
28
|
}
|
|
25
29
|
}
|
|
26
|
-
exports.getVersionsForStackbitPackages = getVersionsForStackbitPackages;
|
|
27
30
|
async function getNewerVersionsForStackbitPackages(packageVersions, logger) {
|
|
28
31
|
const result = {};
|
|
29
32
|
const allVersions = await exports.getVersionsForStackbitPackages(logger);
|
|
@@ -42,8 +45,8 @@ async function getNewerVersionsForStackbitPackages(packageVersions, logger) {
|
|
|
42
45
|
versions = versions.filter((version) => !semver_1.default.prerelease(version));
|
|
43
46
|
}
|
|
44
47
|
const newerVersions = lodash_1.default.uniq([
|
|
45
|
-
semver_1.default.maxSatisfying(versions, `^${currentVersion}`, { includePrerelease: !!prereleaseVersion }),
|
|
46
|
-
semver_1.default.maxSatisfying(versions, `>${currentVersion}`, { includePrerelease: !!prereleaseVersion }),
|
|
48
|
+
semver_1.default.maxSatisfying(versions, `^${currentVersion}`, { includePrerelease: !!prereleaseVersion }), // next compatible version
|
|
49
|
+
semver_1.default.maxSatisfying(versions, `>${currentVersion}`, { includePrerelease: !!prereleaseVersion }), // largest available version
|
|
47
50
|
semver_1.default.maxSatisfying(versions, `>${currentVersion}`) // largest available version
|
|
48
51
|
]
|
|
49
52
|
.filter(Boolean)
|
|
@@ -54,7 +57,6 @@ async function getNewerVersionsForStackbitPackages(packageVersions, logger) {
|
|
|
54
57
|
}
|
|
55
58
|
return result;
|
|
56
59
|
}
|
|
57
|
-
exports.getNewerVersionsForStackbitPackages = getNewerVersionsForStackbitPackages;
|
|
58
60
|
async function getLocalStackbitPackageVersions(dir) {
|
|
59
61
|
const nodeModulesDir = path_1.default.join(dir, 'node_modules');
|
|
60
62
|
if (!(await fs_extra_1.default.pathExists(nodeModulesDir))) {
|
|
@@ -79,7 +81,6 @@ async function getLocalStackbitPackageVersions(dir) {
|
|
|
79
81
|
}
|
|
80
82
|
return result;
|
|
81
83
|
}
|
|
82
|
-
exports.getLocalStackbitPackageVersions = getLocalStackbitPackageVersions;
|
|
83
84
|
async function checkAndLogNewerVersions({ dir, knownVersions, logger }) {
|
|
84
85
|
const localVersions = await exports.getLocalStackbitPackageVersions(dir);
|
|
85
86
|
const currentVersions = { ...knownVersions, ...localVersions };
|
|
@@ -102,7 +103,6 @@ async function checkAndLogNewerVersions({ dir, knownVersions, logger }) {
|
|
|
102
103
|
logger.info(`ℹ️ There is a new container version available${containerPackagesWithNewVersions.includes('stackbit/container') ? `: ${newerVersions['stackbit/container']}` : ''}.`);
|
|
103
104
|
}
|
|
104
105
|
}
|
|
105
|
-
exports.checkAndLogNewerVersions = checkAndLogNewerVersions;
|
|
106
106
|
async function checkAndLogContentSourceVersions({ contentSources, isLocalDev, logger }) {
|
|
107
107
|
const runningInterfaceVersion = await (0, types_1.getInterfaceVersion)();
|
|
108
108
|
// log content sources and their versions
|
|
@@ -134,5 +134,4 @@ async function checkAndLogContentSourceVersions({ contentSources, isLocalDev, lo
|
|
|
134
134
|
logger.error(`${containingRuntime} is running interface v${runningInterfaceVersion}, but content sources are using v${contentSourceMaxInterfaceVersion}.`);
|
|
135
135
|
}
|
|
136
136
|
}
|
|
137
|
-
exports.checkAndLogContentSourceVersions = checkAndLogContentSourceVersions;
|
|
138
137
|
//# sourceMappingURL=version-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../src/utils/version-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../src/utils/version-utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stackbit/dev-common",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.42",
|
|
4
4
|
"description": "stackbit-dev",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -19,38 +19,35 @@
|
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@iarna/toml": "^2.2.5",
|
|
21
21
|
"@stackbit/artisanal-names": "^1.0.1",
|
|
22
|
-
"@stackbit/cms-contentful": "1.0.
|
|
23
|
-
"@stackbit/cms-core": "3.1.
|
|
24
|
-
"@stackbit/cms-git": "1.0.
|
|
25
|
-
"@stackbit/cms-sanity": "0.2.
|
|
26
|
-
"@stackbit/sdk": "2.1.
|
|
27
|
-
"@stackbit/types": "2.1.15
|
|
28
|
-
"@stackbit/utils": "0.8.
|
|
29
|
-
"axios": "^1.
|
|
30
|
-
"chalk": "^4.0
|
|
31
|
-
"configstore": "^5",
|
|
32
|
-
"detect-port": "^1.3.0",
|
|
22
|
+
"@stackbit/cms-contentful": "1.0.34",
|
|
23
|
+
"@stackbit/cms-core": "3.1.23",
|
|
24
|
+
"@stackbit/cms-git": "1.0.36",
|
|
25
|
+
"@stackbit/cms-sanity": "0.2.91",
|
|
26
|
+
"@stackbit/sdk": "2.1.19",
|
|
27
|
+
"@stackbit/types": "2.1.15",
|
|
28
|
+
"@stackbit/utils": "0.8.2",
|
|
29
|
+
"axios": "^1.8.2",
|
|
30
|
+
"chalk": "^4.1.0",
|
|
33
31
|
"express": "^4.17.2",
|
|
34
32
|
"file-type": "^16.5.4",
|
|
35
|
-
"fs-extra": "^
|
|
33
|
+
"fs-extra": "^11.3.0",
|
|
36
34
|
"git-url-parse": "^13.1.0",
|
|
37
|
-
"js-yaml": "^
|
|
35
|
+
"js-yaml": "^4.1.0",
|
|
38
36
|
"lodash": "^4.17.21",
|
|
39
37
|
"moment": "^2.29.1",
|
|
40
38
|
"rimraf": "^3.0.2",
|
|
41
39
|
"sanitize-filename": "^1.6.3",
|
|
42
|
-
"semver": "^7.
|
|
40
|
+
"semver": "^7.7.1",
|
|
43
41
|
"slugify": "^1.6.5",
|
|
44
|
-
"socket.io": "^4.
|
|
45
|
-
"uuid": "^
|
|
42
|
+
"socket.io": "^4.8.1",
|
|
43
|
+
"uuid": "^11.1.0"
|
|
46
44
|
},
|
|
47
45
|
"devDependencies": {
|
|
48
|
-
"@types/configstore": "^5.0.1",
|
|
49
|
-
"@types/detect-port": "^1.3.2",
|
|
50
46
|
"@types/express": "^4.17.13",
|
|
51
|
-
"@types/fs-extra": "^
|
|
52
|
-
"@types/lodash": "^4.
|
|
53
|
-
"@types/
|
|
47
|
+
"@types/fs-extra": "^11.0.4",
|
|
48
|
+
"@types/lodash": "^4.17.16",
|
|
49
|
+
"@types/semver": "^7.3.4",
|
|
50
|
+
"@types/uuid": "^10.0.0"
|
|
54
51
|
},
|
|
55
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "549c07f88e0843e4caa56c1d03e963add087dc86"
|
|
56
53
|
}
|
|
@@ -164,9 +164,9 @@ export class ContentStoreAdapter {
|
|
|
164
164
|
userLogger: this.userLogger
|
|
165
165
|
});
|
|
166
166
|
this.stackbitConfig = await this.extendStackbitConfigWithContentSources(stackbitConfig);
|
|
167
|
-
if (this.stackbitConfig?.contentSources || this.stackbitConfig?.connectors) {
|
|
167
|
+
if (this.csiEnabled || this.stackbitConfig?.contentSources || this.stackbitConfig?.connectors) {
|
|
168
168
|
this.userLogger.info('Using Content Source Interface');
|
|
169
|
-
const stackbitYamlDir = this.stackbitConfig.
|
|
169
|
+
const stackbitYamlDir = this.stackbitConfig?.dirPath || this.appDir;
|
|
170
170
|
this.contentStore = new ContentStore({
|
|
171
171
|
logger: this.logger,
|
|
172
172
|
userLogger: this.userLogger,
|
|
@@ -277,7 +277,12 @@ export class ContentStoreAdapter {
|
|
|
277
277
|
});
|
|
278
278
|
await this.contentStore.init({ stackbitConfig: this.stackbitConfig });
|
|
279
279
|
} else {
|
|
280
|
-
this.userLogger.
|
|
280
|
+
this.userLogger.warn(
|
|
281
|
+
`It looks like your stackbit.config.ts doesn't have any 'contentSources' defined. ` +
|
|
282
|
+
'Add at least one content source to enable visual editing. ' +
|
|
283
|
+
'For more info please visit https://visual-editor-reference.netlify.com/config'
|
|
284
|
+
);
|
|
285
|
+
this.userLogger.info(`Loading from legacy ${this.cmsType || 'git'}...`);
|
|
281
286
|
this.cms = this.createCms();
|
|
282
287
|
await this.cms.run({ spawnRunner: this.userCommandSpawner });
|
|
283
288
|
}
|
|
@@ -326,17 +331,32 @@ export class ContentStoreAdapter {
|
|
|
326
331
|
return config;
|
|
327
332
|
}
|
|
328
333
|
|
|
329
|
-
//
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
+
// If CSI is not enabled, return unmodified config
|
|
335
|
+
if (!this.csiEnabled) {
|
|
336
|
+
return config;
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
const cmsType = this.cmsType || config.cmsName;
|
|
340
|
+
|
|
341
|
+
if (!cmsType) {
|
|
334
342
|
return config;
|
|
335
343
|
}
|
|
336
344
|
|
|
345
|
+
// If CSI is enabled, and cmsType is one of the supported content-sources,
|
|
346
|
+
// install and instantiate a content-sources based on the cmsType.
|
|
347
|
+
const supportedContentSources = ['git', 'contentful', 'sanity'];
|
|
348
|
+
if (supportedContentSources.includes(cmsType)) {
|
|
349
|
+
this.userLogger.warn('No content sources defined in stackbit config!');
|
|
350
|
+
this.userLogger.warn(`Installing and instantiating content source based on the provided CMS type: '${cmsType}'`);
|
|
351
|
+
}
|
|
352
|
+
|
|
337
353
|
// for backward compatibility use ContentfulContentSource when stackbit.yaml has cmsType === 'contentful'
|
|
338
|
-
if (
|
|
339
|
-
const contentfulContentSourceModule = await
|
|
354
|
+
if (cmsType === 'contentful') {
|
|
355
|
+
const contentfulContentSourceModule = await installAndImportContentSourceModule({
|
|
356
|
+
packageName: '@stackbit/cms-contentful',
|
|
357
|
+
projectDir: this.projectDir,
|
|
358
|
+
userLogger: this.userLogger
|
|
359
|
+
});
|
|
340
360
|
const contentSources = this.contentfulSpaces!.map((space) => {
|
|
341
361
|
return new (contentfulContentSourceModule.ContentfulContentSource as typeof ContentfulContentSource)({
|
|
342
362
|
spaceId: space.spaceId,
|
|
@@ -351,12 +371,16 @@ export class ContentStoreAdapter {
|
|
|
351
371
|
}
|
|
352
372
|
|
|
353
373
|
// for backward compatibility use SanityContentSource when stackbit.yaml has cmsType === 'sanity'
|
|
354
|
-
if (
|
|
374
|
+
if (cmsType === 'sanity') {
|
|
355
375
|
if (!this.sanityProject) {
|
|
356
376
|
this.userLogger.error('Cannot create SanityContentSource, missing sanity project data');
|
|
357
377
|
throw new Error('Cannot create SanityContentSource, missing sanity project data');
|
|
358
378
|
}
|
|
359
|
-
const sanityContentSourceModule = await
|
|
379
|
+
const sanityContentSourceModule = await installAndImportContentSourceModule({
|
|
380
|
+
packageName: '@stackbit/cms-sanity',
|
|
381
|
+
projectDir: this.projectDir,
|
|
382
|
+
userLogger: this.userLogger
|
|
383
|
+
});
|
|
360
384
|
const contentSources = [
|
|
361
385
|
new (sanityContentSourceModule.SanityContentSource as typeof SanityContentSource)({
|
|
362
386
|
token: this.sanityProject.token,
|
|
@@ -373,8 +397,12 @@ export class ContentStoreAdapter {
|
|
|
373
397
|
};
|
|
374
398
|
}
|
|
375
399
|
|
|
376
|
-
if (
|
|
377
|
-
const gitContentSourceModule = await
|
|
400
|
+
if (cmsType === 'git') {
|
|
401
|
+
const gitContentSourceModule = await installAndImportContentSourceModule({
|
|
402
|
+
packageName: '@stackbit/cms-git',
|
|
403
|
+
projectDir: this.projectDir,
|
|
404
|
+
userLogger: this.userLogger
|
|
405
|
+
});
|
|
378
406
|
const result = await loadConfigWithModelsPresetsAndValidate({
|
|
379
407
|
dirPath: this.projectDir,
|
|
380
408
|
isForcedGitCSI: true
|
|
@@ -396,11 +424,9 @@ export class ContentStoreAdapter {
|
|
|
396
424
|
};
|
|
397
425
|
}
|
|
398
426
|
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
// const gitContentSourceModule = await importContentSourceModule('@stackbit/cms-git');
|
|
403
|
-
// return ...
|
|
427
|
+
// If CSI is enabled, but there is no cmsType, or the cmsType doesn't
|
|
428
|
+
// match any of the supported content-sources, return unmodified config.
|
|
429
|
+
return config;
|
|
404
430
|
}
|
|
405
431
|
|
|
406
432
|
private createCms(): CMSInterface {
|
|
@@ -1303,18 +1329,31 @@ export class ContentStoreAdapter {
|
|
|
1303
1329
|
}
|
|
1304
1330
|
}
|
|
1305
1331
|
|
|
1306
|
-
async function
|
|
1332
|
+
async function installAndImportContentSourceModule({ packageName, projectDir, userLogger }: { packageName: string; projectDir: string; userLogger: Logger }) {
|
|
1333
|
+
try {
|
|
1334
|
+
userLogger.info(`Installing ${packageName}...`);
|
|
1335
|
+
const runCommand = getCommandRunner({ env: process.env });
|
|
1336
|
+
await runCommand('npm', ['install', packageName, '--no-save'], {
|
|
1337
|
+
env: process.env,
|
|
1338
|
+
cwd: projectDir,
|
|
1339
|
+
logger: userLogger
|
|
1340
|
+
});
|
|
1341
|
+
} catch (error: any) {
|
|
1342
|
+
userLogger.error(`Error installing ${packageName}, error: ${error.message}`);
|
|
1343
|
+
throw new Error(`Error installing ${packageName}, please add it as a devDependency to your project by running "npm i ${packageName} --save-dev"`);
|
|
1344
|
+
}
|
|
1345
|
+
|
|
1307
1346
|
let modulePath;
|
|
1308
1347
|
try {
|
|
1309
1348
|
modulePath = require.resolve(packageName);
|
|
1310
1349
|
} catch (error) {
|
|
1311
|
-
throw new Error(`
|
|
1350
|
+
throw new Error(`Can not find ${packageName} package, please add it as a devDependency to your project by running "npm i ${packageName} --save-dev"`);
|
|
1312
1351
|
}
|
|
1313
1352
|
let module;
|
|
1314
1353
|
try {
|
|
1315
1354
|
module = await import(modulePath);
|
|
1316
1355
|
} catch (error: any) {
|
|
1317
|
-
throw new Error(`
|
|
1356
|
+
throw new Error(`Could not load ${packageName} module, error: ${error.message}`);
|
|
1318
1357
|
}
|
|
1319
1358
|
return module;
|
|
1320
1359
|
}
|
package/src/cms/git/git.js
CHANGED
|
@@ -146,7 +146,7 @@ module.exports = class Git {
|
|
|
146
146
|
} catch (err) {
|
|
147
147
|
//TODO using STACKBIT_YAML is deprecated
|
|
148
148
|
if (process.env.STACKBIT_YAML) {
|
|
149
|
-
this.schema = yaml.
|
|
149
|
+
this.schema = yaml.load(process.env.STACKBIT_YAML, { schema: yaml.JSON_SCHEMA });
|
|
150
150
|
this.debug('loaded stackbit.yaml from STACKBIT_YAML');
|
|
151
151
|
} else {
|
|
152
152
|
this.schema = {};
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
const _ = require('lodash');
|
|
2
2
|
const chalk = require('chalk');
|
|
3
|
+
const { fieldPathToString } = require('@stackbit/utils');
|
|
3
4
|
const { forEachField } = require('../../utils/code-utils');
|
|
4
|
-
const {
|
|
5
|
+
const { fieldPathToFieldDataPath, appendOrArray } = require('./annotation-utils');
|
|
5
6
|
const REGEX_ENDS_WITH_TEXT_PATH = /text\(\)(\[\d*\])?$/;
|
|
6
7
|
const ANNOTATION_XPATH_SELF = ['self::node()', '.'];
|
|
7
8
|
const ANNOTATION_ERROR = 'AnnotationError';
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
const _ = require('lodash');
|
|
2
|
+
const { fieldPathToString } = require('@stackbit/utils');
|
|
2
3
|
|
|
3
4
|
/**
|
|
4
5
|
* This method translates fieldPath (object.sections[0].title) to fieldDataPath (object.fields.sections.items[0].fields.title)
|
|
@@ -71,38 +72,11 @@ function fieldPathToFieldDataPath(objectId, fieldPathStr, getObjectById) {
|
|
|
71
72
|
return { fieldDataPath, fieldDataPathStr: fieldPathToString(fieldDataPath), fieldDataPathsFromRoot };
|
|
72
73
|
}
|
|
73
74
|
|
|
74
|
-
/**
|
|
75
|
-
* This converts a fieldPath array to a string, it puts complex strings inside single quotes '', and uses square brackets [] for number keys.
|
|
76
|
-
* @param fieldPath
|
|
77
|
-
* @returns {*}
|
|
78
|
-
*/
|
|
79
|
-
function fieldPathToString(fieldPath) {
|
|
80
|
-
return _.reduce(
|
|
81
|
-
fieldPath,
|
|
82
|
-
(accumulator, fieldName, index) => {
|
|
83
|
-
if (_.isString(fieldName) && /\W/.test(fieldName)) {
|
|
84
|
-
// field name is a string with non alphanumeric character
|
|
85
|
-
accumulator += `['${fieldName}']`;
|
|
86
|
-
} else if (_.isNumber(fieldName)) {
|
|
87
|
-
accumulator += `[${fieldName}]`;
|
|
88
|
-
} else {
|
|
89
|
-
if (index > 0) {
|
|
90
|
-
accumulator += '.';
|
|
91
|
-
}
|
|
92
|
-
accumulator += fieldName;
|
|
93
|
-
}
|
|
94
|
-
return accumulator;
|
|
95
|
-
},
|
|
96
|
-
''
|
|
97
|
-
);
|
|
98
|
-
}
|
|
99
|
-
|
|
100
75
|
function appendOrArray(object, path, item) {
|
|
101
76
|
_.set(object, path, [..._.get(object, path, []), item]);
|
|
102
77
|
}
|
|
103
78
|
|
|
104
79
|
module.exports = {
|
|
105
80
|
fieldPathToFieldDataPath,
|
|
106
|
-
fieldPathToString,
|
|
107
81
|
appendOrArray
|
|
108
82
|
};
|
package/src/utils/file-utils.js
CHANGED
|
@@ -61,7 +61,7 @@ function parseDataByFilePath(data, filePath) {
|
|
|
61
61
|
switch (extension) {
|
|
62
62
|
case 'yml':
|
|
63
63
|
case 'yaml':
|
|
64
|
-
result = yaml.
|
|
64
|
+
result = yaml.load(data, { schema: yaml.JSON_SCHEMA });
|
|
65
65
|
break;
|
|
66
66
|
case 'json':
|
|
67
67
|
result = JSON.parse(data);
|
|
@@ -86,7 +86,7 @@ function parseMarkdownWithFrontMatter(string) {
|
|
|
86
86
|
type: 'yaml',
|
|
87
87
|
startDelimiter: '---\n',
|
|
88
88
|
endDelimiter: '\n---',
|
|
89
|
-
parse: (string) => yaml.
|
|
89
|
+
parse: (string) => yaml.load(string, { schema: yaml.JSON_SCHEMA })
|
|
90
90
|
},
|
|
91
91
|
{
|
|
92
92
|
type: 'toml',
|
|
@@ -162,7 +162,7 @@ function stringifyDataByFilePath(data, filePath) {
|
|
|
162
162
|
switch (extension) {
|
|
163
163
|
case 'yml':
|
|
164
164
|
case 'yaml':
|
|
165
|
-
result = yaml.
|
|
165
|
+
result = yaml.dump(data, { noRefs: true });
|
|
166
166
|
break;
|
|
167
167
|
case 'toml':
|
|
168
168
|
result = toml.stringify(data);
|
|
@@ -184,9 +184,9 @@ function stringifyDataByFilePath(data, filePath) {
|
|
|
184
184
|
|
|
185
185
|
function markdownStringify(data) {
|
|
186
186
|
const frontmatterData = _.omit(data, ['content']);
|
|
187
|
-
const frontmatter = yaml.
|
|
187
|
+
const frontmatter = yaml.dump(frontmatterData, { noRefs: true });
|
|
188
188
|
const content = _.get(data, 'content', '');
|
|
189
|
-
// yaml.
|
|
189
|
+
// yaml.dump adds new line at the end of its output
|
|
190
190
|
return `---\n${frontmatter}---\n${content}`;
|
|
191
191
|
}
|
|
192
192
|
|