@faststore/cli 2.0.21-alpha.0 → 2.0.22-alpha.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/CHANGELOG.md +9 -0
- package/dist/utils/generate.js +25 -24
- package/dist/utils/generate.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,15 @@
|
|
|
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
|
+
## [2.0.22-alpha.0](https://github.com/vtex/faststore/compare/v2.0.21-alpha.0...v2.0.22-alpha.0) (2022-12-19)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* cli cms merge ([#1565](https://github.com/vtex/faststore/issues/1565)) ([2e5bd93](https://github.com/vtex/faststore/commit/2e5bd93c0ee5f1b6ab3afa39a2eae79c5ebea210))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
6
15
|
## [2.0.21-alpha.0](https://github.com/vtex/faststore/compare/v2.0.20-alpha.0...v2.0.21-alpha.0) (2022-12-19)
|
|
7
16
|
|
|
8
17
|
|
package/dist/utils/generate.js
CHANGED
|
@@ -37,12 +37,14 @@ function copyCoreFiles() {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
function copyUserSrcToCustomizations() {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
if ((0, fs_extra_1.existsSync)(directory_1.userSrcDir) && (0, fs_extra_1.readdirSync)(directory_1.userSrcDir).length > 0) {
|
|
41
|
+
try {
|
|
42
|
+
(0, fs_extra_1.copySync)(directory_1.userSrcDir, directory_1.tmpCustomizationsDir);
|
|
43
|
+
console.log(`${chalk_1.default.green('success')} - Custom files copied`);
|
|
44
|
+
}
|
|
45
|
+
catch (err) {
|
|
46
|
+
console.error(`${chalk_1.default.red('error')} - ${err}`);
|
|
47
|
+
}
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
50
|
async function copyTheme() {
|
|
@@ -70,17 +72,23 @@ async function copyTheme() {
|
|
|
70
72
|
}
|
|
71
73
|
}
|
|
72
74
|
function mergeCMSFile(fileName) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
75
|
+
// TODO: create a validation when has the cms files but doesn't have a component for then
|
|
76
|
+
if ((0, fs_extra_1.existsSync)(directory_1.userCMSDir) && (0, fs_extra_1.readdirSync)(directory_1.userCMSDir).length > 0) {
|
|
77
|
+
const coreContentTypes = (0, fs_extra_1.readFileSync)(`${directory_1.coreCMSDir}/${fileName}`, 'utf8');
|
|
78
|
+
const customContentTypes = (0, fs_extra_1.readFileSync)(`${directory_1.userCMSDir}/${fileName}`, 'utf8');
|
|
79
|
+
const coreContentTypesJSON = JSON.parse(coreContentTypes);
|
|
80
|
+
const customContentTypesJSON = JSON.parse(customContentTypes);
|
|
81
|
+
const mergeContentTypes = [
|
|
82
|
+
...coreContentTypesJSON,
|
|
83
|
+
...customContentTypesJSON,
|
|
84
|
+
];
|
|
85
|
+
try {
|
|
86
|
+
(0, fs_extra_1.writeFileSync)(`${directory_1.tmpCMSDir}/${fileName}`, JSON.stringify(mergeContentTypes));
|
|
87
|
+
console.log(`${chalk_1.default.green('success')} - CMS file ${chalk_1.default.dim(fileName)} created`);
|
|
88
|
+
}
|
|
89
|
+
catch (err) {
|
|
90
|
+
console.error(`${chalk_1.default.red('error')} - ${err}`);
|
|
91
|
+
}
|
|
84
92
|
}
|
|
85
93
|
}
|
|
86
94
|
function generateStoreConfigFile(content) {
|
|
@@ -99,13 +107,6 @@ async function copyStoreConfig() {
|
|
|
99
107
|
}
|
|
100
108
|
}
|
|
101
109
|
function mergeCMSFiles() {
|
|
102
|
-
try {
|
|
103
|
-
(0, fs_extra_1.mkdirsSync)(`${directory_1.tmpDir}/cms`);
|
|
104
|
-
console.log(`${chalk_1.default.green('success')} - CMS folder created`);
|
|
105
|
-
}
|
|
106
|
-
catch (err) {
|
|
107
|
-
console.error(`${chalk_1.default.red('error')} - ${err}`);
|
|
108
|
-
}
|
|
109
110
|
mergeCMSFile('content-types.json');
|
|
110
111
|
mergeCMSFile('sections.json');
|
|
111
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/utils/generate.ts"],"names":[],"mappings":";;;;AAAA,kEAAiC;AACjC,uCAUiB;AAEjB,2CAiBoB;AAEpB,0DAAyB;AAMzB,MAAM,WAAW,GAAG,CAAC,cAAc,CAAC,CAAA;AAEpC,SAAS,eAAe;IACtB,IAAI;QACF,IAAI,IAAA,qBAAU,EAAC,kBAAM,CAAC,EAAE;YACtB,IAAA,qBAAU,EAAC,kBAAM,CAAC,CAAA;SACnB;QAED,IAAA,qBAAU,EAAC,kBAAM,CAAC,CAAA;QAClB,OAAO,CAAC,GAAG,CACT,GAAG,eAAK,CAAC,KAAK,CAAC,SAAS,CAAC,uBAAuB,eAAK,CAAC,GAAG,CACvD,yBAAa,CACd,UAAU,CACZ,CAAA;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;KAChD;AACH,CAAC;AAED,SAAS,aAAa;IACpB,IAAI;QACF,IAAA,mBAAQ,EAAC,mBAAO,EAAE,kBAAM,EAAE;YACxB,MAAM,CAAC,GAAG;gBACR,MAAM,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;gBAC1C,MAAM,UAAU,GAAG,aAAa;oBAC9B,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC;oBACtC,CAAC,CAAC,IAAI,CAAA;gBAER,OAAO,UAAU,CAAA;YACnB,CAAC;SACF,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;KAC7D;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;KACjB;AACH,CAAC;AAED,SAAS,2BAA2B;IAClC,IAAI;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/utils/generate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@faststore/cli",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.22-alpha.0",
|
|
4
4
|
"description": "FastStore CLI",
|
|
5
5
|
"author": "Emerson Laurentino @emersonlaurentino",
|
|
6
6
|
"bin": {
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"oclif"
|
|
69
69
|
],
|
|
70
70
|
"types": "dist/index.d.ts",
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "54f1b21ac99d8a5e6e85ecc049c44a00b77ff9ef"
|
|
72
72
|
}
|