@faststore/cli 3.0.79 → 3.0.80
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/README.md +7 -7
- package/dist/commands/build.js +17 -13
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/cms-sync.js +5 -3
- package/dist/commands/cms-sync.js.map +1 -1
- package/dist/commands/dev.js +9 -8
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/generate-graphql.js +8 -6
- package/dist/commands/generate-graphql.js.map +1 -1
- package/dist/commands/start.js +4 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/test.js +7 -5
- package/dist/commands/test.js.map +1 -1
- package/dist/utils/directory.d.ts +17 -25
- package/dist/utils/directory.js +38 -59
- package/dist/utils/directory.js.map +1 -1
- package/dist/utils/directory.test.d.ts +1 -0
- package/dist/utils/directory.test.js +167 -0
- package/dist/utils/directory.test.js.map +1 -0
- package/dist/utils/generate.d.ts +1 -0
- package/dist/utils/generate.js +53 -45
- package/dist/utils/generate.js.map +1 -1
- package/dist/utils/hcms.d.ts +2 -2
- package/dist/utils/hcms.js +8 -7
- package/dist/utils/hcms.js.map +1 -1
- package/dist/utils/hcms.test.js +5 -4
- package/dist/utils/hcms.test.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +2 -2
- package/dist/utils/contentFromPath.d.ts +0 -10
- package/dist/utils/contentFromPath.js +0 -17
- package/dist/utils/contentFromPath.js.map +0 -1
package/README.md
CHANGED
|
@@ -30,7 +30,7 @@ $ npm install -g @faststore/cli
|
|
|
30
30
|
$ faststore COMMAND
|
|
31
31
|
running command...
|
|
32
32
|
$ faststore (--version)
|
|
33
|
-
@faststore/cli/3.0.
|
|
33
|
+
@faststore/cli/3.0.80 linux-x64 node-v18.20.3
|
|
34
34
|
$ faststore --help [COMMAND]
|
|
35
35
|
USAGE
|
|
36
36
|
$ faststore COMMAND
|
|
@@ -56,7 +56,7 @@ USAGE
|
|
|
56
56
|
$ faststore build
|
|
57
57
|
```
|
|
58
58
|
|
|
59
|
-
_See code: [dist/commands/build.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
59
|
+
_See code: [dist/commands/build.ts](https://github.com/vtex/faststore/blob/v3.0.80/dist/commands/build.ts)_
|
|
60
60
|
|
|
61
61
|
## `faststore cms-sync`
|
|
62
62
|
|
|
@@ -68,7 +68,7 @@ FLAGS
|
|
|
68
68
|
-d, --dry-run
|
|
69
69
|
```
|
|
70
70
|
|
|
71
|
-
_See code: [dist/commands/cms-sync.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
71
|
+
_See code: [dist/commands/cms-sync.ts](https://github.com/vtex/faststore/blob/v3.0.80/dist/commands/cms-sync.ts)_
|
|
72
72
|
|
|
73
73
|
## `faststore dev`
|
|
74
74
|
|
|
@@ -77,7 +77,7 @@ USAGE
|
|
|
77
77
|
$ faststore dev
|
|
78
78
|
```
|
|
79
79
|
|
|
80
|
-
_See code: [dist/commands/dev.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
80
|
+
_See code: [dist/commands/dev.ts](https://github.com/vtex/faststore/blob/v3.0.80/dist/commands/dev.ts)_
|
|
81
81
|
|
|
82
82
|
## `faststore generate-graphql`
|
|
83
83
|
|
|
@@ -89,7 +89,7 @@ FLAGS
|
|
|
89
89
|
-d, --debug
|
|
90
90
|
```
|
|
91
91
|
|
|
92
|
-
_See code: [dist/commands/generate-graphql.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
92
|
+
_See code: [dist/commands/generate-graphql.ts](https://github.com/vtex/faststore/blob/v3.0.80/dist/commands/generate-graphql.ts)_
|
|
93
93
|
|
|
94
94
|
## `faststore help [COMMAND]`
|
|
95
95
|
|
|
@@ -118,7 +118,7 @@ USAGE
|
|
|
118
118
|
$ faststore start
|
|
119
119
|
```
|
|
120
120
|
|
|
121
|
-
_See code: [dist/commands/start.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
121
|
+
_See code: [dist/commands/start.ts](https://github.com/vtex/faststore/blob/v3.0.80/dist/commands/start.ts)_
|
|
122
122
|
|
|
123
123
|
## `faststore test`
|
|
124
124
|
|
|
@@ -127,5 +127,5 @@ USAGE
|
|
|
127
127
|
$ faststore test
|
|
128
128
|
```
|
|
129
129
|
|
|
130
|
-
_See code: [dist/commands/test.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
130
|
+
_See code: [dist/commands/test.ts](https://github.com/vtex/faststore/blob/v3.0.80/dist/commands/test.ts)_
|
|
131
131
|
<!-- commandsstop -->
|
package/dist/commands/build.js
CHANGED
|
@@ -10,17 +10,19 @@ const directory_1 = require("../utils/directory");
|
|
|
10
10
|
const generate_1 = require("../utils/generate");
|
|
11
11
|
class Build extends core_1.Command {
|
|
12
12
|
async run() {
|
|
13
|
-
|
|
13
|
+
const basePath = process.cwd();
|
|
14
|
+
const { tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
15
|
+
await (0, generate_1.generate)({ setup: true, basePath });
|
|
14
16
|
const yarnBuildResult = (0, child_process_1.spawnSync)(`yarn build`, {
|
|
15
17
|
shell: true,
|
|
16
|
-
cwd:
|
|
18
|
+
cwd: tmpDir,
|
|
17
19
|
stdio: 'inherit',
|
|
18
20
|
});
|
|
19
21
|
if (yarnBuildResult.status && yarnBuildResult.status !== 0) {
|
|
20
22
|
process.exit(yarnBuildResult.status);
|
|
21
23
|
}
|
|
22
|
-
await normalizeStandaloneBuildDir();
|
|
23
|
-
await copyResources();
|
|
24
|
+
await normalizeStandaloneBuildDir(basePath);
|
|
25
|
+
await copyResources(basePath);
|
|
24
26
|
}
|
|
25
27
|
}
|
|
26
28
|
exports.default = Build;
|
|
@@ -36,17 +38,19 @@ async function copyResource(from, to) {
|
|
|
36
38
|
console.error(`${chalk_1.default.red('error')} - ${err}`);
|
|
37
39
|
}
|
|
38
40
|
}
|
|
39
|
-
async function normalizeStandaloneBuildDir() {
|
|
41
|
+
async function normalizeStandaloneBuildDir(basePath) {
|
|
42
|
+
const { tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
40
43
|
// Fix Next.js v13+ standalone build output directory
|
|
41
|
-
if ((0, fs_1.existsSync)(`${
|
|
42
|
-
const standaloneBuildFiles = (0, fs_extra_1.readdirSync)(`${
|
|
43
|
-
await Promise.all(standaloneBuildFiles.map((file) => (0, fs_extra_1.moveSync)(`${
|
|
44
|
-
(0, fs_extra_1.removeSync)(`${
|
|
44
|
+
if ((0, fs_1.existsSync)(`${tmpDir}/.next/standalone/.faststore`)) {
|
|
45
|
+
const standaloneBuildFiles = (0, fs_extra_1.readdirSync)(`${tmpDir}/.next/standalone/.faststore`);
|
|
46
|
+
await Promise.all(standaloneBuildFiles.map((file) => (0, fs_extra_1.moveSync)(`${tmpDir}/.next/standalone/.faststore/${file}`, `${tmpDir}/.next/standalone/${file}`, { overwrite: true })));
|
|
47
|
+
(0, fs_extra_1.removeSync)(`${tmpDir}/.next/standalone/.faststore`);
|
|
45
48
|
}
|
|
46
49
|
}
|
|
47
|
-
async function copyResources() {
|
|
48
|
-
|
|
49
|
-
await copyResource(`${
|
|
50
|
-
await copyResource(`${
|
|
50
|
+
async function copyResources(basePath) {
|
|
51
|
+
const { tmpDir, userDir } = (0, directory_1.withBasePath)(basePath);
|
|
52
|
+
await copyResource(`${tmpDir}/.next`, `${userDir}/.next`);
|
|
53
|
+
await copyResource(`${tmpDir}/lighthouserc.js`, `${userDir}/lighthouserc.js`);
|
|
54
|
+
await copyResource(`${tmpDir}/public`, `${userDir}/public`);
|
|
51
55
|
}
|
|
52
56
|
//# sourceMappingURL=build.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":";;;AAAA,sCAAqC;AACrC,0DAAyB;AACzB,iDAAyC;AACzC,2BAA+B;AAC/B,uCAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":";;;AAAA,sCAAqC;AACrC,0DAAyB;AACzB,iDAAyC;AACzC,2BAA+B;AAC/B,uCAAsE;AACtE,kDAAiD;AACjD,gDAA4C;AAE5C,MAAqB,KAAM,SAAQ,cAAO;IACxC,KAAK,CAAC,GAAG;QACP,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;QAE9B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;QAEzC,MAAM,IAAA,mBAAQ,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;QAEzC,MAAM,eAAe,GAAG,IAAA,yBAAS,EAAC,YAAY,EAAE;YAC9C,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,MAAM;YACX,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;QAEF,IAAI,eAAe,CAAC,MAAM,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1D,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SACrC;QAED,MAAM,2BAA2B,CAAC,QAAQ,CAAC,CAAA;QAC3C,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAA;IAC/B,CAAC;CACF;AArBD,wBAqBC;AAED,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,EAAU;IAClD,IAAI;QACF,IAAI,IAAA,eAAU,EAAC,EAAE,CAAC,EAAE;YAClB,IAAA,qBAAU,EAAC,EAAE,CAAC,CAAA;SACf;QAED,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QAClB,OAAO,CAAC,GAAG,CACT,GAAG,eAAK,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,eAAK,CAAC,GAAG,CACnE,EAAE,CACH,EAAE,CACJ,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,KAAK,UAAU,2BAA2B,CAAC,QAAgB;IACzD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;IAEzC,qDAAqD;IACrD,IAAI,IAAA,eAAU,EAAC,GAAG,MAAM,8BAA8B,CAAC,EAAE;QACvD,MAAM,oBAAoB,GAAG,IAAA,sBAAW,EACtC,GAAG,MAAM,8BAA8B,CACxC,CAAA;QAED,MAAM,OAAO,CAAC,GAAG,CACf,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAChC,IAAA,mBAAQ,EACN,GAAG,MAAM,gCAAgC,IAAI,EAAE,EAC/C,GAAG,MAAM,qBAAqB,IAAI,EAAE,EACpC,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CACF,CACF,CAAA;QACD,IAAA,qBAAU,EAAC,GAAG,MAAM,8BAA8B,CAAC,CAAA;KACpD;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,QAAgB;IAC3C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;IAElD,MAAM,YAAY,CAAC,GAAG,MAAM,QAAQ,EAAE,GAAG,OAAO,QAAQ,CAAC,CAAA;IACzD,MAAM,YAAY,CAAC,GAAG,MAAM,kBAAkB,EAAE,GAAG,OAAO,kBAAkB,CAAC,CAAA;IAC7E,MAAM,YAAY,CAAC,GAAG,MAAM,SAAS,EAAE,GAAG,OAAO,SAAS,CAAC,CAAA;AAC7D,CAAC"}
|
|
@@ -11,14 +11,16 @@ class CmsSync extends core_1.Command {
|
|
|
11
11
|
};
|
|
12
12
|
async run() {
|
|
13
13
|
const { flags } = await this.parse(CmsSync);
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
const basePath = process.cwd();
|
|
15
|
+
const { tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
16
|
+
await (0, generate_1.generate)({ setup: true, basePath });
|
|
17
|
+
await (0, hcms_1.mergeCMSFiles)(basePath);
|
|
16
18
|
if (flags['dry-run']) {
|
|
17
19
|
return;
|
|
18
20
|
}
|
|
19
21
|
return (0, child_process_1.spawn)(`vtex cms sync faststore`, {
|
|
20
22
|
shell: true,
|
|
21
|
-
cwd:
|
|
23
|
+
cwd: tmpDir,
|
|
22
24
|
stdio: 'inherit',
|
|
23
25
|
});
|
|
24
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cms-sync.js","sourceRoot":"","sources":["../../src/commands/cms-sync.ts"],"names":[],"mappings":";;AAAA,sCAA4C;AAC5C,iDAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"cms-sync.js","sourceRoot":"","sources":["../../src/commands/cms-sync.ts"],"names":[],"mappings":";;AAAA,sCAA4C;AAC5C,iDAAqC;AACrC,kDAAiD;AACjD,gDAA4C;AAC5C,wCAA6C;AAE7C,MAAqB,OAAQ,SAAQ,cAAO;IAC1C,MAAM,CAAC,KAAK,GAAG;QACb,CAAC,SAAS,CAAC,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;KAC1C,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAE3C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;QAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;QAEzC,MAAM,IAAA,mBAAQ,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;QACzC,MAAM,IAAA,oBAAa,EAAC,QAAQ,CAAC,CAAA;QAE7B,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE;YACpB,OAAM;SACP;QAED,OAAO,IAAA,qBAAK,EAAC,yBAAyB,EAAE;YACtC,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,MAAM;YACX,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;IACJ,CAAC;;AAvBH,0BAwBC"}
|
package/dist/commands/dev.js
CHANGED
|
@@ -28,11 +28,11 @@ const defaultIgnored = [
|
|
|
28
28
|
'**/.faststore/**',
|
|
29
29
|
];
|
|
30
30
|
const devAbortController = new AbortController();
|
|
31
|
-
async function storeDev() {
|
|
32
|
-
const envVars = dotenv_1.default.parse((0, fs_1.readFileSync)(path_1.default.join(
|
|
31
|
+
async function storeDev(rootDir, tmpDir) {
|
|
32
|
+
const envVars = dotenv_1.default.parse((0, fs_1.readFileSync)(path_1.default.join(rootDir, 'vtex.env')));
|
|
33
33
|
const devProcess = (0, child_process_1.spawn)('yarn dev', {
|
|
34
34
|
shell: true,
|
|
35
|
-
cwd:
|
|
35
|
+
cwd: tmpDir,
|
|
36
36
|
signal: devAbortController.signal,
|
|
37
37
|
stdio: 'inherit',
|
|
38
38
|
env: {
|
|
@@ -46,16 +46,17 @@ async function storeDev() {
|
|
|
46
46
|
}
|
|
47
47
|
class Dev extends core_1.Command {
|
|
48
48
|
async run() {
|
|
49
|
+
const basePath = process.cwd();
|
|
50
|
+
const { getRoot, tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
49
51
|
const queueChange = ( /* path: string, remove: boolean */) => {
|
|
50
|
-
|
|
51
|
-
(0, generate_1.generate)();
|
|
52
|
+
(0, generate_1.generate)({ basePath });
|
|
52
53
|
};
|
|
53
54
|
const watcher = chokidar_1.default.watch([...defaultPatterns], {
|
|
54
55
|
atomic: stabilityThreshold,
|
|
55
56
|
awaitWriteFinish: {
|
|
56
57
|
stabilityThreshold,
|
|
57
58
|
},
|
|
58
|
-
cwd:
|
|
59
|
+
cwd: getRoot(),
|
|
59
60
|
ignoreInitial: true,
|
|
60
61
|
ignored: defaultIgnored,
|
|
61
62
|
persistent: true,
|
|
@@ -64,8 +65,8 @@ class Dev extends core_1.Command {
|
|
|
64
65
|
devAbortController.signal.addEventListener('abort', () => {
|
|
65
66
|
watcher.close();
|
|
66
67
|
});
|
|
67
|
-
await (0, generate_1.generate)({ setup: true });
|
|
68
|
-
storeDev();
|
|
68
|
+
await (0, generate_1.generate)({ setup: true, basePath });
|
|
69
|
+
storeDev(getRoot(), tmpDir);
|
|
69
70
|
return await new Promise((resolve, reject) => {
|
|
70
71
|
watcher
|
|
71
72
|
.on('add', ( /*file*/) => queueChange( /*file, false*/))
|
package/dist/commands/dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AACtC,iDAAsC;AACtC,gEAAgC;AAChC,4DAA4B;AAE5B,2BAAkC;AAClC,wDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,11 @@ class GenerateGraphql extends core_1.Command {
|
|
|
13
13
|
};
|
|
14
14
|
async run() {
|
|
15
15
|
const { flags } = await this.parse(GenerateGraphql);
|
|
16
|
+
const basePath = process.cwd();
|
|
17
|
+
const { tmpDir, coreDir } = (0, directory_1.withBasePath)(basePath);
|
|
16
18
|
const debug = flags.debug ?? false;
|
|
17
19
|
const isCore = flags.core ?? false;
|
|
18
|
-
if (!isCore && !(0, fs_extra_1.existsSync)(
|
|
20
|
+
if (!isCore && !(0, fs_extra_1.existsSync)(tmpDir)) {
|
|
19
21
|
console.log(`${chalk_1.default.red('error')} - The ".faststore" directory could not be found. When running faststore dev or faststore build, the generate-graphql command is automatically executed.`);
|
|
20
22
|
process.exit(1);
|
|
21
23
|
}
|
|
@@ -24,29 +26,29 @@ class GenerateGraphql extends core_1.Command {
|
|
|
24
26
|
errorMessage: "Failed to run 'yarn generate:schema'. Please check your setup.",
|
|
25
27
|
throws: 'error',
|
|
26
28
|
debug,
|
|
27
|
-
cwd: isCore ? undefined :
|
|
29
|
+
cwd: isCore ? undefined : tmpDir,
|
|
28
30
|
});
|
|
29
31
|
(0, runCommandSync_1.runCommandSync)({
|
|
30
32
|
cmd: 'yarn generate:codegen',
|
|
31
33
|
errorMessage: 'GraphQL was not optimized and TS files were not updated. Changes in the GraphQL layer did not take effect',
|
|
32
34
|
throws: 'error',
|
|
33
35
|
debug,
|
|
34
|
-
cwd: isCore ? undefined :
|
|
36
|
+
cwd: isCore ? undefined : tmpDir,
|
|
35
37
|
});
|
|
36
38
|
(0, runCommandSync_1.runCommandSync)({
|
|
37
39
|
cmd: 'yarn format:generated',
|
|
38
40
|
errorMessage: "Failed to format generated files. 'yarn format:generated' thrown errors",
|
|
39
41
|
throws: 'warning',
|
|
40
42
|
debug,
|
|
41
|
-
cwd: isCore ? undefined :
|
|
43
|
+
cwd: isCore ? undefined : tmpDir,
|
|
42
44
|
});
|
|
43
45
|
// yarn generate:copy-back expects the DESTINATION var to be present so it can copy the files to the correct directory
|
|
44
46
|
(0, runCommandSync_1.runCommandSync)({
|
|
45
|
-
cmd: `DESTINATION=${
|
|
47
|
+
cmd: `DESTINATION=${coreDir} yarn generate:copy-back`,
|
|
46
48
|
errorMessage: "Failed to copy back typings files. 'yarn generate:copy-back' thrown errors",
|
|
47
49
|
throws: 'warning',
|
|
48
50
|
debug,
|
|
49
|
-
cwd: isCore ? undefined :
|
|
51
|
+
cwd: isCore ? undefined : tmpDir,
|
|
50
52
|
});
|
|
51
53
|
console.log(`${chalk_1.default.green('success')} - GraphQL schema, types, and optimizations successfully generated 🎉`);
|
|
52
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-graphql.js","sourceRoot":"","sources":["../../src/commands/generate-graphql.ts"],"names":[],"mappings":";;;AAAA,sCAA4C;AAC5C,uCAAqC;AACrC,0DAAyB;AAEzB,
|
|
1
|
+
{"version":3,"file":"generate-graphql.js","sourceRoot":"","sources":["../../src/commands/generate-graphql.ts"],"names":[],"mappings":";;;AAAA,sCAA4C;AAC5C,uCAAqC;AACrC,0DAAyB;AAEzB,kDAAiD;AACjD,4DAAwD;AAExD,MAAqB,eAAgB,SAAQ,cAAO;IAClD,MAAM,CAAC,KAAK,GAAG;QACb,KAAK,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QACnC,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;KACjD,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAEnD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;QAC9B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;QAElD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAA;QAClC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAA;QAElC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAA,qBAAU,EAAC,MAAM,CAAC,EAAE;YAClC,OAAO,CAAC,GAAG,CACT,GAAG,eAAK,CAAC,GAAG,CACV,OAAO,CACR,0JAA0J,CAC5J,CAAA;YAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAChB;QAED,IAAA,+BAAc,EAAC;YACb,GAAG,EAAE,sBAAsB;YAC3B,YAAY,EACV,gEAAgE;YAClE,MAAM,EAAE,OAAO;YACf,KAAK;YACL,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;SACjC,CAAC,CAAA;QAEF,IAAA,+BAAc,EAAC;YACb,GAAG,EAAE,uBAAuB;YAC5B,YAAY,EACV,2GAA2G;YAC7G,MAAM,EAAE,OAAO;YACf,KAAK;YACL,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;SACjC,CAAC,CAAA;QAEF,IAAA,+BAAc,EAAC;YACb,GAAG,EAAE,uBAAuB;YAC5B,YAAY,EACV,yEAAyE;YAC3E,MAAM,EAAE,SAAS;YACjB,KAAK;YACL,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;SACjC,CAAC,CAAA;QAEF,sHAAsH;QACtH,IAAA,+BAAc,EAAC;YACb,GAAG,EAAE,eAAe,OAAO,0BAA0B;YACrD,YAAY,EACV,4EAA4E;YAC9E,MAAM,EAAE,SAAS;YACjB,KAAK;YACL,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;SACjC,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CACT,GAAG,eAAK,CAAC,KAAK,CACZ,SAAS,CACV,uEAAuE,CACzE,CAAA;IACH,CAAC;;AAnEH,kCAoEC"}
|
package/dist/commands/start.js
CHANGED
|
@@ -6,12 +6,14 @@ const fs_extra_1 = require("fs-extra");
|
|
|
6
6
|
const directory_1 = require("../utils/directory");
|
|
7
7
|
class Start extends core_1.Command {
|
|
8
8
|
async run() {
|
|
9
|
-
|
|
9
|
+
const basePath = process.cwd();
|
|
10
|
+
const { tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
11
|
+
if (!(0, fs_extra_1.existsSync)(tmpDir)) {
|
|
10
12
|
throw Error('The ".faststore" directory could not be found. If you are trying to serve your store, run "faststore build" first.');
|
|
11
13
|
}
|
|
12
14
|
return (0, child_process_1.spawn)(`yarn serve`, {
|
|
13
15
|
shell: true,
|
|
14
|
-
cwd:
|
|
16
|
+
cwd: tmpDir,
|
|
15
17
|
stdio: 'inherit',
|
|
16
18
|
});
|
|
17
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;AAAA,sCAAqC;AACrC,iDAAqC;AACrC,uCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;AAAA,sCAAqC;AACrC,iDAAqC;AACrC,uCAAqC;AACrC,kDAAiD;AAEjD,MAAqB,KAAM,SAAQ,cAAO;IACxC,KAAK,CAAC,GAAG;QACP,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;QAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;QAEzC,IAAI,CAAC,IAAA,qBAAU,EAAC,MAAM,CAAC,EAAE;YACvB,MAAM,KAAK,CACT,oHAAoH,CACrH,CAAA;SACF;QAED,OAAO,IAAA,qBAAK,EAAC,YAAY,EAAE;YACzB,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,MAAM;YACX,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;IACJ,CAAC;CACF;AAjBD,wBAiBC"}
|
package/dist/commands/test.js
CHANGED
|
@@ -25,10 +25,10 @@ const defaultIgnored = [
|
|
|
25
25
|
'**/.faststore/**',
|
|
26
26
|
];
|
|
27
27
|
const testAbortController = new AbortController();
|
|
28
|
-
async function storeTest() {
|
|
28
|
+
async function storeTest(tmpDir) {
|
|
29
29
|
const testProcess = (0, child_process_1.spawn)('yarn test:e2e', {
|
|
30
30
|
shell: true,
|
|
31
|
-
cwd:
|
|
31
|
+
cwd: tmpDir,
|
|
32
32
|
signal: testAbortController.signal,
|
|
33
33
|
stdio: 'inherit',
|
|
34
34
|
});
|
|
@@ -38,12 +38,14 @@ async function storeTest() {
|
|
|
38
38
|
}
|
|
39
39
|
class Test extends core_1.Command {
|
|
40
40
|
async run() {
|
|
41
|
+
const basePath = process.cwd();
|
|
42
|
+
const { getRoot, tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
41
43
|
const watcher = chokidar_1.default.watch([...defaultPatterns], {
|
|
42
44
|
atomic: stabilityThreshold,
|
|
43
45
|
awaitWriteFinish: {
|
|
44
46
|
stabilityThreshold,
|
|
45
47
|
},
|
|
46
|
-
cwd:
|
|
48
|
+
cwd: getRoot(),
|
|
47
49
|
ignoreInitial: true,
|
|
48
50
|
ignored: defaultIgnored,
|
|
49
51
|
persistent: true,
|
|
@@ -52,8 +54,8 @@ class Test extends core_1.Command {
|
|
|
52
54
|
testAbortController.signal.addEventListener('abort', () => {
|
|
53
55
|
watcher.close();
|
|
54
56
|
});
|
|
55
|
-
await (0, generate_1.generate)({ setup: true });
|
|
56
|
-
storeTest();
|
|
57
|
+
await (0, generate_1.generate)({ setup: true, basePath });
|
|
58
|
+
storeTest(tmpDir);
|
|
57
59
|
return await new Promise((resolve, reject) => {
|
|
58
60
|
watcher
|
|
59
61
|
.on('error', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":";;;AAAA,sCAAqC;AACrC,iDAAqC;AACrC,gEAA+B;AAE/B,gDAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":";;;AAAA,sCAAqC;AACrC,iDAAqC;AACrC,gEAA+B;AAE/B,gDAA4C;AAC5C,kDAAiD;AAEjD;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;AAEpE,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAEtC,MAAM,cAAc,GAAG;IACrB,WAAW;IACX,WAAW;IACX,YAAY;IACZ,cAAc;IACd,iBAAiB;IACjB,oBAAoB;IACpB,SAAS;IACT,eAAe;IACf,kBAAkB;CACnB,CAAA;AAED,MAAM,mBAAmB,GAAG,IAAI,eAAe,EAAE,CAAA;AAEjD,KAAK,UAAU,SAAS,CAAC,MAAc;IACrC,MAAM,WAAW,GAAG,IAAA,qBAAK,EAAC,eAAe,EAAE;QACzC,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,MAAM;QACX,MAAM,EAAE,mBAAmB,CAAC,MAAM;QAClC,KAAK,EAAE,SAAS;KACjB,CAAC,CAAA;IAEF,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QAC3B,mBAAmB,CAAC,KAAK,EAAE,CAAA;IAC7B,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAqB,IAAK,SAAQ,cAAO;IACvC,KAAK,CAAC,GAAG;QACP,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;QAC9B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;QAElD,MAAM,OAAO,GAAG,kBAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,eAAe,CAAC,EAAE;YACnD,MAAM,EAAE,kBAAkB;YAC1B,gBAAgB,EAAE;gBAChB,kBAAkB;aACnB;YACD,GAAG,EAAE,OAAO,EAAE;YACd,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,cAAc;YACvB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;SACzC,CAAC,CAAA;QAEF,mBAAmB,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YACxD,OAAO,CAAC,KAAK,EAAE,CAAA;QACjB,CAAC,CAAC,CAAA;QAEF,MAAM,IAAA,mBAAQ,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;QAEzC,SAAS,CAAC,MAAM,CAAC,CAAA;QAEjB,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,OAAO;iBACJ,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBAChB,mBAAmB,CAAC,KAAK,EAAE,CAAA;gBAC3B,MAAM,EAAE,CAAA;YACV,CAAC,CAAC;iBACD,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACzB,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAlCD,uBAkCC"}
|
|
@@ -1,25 +1,17 @@
|
|
|
1
|
-
export declare const
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
export declare const userCMSDir: string;
|
|
19
|
-
export declare const configFileName = "faststore.config.js";
|
|
20
|
-
export declare const userStoreConfigFileDir: string;
|
|
21
|
-
export declare const tmpStoreConfigFileDir: string;
|
|
22
|
-
export declare const userNodeModulesDir: string;
|
|
23
|
-
export declare const tmpNodeModulesDir: string;
|
|
24
|
-
export declare const cmsWebhookUrlsFileName = "cms-webhook-urls.json";
|
|
25
|
-
export declare const tmpCmsWebhookUrlsFileDir: string;
|
|
1
|
+
export declare const withBasePath: (basepath: string) => {
|
|
2
|
+
getRoot: () => string;
|
|
3
|
+
userDir: string;
|
|
4
|
+
userSrcDir: string;
|
|
5
|
+
userThemesFileDir: string;
|
|
6
|
+
userCMSDir: string;
|
|
7
|
+
userStoreConfigFile: string;
|
|
8
|
+
tmpFolderName: string;
|
|
9
|
+
tmpDir: string;
|
|
10
|
+
tmpCustomizationsSrcDir: string;
|
|
11
|
+
tmpThemesCustomizationsFile: string;
|
|
12
|
+
tmpCMSDir: string;
|
|
13
|
+
tmpCMSWebhookUrlsFile: string;
|
|
14
|
+
tmpStoreConfigFile: string;
|
|
15
|
+
coreDir: string;
|
|
16
|
+
coreCMSDir: string;
|
|
17
|
+
};
|
package/dist/utils/directory.js
CHANGED
|
@@ -1,65 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.withBasePath = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
6
|
+
const withBasePath = (basepath) => {
|
|
7
|
+
const tmpFolderName = '.faststore';
|
|
8
|
+
const getRoot = () => {
|
|
9
|
+
if (process.env.OCLIF_COMPILATION) {
|
|
10
|
+
return '';
|
|
11
|
+
}
|
|
12
|
+
if (basepath.endsWith(tmpFolderName)) {
|
|
13
|
+
// if the current working directory is the build folder (tmp folder), return the starter root
|
|
14
|
+
// this makes sure the semantics of the starter root are consistent with the directories declared below
|
|
15
|
+
return path_1.default.join(basepath, '..');
|
|
16
|
+
}
|
|
17
|
+
return basepath;
|
|
18
|
+
};
|
|
19
|
+
const getFastStorePath = () => {
|
|
20
|
+
// TODO: a more complex version of this would look into the monorepo parent
|
|
21
|
+
return path_1.default.join(basepath, 'node_modules', '@faststore');
|
|
22
|
+
};
|
|
23
|
+
const tmpDir = path_1.default.join(getRoot(), tmpFolderName);
|
|
24
|
+
const userSrcDir = path_1.default.join(getRoot(), 'src');
|
|
25
|
+
return {
|
|
26
|
+
getRoot,
|
|
27
|
+
userDir: getRoot(),
|
|
28
|
+
userSrcDir,
|
|
29
|
+
userThemesFileDir: path_1.default.join(userSrcDir, 'themes'),
|
|
30
|
+
userCMSDir: path_1.default.join(getRoot(), 'cms', 'faststore'),
|
|
31
|
+
userStoreConfigFile: path_1.default.join(getRoot(), 'faststore.config.js'),
|
|
32
|
+
tmpFolderName,
|
|
33
|
+
tmpDir,
|
|
34
|
+
tmpCustomizationsSrcDir: path_1.default.join(tmpDir, 'src', 'customizations', 'src'),
|
|
35
|
+
tmpThemesCustomizationsFile: path_1.default.join(tmpDir, 'src', 'customizations', 'src', 'themes', 'index.scss'),
|
|
36
|
+
tmpCMSDir: path_1.default.join(tmpDir, 'cms', 'faststore'),
|
|
37
|
+
tmpCMSWebhookUrlsFile: path_1.default.join(tmpDir, 'cms-webhook-urls.json'),
|
|
38
|
+
tmpStoreConfigFile: path_1.default.join(tmpDir, 'src', 'customizations', 'faststore.config.js'),
|
|
39
|
+
coreDir: path_1.default.join(getFastStorePath(), 'core'),
|
|
40
|
+
coreCMSDir: path_1.default.join(getFastStorePath(), 'core', 'cms', 'faststore'),
|
|
41
|
+
};
|
|
19
42
|
};
|
|
20
|
-
exports.
|
|
21
|
-
// starter root
|
|
22
|
-
exports.userDir = (0, exports.getRoot)();
|
|
23
|
-
// node_modules folder for faststorer packages
|
|
24
|
-
exports.faststoreDir = path_1.default.join(exports.userDir, 'node_modules', '@faststore');
|
|
25
|
-
// build folder dir
|
|
26
|
-
exports.tmpDir = path_1.default.join(exports.userDir, exports.tmpFolderName);
|
|
27
|
-
// node_modules folder for @faststore/core
|
|
28
|
-
exports.coreFolderName = 'core';
|
|
29
|
-
exports.coreDir = path_1.default.join(exports.faststoreDir, exports.coreFolderName);
|
|
30
|
-
// starter src/ folder
|
|
31
|
-
exports.srcFolderName = 'src';
|
|
32
|
-
exports.userSrcDir = path_1.default.join(exports.userDir, exports.srcFolderName);
|
|
33
|
-
// build folder's folder to which starter files should always be copied
|
|
34
|
-
exports.customizationsFolderName = 'customizations';
|
|
35
|
-
// build folder's root folder for starter files
|
|
36
|
-
exports.tmpCustomizationsDir = path_1.default.join(exports.tmpDir, 'src', exports.customizationsFolderName);
|
|
37
|
-
// build folder's starter src files
|
|
38
|
-
exports.tmpCustomizationsSrcDir = path_1.default.join(exports.tmpCustomizationsDir, exports.srcFolderName);
|
|
39
|
-
// starter's folder for themes
|
|
40
|
-
exports.userThemesFileDir = path_1.default.join(exports.userSrcDir, 'themes');
|
|
41
|
-
// build folder's dir for theme
|
|
42
|
-
exports.tmpThemesCustomizationsFileDir = path_1.default.join(exports.tmpCustomizationsSrcDir, 'themes', 'index.scss');
|
|
43
|
-
// path segment of cms files for faststore
|
|
44
|
-
exports.cmsFolderName = path_1.default.join('cms', 'faststore');
|
|
45
|
-
// build folder's cms folder
|
|
46
|
-
exports.tmpCMSDir = path_1.default.join(exports.tmpDir, exports.cmsFolderName);
|
|
47
|
-
// node_modules folder for @faststore/core's cms folder
|
|
48
|
-
exports.coreCMSDir = path_1.default.join(exports.coreDir, exports.cmsFolderName);
|
|
49
|
-
// starter folder's cms folder
|
|
50
|
-
exports.userCMSDir = path_1.default.join(exports.userDir, exports.cmsFolderName);
|
|
51
|
-
// file name for faststore configs
|
|
52
|
-
exports.configFileName = 'faststore.config.js';
|
|
53
|
-
// starter's config file dir
|
|
54
|
-
exports.userStoreConfigFileDir = path_1.default.join(exports.userDir, exports.configFileName);
|
|
55
|
-
// build folder's config file dir
|
|
56
|
-
exports.tmpStoreConfigFileDir = path_1.default.join(exports.tmpCustomizationsDir, exports.configFileName);
|
|
57
|
-
// starter's node_modules
|
|
58
|
-
exports.userNodeModulesDir = path_1.default.join(exports.userDir, 'node_modules');
|
|
59
|
-
// build folder's node_modules
|
|
60
|
-
exports.tmpNodeModulesDir = path_1.default.join(exports.tmpDir, 'node_modules');
|
|
61
|
-
// cms webhook config file name
|
|
62
|
-
exports.cmsWebhookUrlsFileName = 'cms-webhook-urls.json';
|
|
63
|
-
// build folder's dir for webhook config
|
|
64
|
-
exports.tmpCmsWebhookUrlsFileDir = path_1.default.join(exports.tmpDir, exports.cmsWebhookUrlsFileName);
|
|
43
|
+
exports.withBasePath = withBasePath;
|
|
65
44
|
//# sourceMappingURL=directory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/utils/directory.ts"],"names":[],"mappings":";;;;AAAA,wDAAuB;
|
|
1
|
+
{"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/utils/directory.ts"],"names":[],"mappings":";;;;AAAA,wDAAuB;AAEhB,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC/C,MAAM,aAAa,GAAG,YAAY,CAAA;IAElC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;YACjC,OAAO,EAAE,CAAA;SACV;QAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACpC,6FAA6F;YAC7F,uGAAuG;YACvG,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;SACjC;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IACD,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAE5B,2EAA2E;QAC3E,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IAC1D,CAAC,CAAA;IAED,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,CAAA;IAClD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAA;IAE9C,OAAO;QACL,OAAO;QACP,OAAO,EAAE,OAAO,EAAE;QAClB,UAAU;QACV,iBAAiB,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC;QAClD,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC;QACpD,mBAAmB,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,qBAAqB,CAAC;QAEhE,aAAa;QACb,MAAM;QACN,uBAAuB,EAAE,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,CAAC;QAC1E,2BAA2B,EAAE,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC;QACtG,SAAS,EAAE,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC;QAChD,qBAAqB,EAAE,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,uBAAuB,CAAC;QACjE,kBAAkB,EAAE,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,CAAC;QAErF,OAAO,EAAE,cAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,CAAC;QAC9C,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC;KACtE,CAAA;AACH,CAAC,CAAA;AA5CY,QAAA,YAAY,gBA4CxB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
5
|
+
const directory_1 = require("./directory");
|
|
6
|
+
const pathsToMatch = (expected, desired) => {
|
|
7
|
+
const expectedResolved = path_1.default.resolve(expected);
|
|
8
|
+
const desiredResolved = path_1.default.resolve(desired);
|
|
9
|
+
return expectedResolved === desiredResolved;
|
|
10
|
+
};
|
|
11
|
+
describe('withBasePath as the current dir `.`', () => {
|
|
12
|
+
const basePath = '.';
|
|
13
|
+
describe('coreDir', () => {
|
|
14
|
+
it('is the faststoreDir + core', () => {
|
|
15
|
+
const { coreDir: coreDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
16
|
+
expect(pathsToMatch(coreDirWithBase, './node_modules/@faststore/core')).toBe(true);
|
|
17
|
+
});
|
|
18
|
+
describe('when is in a monorepo', () => {
|
|
19
|
+
it.todo('can look at its parent until it reaches the monorepo directory');
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
describe('tmpDir', () => {
|
|
23
|
+
it('is the basePath + .faststore', () => {
|
|
24
|
+
const { tmpDir: tmpDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
25
|
+
expect(pathsToMatch(tmpDirWithBase, './.faststore')).toBe(true);
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
describe('userDir', () => {
|
|
29
|
+
it("returns the directory of the starter's package.json", () => {
|
|
30
|
+
const { userSrcDir: userSrcDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
31
|
+
expect(pathsToMatch(userSrcDirWithBase, './src')).toBe(true);
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
describe('tmpCustomizationsSrcDir', () => {
|
|
35
|
+
it('returns the directory of customizations directory on the tmp dir', () => {
|
|
36
|
+
const { tmpCustomizationsSrcDir: tmpCustomizationsSrcDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
37
|
+
expect(pathsToMatch(tmpCustomizationsSrcDirWithBase, './.faststore/src/customizations/src')).toBe(true);
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
describe('userThemesFileDir', () => {
|
|
41
|
+
it("returns the directory of the starter's theme directory", () => {
|
|
42
|
+
const { userThemesFileDir: userThemesFileDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
43
|
+
expect(pathsToMatch(userThemesFileDirWithBase, './src/themes')).toBe(true);
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
describe('tmpThemesCustomizationsFile', () => {
|
|
47
|
+
it('returns the path of the theme file on the .faststore dir', () => {
|
|
48
|
+
const { tmpThemesCustomizationsFile: tmpThemesCustomizationsFileWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
49
|
+
expect(pathsToMatch(tmpThemesCustomizationsFileWithBase, './.faststore/src/customizations/src/themes/index.scss')).toBe(true);
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
describe('tmpCMSDir', () => {
|
|
53
|
+
it('returns the path of the CMS dir on the .faststore dir', () => {
|
|
54
|
+
const { tmpCMSDir: tmpCMSDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
55
|
+
expect(pathsToMatch(tmpCMSDirWithBase, './.faststore/cms/faststore')).toBe(true);
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
describe('userCMSDir', () => {
|
|
59
|
+
it('returns the path of the CMS dir on the user dir', () => {
|
|
60
|
+
const { userCMSDir: userCMSDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
61
|
+
expect(pathsToMatch(userCMSDirWithBase, './cms/faststore')).toBe(true);
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
describe('coreCMSDir', () => {
|
|
65
|
+
it('returns the path of the CMS dir on @faststore/core package', () => {
|
|
66
|
+
const { coreCMSDir: coreCMSDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
67
|
+
expect(pathsToMatch(coreCMSDirWithBase, './node_modules/@faststore/core/cms/faststore')).toBe(true);
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
describe('tmpCMSWebhookUrlsFile', () => {
|
|
71
|
+
it('returns the path of the CMS webhooks file on the .faststore dir', () => {
|
|
72
|
+
const { tmpCMSWebhookUrlsFile: tmpCMSWebhookUrlsFileWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
73
|
+
expect(pathsToMatch(tmpCMSWebhookUrlsFileWithBase, './.faststore/cms-webhook-urls.json')).toBe(true);
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
describe('userStoreConfigFile', () => {
|
|
77
|
+
it('returns the path of the user faststore.config file', () => {
|
|
78
|
+
const { userStoreConfigFile: userStoreConfigFileWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
79
|
+
expect(pathsToMatch(userStoreConfigFileWithBase, './faststore.config.js')).toBe(true);
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
describe('tmpStoreConfigFile', () => {
|
|
83
|
+
it('returns the path of the faststore.config file in the customizations dir', () => {
|
|
84
|
+
const { tmpStoreConfigFile: tmpStoreConfigFileWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
85
|
+
expect(pathsToMatch(tmpStoreConfigFileWithBase, './.faststore/src/customizations/faststore.config.js')).toBe(true);
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
describe('withBasePath as an arbitrary dir', () => {
|
|
90
|
+
const basePath = path_1.default.join(__dirname, '..', '__mocks__', 'store');
|
|
91
|
+
describe('coreDir', () => {
|
|
92
|
+
it('is the faststoreDir + core', () => {
|
|
93
|
+
const { coreDir: coreDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
94
|
+
expect(pathsToMatch(coreDirWithBase, './src/__mocks__/store/node_modules/@faststore/core')).toBe(true);
|
|
95
|
+
});
|
|
96
|
+
describe('when is in a monorepo', () => {
|
|
97
|
+
it.todo('can look at its parent until it reaches the monorepo directory');
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
describe('tmpDir', () => {
|
|
101
|
+
it('is the basePath + .faststore', () => {
|
|
102
|
+
const { tmpDir: tmpDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
103
|
+
expect(pathsToMatch(tmpDirWithBase, './src/__mocks__/store/.faststore')).toBe(true);
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
describe('userDir', () => {
|
|
107
|
+
it("returns the directory of the starter's package.json", () => {
|
|
108
|
+
const { userSrcDir: userSrcDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
109
|
+
expect(pathsToMatch(userSrcDirWithBase, './src/__mocks__/store/src')).toBe(true);
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
describe('tmpCustomizationsSrcDir', () => {
|
|
113
|
+
it('returns the directory of customizations directory on the tmp dir', () => {
|
|
114
|
+
const { tmpCustomizationsSrcDir: tmpCustomizationsSrcDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
115
|
+
expect(pathsToMatch(tmpCustomizationsSrcDirWithBase, './src/__mocks__/store/.faststore/src/customizations/src')).toBe(true);
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
describe('userThemesFileDir', () => {
|
|
119
|
+
it("returns the directory of the starter's theme directory", () => {
|
|
120
|
+
const { userThemesFileDir: userThemesFileDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
121
|
+
expect(pathsToMatch(userThemesFileDirWithBase, './src/__mocks__/store/src/themes')).toBe(true);
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
describe('tmpThemesCustomizationsFile', () => {
|
|
125
|
+
it('returns the path of the theme file on the .faststore dir', () => {
|
|
126
|
+
const { tmpThemesCustomizationsFile: tmpThemesCustomizationsFileWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
127
|
+
expect(pathsToMatch(tmpThemesCustomizationsFileWithBase, './src/__mocks__/store/.faststore/src/customizations/src/themes/index.scss')).toBe(true);
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
describe('tmpCMSDir', () => {
|
|
131
|
+
it('returns the path of the CMS dir on the .faststore dir', () => {
|
|
132
|
+
const { tmpCMSDir: tmpCMSDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
133
|
+
expect(pathsToMatch(tmpCMSDirWithBase, './src/__mocks__/store/.faststore/cms/faststore')).toBe(true);
|
|
134
|
+
});
|
|
135
|
+
});
|
|
136
|
+
describe('userCMSDir', () => {
|
|
137
|
+
it('returns the path of the CMS dir on the user dir', () => {
|
|
138
|
+
const { userCMSDir: userCMSDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
139
|
+
expect(pathsToMatch(userCMSDirWithBase, './src/__mocks__/store/cms/faststore')).toBe(true);
|
|
140
|
+
});
|
|
141
|
+
});
|
|
142
|
+
describe('coreCMSDir', () => {
|
|
143
|
+
it('returns the path of the CMS dir on @faststore/core package', () => {
|
|
144
|
+
const { coreCMSDir: coreCMSDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
145
|
+
expect(pathsToMatch(coreCMSDirWithBase, './src/__mocks__/store/node_modules/@faststore/core/cms/faststore')).toBe(true);
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
describe('tmpCMSWebhookUrlsFile', () => {
|
|
149
|
+
it('returns the path of the CMS webhooks file on the .faststore dir', () => {
|
|
150
|
+
const { tmpCMSWebhookUrlsFile: tmpCMSWebhookUrlsFileWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
151
|
+
expect(pathsToMatch(tmpCMSWebhookUrlsFileWithBase, './src/__mocks__/store/.faststore/cms-webhook-urls.json')).toBe(true);
|
|
152
|
+
});
|
|
153
|
+
});
|
|
154
|
+
describe('userStoreConfigFile', () => {
|
|
155
|
+
it('returns the path of the user faststore.config file', () => {
|
|
156
|
+
const { userStoreConfigFile: userStoreConfigFileWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
157
|
+
expect(pathsToMatch(userStoreConfigFileWithBase, './src/__mocks__/store/faststore.config.js')).toBe(true);
|
|
158
|
+
});
|
|
159
|
+
});
|
|
160
|
+
describe('tmpStoreConfigFile', () => {
|
|
161
|
+
it('returns the path of the faststore.config file in the customizations dir', () => {
|
|
162
|
+
const { tmpStoreConfigFile: tmpStoreConfigFileWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
163
|
+
expect(pathsToMatch(tmpStoreConfigFileWithBase, './src/__mocks__/store/.faststore/src/customizations/faststore.config.js')).toBe(true);
|
|
164
|
+
});
|
|
165
|
+
});
|
|
166
|
+
});
|
|
167
|
+
//# sourceMappingURL=directory.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"directory.test.js","sourceRoot":"","sources":["../../src/utils/directory.test.ts"],"names":[],"mappings":";;;AAAA,wDAAuB;AACvB,2CAA0C;AAE1C,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,OAAe,EAAE,EAAE;IACzD,MAAM,gBAAgB,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC/C,MAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAE7C,OAAO,gBAAgB,KAAK,eAAe,CAAA;AAC7C,CAAC,CAAA;AAED,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IACnD,MAAM,QAAQ,GAAG,GAAG,CAAA;IAEpB,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACpC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAE3D,MAAM,CAAC,YAAY,CAAC,eAAe,EAAE,gCAAgC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpF,CAAC,CAAC,CAAA;QAEF,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;YACrC,EAAE,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAA;QAC3E,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEzD,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;YAC7D,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEjE,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;YAC1E,MAAM,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAE3F,MAAM,CAAC,YAAY,CAAC,+BAA+B,EAAE,qCAAqC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzG,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;YAChE,MAAM,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAE/E,MAAM,CAAC,YAAY,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5E,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;QAC3C,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,MAAM,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEnG,MAAM,CAAC,YAAY,CAAC,mCAAmC,EAAE,uDAAuD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/H,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAE/D,MAAM,CAAC,YAAY,CAAC,iBAAiB,EAAE,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClF,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEjE,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACpE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEjE,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,8CAA8C,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACrG,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;YACzE,MAAM,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEvF,MAAM,CAAC,YAAY,CAAC,6BAA6B,EAAE,oCAAoC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtG,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEnF,MAAM,CAAC,YAAY,CAAC,2BAA2B,EAAE,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvF,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;YACjF,MAAM,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEjF,MAAM,CAAC,YAAY,CAAC,0BAA0B,EAAE,qDAAqD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;IAEjE,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACpC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAE3D,MAAM,CAAC,YAAY,CAAC,eAAe,EAAE,oDAAoD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACxG,CAAC,CAAC,CAAA;QAEF,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;YACrC,EAAE,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAA;QAC3E,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEzD,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE,kCAAkC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACrF,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;YAC7D,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEjE,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,2BAA2B,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClF,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;YAC1E,MAAM,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAE3F,MAAM,CAAC,YAAY,CAAC,+BAA+B,EAAE,yDAAyD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC7H,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;YAChE,MAAM,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAE/E,MAAM,CAAC,YAAY,CAAC,yBAAyB,EAAE,kCAAkC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChG,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;QAC3C,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,MAAM,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEnG,MAAM,CAAC,YAAY,CAAC,mCAAmC,EAAE,2EAA2E,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACnJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAE/D,MAAM,CAAC,YAAY,CAAC,iBAAiB,EAAE,gDAAgD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtG,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEjE,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,qCAAqC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5F,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACpE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEjE,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,kEAAkE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;YACzE,MAAM,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEvF,MAAM,CAAC,YAAY,CAAC,6BAA6B,EAAE,wDAAwD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC1H,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEnF,MAAM,CAAC,YAAY,CAAC,2BAA2B,EAAE,2CAA2C,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3G,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;YACjF,MAAM,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;YAEjF,MAAM,CAAC,YAAY,CAAC,0BAA0B,EAAE,yEAAyE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACxI,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
package/dist/utils/generate.d.ts
CHANGED
package/dist/utils/generate.js
CHANGED
|
@@ -8,13 +8,14 @@ const path_1 = tslib_1.__importDefault(require("path"));
|
|
|
8
8
|
const directory_1 = require("./directory");
|
|
9
9
|
// package.json is copied manually after filtering its content
|
|
10
10
|
const ignorePaths = ['package.json', 'node_modules', 'cypress.config.ts'];
|
|
11
|
-
function createTmpFolder() {
|
|
11
|
+
function createTmpFolder(basePath) {
|
|
12
|
+
const { tmpDir, tmpFolderName } = (0, directory_1.withBasePath)(basePath);
|
|
12
13
|
try {
|
|
13
|
-
if ((0, fs_extra_1.existsSync)(
|
|
14
|
-
(0, fs_extra_1.removeSync)(
|
|
14
|
+
if ((0, fs_extra_1.existsSync)(tmpDir)) {
|
|
15
|
+
(0, fs_extra_1.removeSync)(tmpDir);
|
|
15
16
|
}
|
|
16
|
-
(0, fs_extra_1.mkdirsSync)(
|
|
17
|
-
console.log(`${chalk_1.default.green('success')} - Temporary folder ${chalk_1.default.dim(
|
|
17
|
+
(0, fs_extra_1.mkdirsSync)(tmpDir);
|
|
18
|
+
console.log(`${chalk_1.default.green('success')} - Temporary folder ${chalk_1.default.dim(tmpFolderName)} created`);
|
|
18
19
|
}
|
|
19
20
|
catch (err) {
|
|
20
21
|
console.error(`${chalk_1.default.red('error')} - ${err}`);
|
|
@@ -25,18 +26,20 @@ function createTmpFolder() {
|
|
|
25
26
|
* where sometimes the package.json from the .faststore folder
|
|
26
27
|
* took precedence over @faststore/core's package.json.
|
|
27
28
|
*/
|
|
28
|
-
function filterAndCopyPackageJson() {
|
|
29
|
-
const
|
|
29
|
+
function filterAndCopyPackageJson(basePath) {
|
|
30
|
+
const { coreDir, tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
31
|
+
const corePackageJsonPath = path_1.default.join(coreDir, 'package.json');
|
|
30
32
|
const corePackageJsonFile = (0, fs_extra_1.readFileSync)(corePackageJsonPath, 'utf8');
|
|
31
33
|
let { exports: _, ...filteredFileContent } = JSON.parse(corePackageJsonFile);
|
|
32
34
|
filteredFileContent.name = 'dot-faststore';
|
|
33
|
-
(0, fs_extra_1.writeJsonSync)(path_1.default.join(
|
|
35
|
+
(0, fs_extra_1.writeJsonSync)(path_1.default.join(tmpDir, 'package.json'), filteredFileContent, {
|
|
34
36
|
spaces: 2,
|
|
35
37
|
});
|
|
36
38
|
}
|
|
37
|
-
function copyCoreFiles() {
|
|
39
|
+
function copyCoreFiles(basePath) {
|
|
40
|
+
const { coreDir, tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
38
41
|
try {
|
|
39
|
-
(0, fs_extra_1.copySync)(
|
|
42
|
+
(0, fs_extra_1.copySync)(coreDir, tmpDir, {
|
|
40
43
|
filter(src) {
|
|
41
44
|
const fileOrDirName = path_1.default.basename(src);
|
|
42
45
|
const shouldCopy = fileOrDirName
|
|
@@ -45,18 +48,19 @@ function copyCoreFiles() {
|
|
|
45
48
|
return shouldCopy;
|
|
46
49
|
},
|
|
47
50
|
});
|
|
48
|
-
filterAndCopyPackageJson();
|
|
51
|
+
filterAndCopyPackageJson(basePath);
|
|
49
52
|
console.log(`${chalk_1.default.green('success')} - Core files copied`);
|
|
50
53
|
}
|
|
51
54
|
catch (e) {
|
|
52
55
|
console.error(e);
|
|
53
56
|
}
|
|
54
57
|
}
|
|
55
|
-
function copyPublicFiles() {
|
|
58
|
+
function copyPublicFiles(basePath) {
|
|
59
|
+
const { userDir, tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
56
60
|
const allowList = ['json', 'txt', 'xml', 'ico', 'public'];
|
|
57
61
|
try {
|
|
58
|
-
if ((0, fs_extra_1.existsSync)(`${
|
|
59
|
-
(0, fs_extra_1.copySync)(`${
|
|
62
|
+
if ((0, fs_extra_1.existsSync)(`${userDir}/public`)) {
|
|
63
|
+
(0, fs_extra_1.copySync)(`${userDir}/public`, `${tmpDir}/public`, {
|
|
60
64
|
overwrite: true,
|
|
61
65
|
filter: (src) => {
|
|
62
66
|
const allow = allowList.some((ext) => src.endsWith(ext));
|
|
@@ -70,42 +74,44 @@ function copyPublicFiles() {
|
|
|
70
74
|
console.error(e);
|
|
71
75
|
}
|
|
72
76
|
}
|
|
73
|
-
async function copyCypressFiles() {
|
|
77
|
+
async function copyCypressFiles(basePath) {
|
|
74
78
|
var _a;
|
|
79
|
+
const { userDir, userStoreConfigFile, tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
75
80
|
try {
|
|
76
81
|
// Cypress 9.x config file
|
|
77
|
-
if ((0, fs_extra_1.existsSync)(`${
|
|
78
|
-
(0, fs_extra_1.copySync)(`${
|
|
82
|
+
if ((0, fs_extra_1.existsSync)(`${userDir}/cypress.json`)) {
|
|
83
|
+
(0, fs_extra_1.copySync)(`${userDir}/cypress.json`, `${tmpDir}/cypress.json`);
|
|
79
84
|
}
|
|
80
85
|
// Cypress 12.x config file
|
|
81
|
-
if ((0, fs_extra_1.existsSync)(`${
|
|
82
|
-
(0, fs_extra_1.copySync)(`${
|
|
86
|
+
if ((0, fs_extra_1.existsSync)(`${userDir}/cypress.config.ts`)) {
|
|
87
|
+
(0, fs_extra_1.copySync)(`${userDir}/cypress.config.ts`, `${tmpDir}/cypress.config.ts`);
|
|
83
88
|
}
|
|
84
|
-
const userStoreConfig = await (_a =
|
|
89
|
+
const userStoreConfig = await (_a = userStoreConfigFile, Promise.resolve().then(() => tslib_1.__importStar(require(_a))));
|
|
85
90
|
// Copy custom Cypress folder and files
|
|
86
|
-
if ((0, fs_extra_1.existsSync)(`${
|
|
91
|
+
if ((0, fs_extra_1.existsSync)(`${userDir}/cypress`) &&
|
|
87
92
|
userStoreConfig?.experimental?.enableCypressExtension) {
|
|
88
|
-
(0, fs_extra_1.copySync)(`${
|
|
93
|
+
(0, fs_extra_1.copySync)(`${userDir}/cypress`, `${tmpDir}/cypress`, {
|
|
89
94
|
overwrite: true,
|
|
90
95
|
});
|
|
91
96
|
console.log(`${chalk_1.default.green('success')} - Cypress test files copied`);
|
|
92
97
|
}
|
|
93
98
|
// Create default Cypress 12.x (or superior) support file
|
|
94
99
|
if (userStoreConfig?.experimental?.cypressVersion > 9) {
|
|
95
|
-
(0, fs_extra_1.copySync)(`${
|
|
100
|
+
(0, fs_extra_1.copySync)(`${tmpDir}/cypress/support/index.js`, `${tmpDir}/cypress/support/e2e.js`, { overwrite: false });
|
|
96
101
|
}
|
|
97
102
|
}
|
|
98
103
|
catch (e) {
|
|
99
104
|
console.error(e);
|
|
100
105
|
}
|
|
101
106
|
}
|
|
102
|
-
function copyUserStarterToCustomizations() {
|
|
107
|
+
function copyUserStarterToCustomizations(basePath) {
|
|
108
|
+
const { userSrcDir, tmpCustomizationsSrcDir, userStoreConfigFile, tmpStoreConfigFile } = (0, directory_1.withBasePath)(basePath);
|
|
103
109
|
try {
|
|
104
|
-
if ((0, fs_extra_1.existsSync)(
|
|
105
|
-
(0, fs_extra_1.copySync)(
|
|
110
|
+
if ((0, fs_extra_1.existsSync)(userSrcDir) && (0, fs_extra_1.readdirSync)(userSrcDir).length > 0) {
|
|
111
|
+
(0, fs_extra_1.copySync)(userSrcDir, tmpCustomizationsSrcDir);
|
|
106
112
|
}
|
|
107
|
-
if ((0, fs_extra_1.existsSync)(
|
|
108
|
-
(0, fs_extra_1.copySync)(
|
|
113
|
+
if ((0, fs_extra_1.existsSync)(userStoreConfigFile)) {
|
|
114
|
+
(0, fs_extra_1.copySync)(userStoreConfigFile, tmpStoreConfigFile);
|
|
109
115
|
}
|
|
110
116
|
console.log(`${chalk_1.default.green('success')} - Starter files copied`);
|
|
111
117
|
}
|
|
@@ -113,14 +119,15 @@ function copyUserStarterToCustomizations() {
|
|
|
113
119
|
console.error(`${chalk_1.default.red('error')} - ${err}`);
|
|
114
120
|
}
|
|
115
121
|
}
|
|
116
|
-
async function createCmsWebhookUrlsJsonFile() {
|
|
122
|
+
async function createCmsWebhookUrlsJsonFile(basePath) {
|
|
117
123
|
var _a;
|
|
118
|
-
const
|
|
124
|
+
const { userStoreConfigFile, tmpCMSWebhookUrlsFile } = (0, directory_1.withBasePath)(basePath);
|
|
125
|
+
const userStoreConfig = await (_a = userStoreConfigFile, Promise.resolve().then(() => tslib_1.__importStar(require(_a))));
|
|
119
126
|
if (userStoreConfig?.vtexHeadlessCms &&
|
|
120
127
|
userStoreConfig.vtexHeadlessCms?.webhookUrls) {
|
|
121
128
|
const { webhookUrls } = userStoreConfig?.vtexHeadlessCms;
|
|
122
129
|
try {
|
|
123
|
-
(0, fs_extra_1.writeJsonSync)(
|
|
130
|
+
(0, fs_extra_1.writeJsonSync)(tmpCMSWebhookUrlsFile, { urls: webhookUrls }, { spaces: 2 });
|
|
124
131
|
console.log(`${chalk_1.default.green('success')} - CMS webhook URLs file created`);
|
|
125
132
|
}
|
|
126
133
|
catch (err) {
|
|
@@ -131,14 +138,15 @@ async function createCmsWebhookUrlsJsonFile() {
|
|
|
131
138
|
console.info(`${chalk_1.default.blue('info')} - No CMS webhook URLs were provided`);
|
|
132
139
|
}
|
|
133
140
|
}
|
|
134
|
-
async function copyTheme() {
|
|
141
|
+
async function copyTheme(basePath) {
|
|
135
142
|
var _a;
|
|
136
|
-
const
|
|
143
|
+
const { userStoreConfigFile, userThemesFileDir, tmpThemesCustomizationsFile } = (0, directory_1.withBasePath)(basePath);
|
|
144
|
+
const storeConfig = await (_a = userStoreConfigFile, Promise.resolve().then(() => tslib_1.__importStar(require(_a))));
|
|
137
145
|
if (storeConfig.theme) {
|
|
138
|
-
const customTheme = path_1.default.join(
|
|
146
|
+
const customTheme = path_1.default.join(userThemesFileDir, `${storeConfig.theme}.scss`);
|
|
139
147
|
if ((0, fs_extra_1.existsSync)(customTheme)) {
|
|
140
148
|
try {
|
|
141
|
-
(0, fs_extra_1.copyFileSync)(customTheme,
|
|
149
|
+
(0, fs_extra_1.copyFileSync)(customTheme, tmpThemesCustomizationsFile);
|
|
142
150
|
console.log(`${chalk_1.default.green('success')} - ${storeConfig.theme} theme has been applied`);
|
|
143
151
|
}
|
|
144
152
|
catch (err) {
|
|
@@ -149,27 +157,27 @@ async function copyTheme() {
|
|
|
149
157
|
console.info(`${chalk_1.default.blue('info')} - The ${storeConfig.theme} theme was added to the config file but the ${storeConfig.theme}.scss file does not exist in the themes folder. Read more: https://www.faststore.dev/docs/themes/overview`);
|
|
150
158
|
}
|
|
151
159
|
}
|
|
152
|
-
else if ((0, fs_extra_1.existsSync)(
|
|
153
|
-
(0, fs_extra_1.readdirSync)(
|
|
160
|
+
else if ((0, fs_extra_1.existsSync)(userThemesFileDir) &&
|
|
161
|
+
(0, fs_extra_1.readdirSync)(userThemesFileDir).length > 0) {
|
|
154
162
|
console.info(`${chalk_1.default.blue('info')} - The theme needs to be added to the config file to be applied. Read more: https://www.faststore.dev/docs/themes/overview`);
|
|
155
163
|
}
|
|
156
164
|
}
|
|
157
165
|
async function generate(options) {
|
|
158
|
-
const { setup = false } = options ?? {};
|
|
166
|
+
const { setup = false, basePath = process.cwd() } = options ?? {};
|
|
159
167
|
let setupPromise = null;
|
|
160
168
|
if (setup) {
|
|
161
169
|
setupPromise = Promise.all([
|
|
162
|
-
createTmpFolder(),
|
|
163
|
-
copyCoreFiles(),
|
|
164
|
-
copyCypressFiles(),
|
|
165
|
-
copyPublicFiles(),
|
|
170
|
+
createTmpFolder(basePath),
|
|
171
|
+
copyCoreFiles(basePath),
|
|
172
|
+
copyCypressFiles(basePath),
|
|
173
|
+
copyPublicFiles(basePath),
|
|
166
174
|
]);
|
|
167
175
|
}
|
|
168
176
|
await Promise.all([
|
|
169
177
|
setupPromise,
|
|
170
|
-
copyUserStarterToCustomizations(),
|
|
171
|
-
copyTheme(),
|
|
172
|
-
createCmsWebhookUrlsJsonFile(),
|
|
178
|
+
copyUserStarterToCustomizations(basePath),
|
|
179
|
+
copyTheme(basePath),
|
|
180
|
+
createCmsWebhookUrlsJsonFile(basePath),
|
|
173
181
|
]);
|
|
174
182
|
}
|
|
175
183
|
exports.generate = generate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/utils/generate.ts"],"names":[],"mappings":";;;;AAAA,0DAAyB;AACzB,uCASiB;AACjB,wDAAuB;AAEvB,
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/utils/generate.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/hcms.d.ts
CHANGED
|
@@ -20,5 +20,5 @@ export declare function splitCustomDefinitions(coreDefinitions: ContentTypeOrSec
|
|
|
20
20
|
newDefinitions: ContentTypeOrSectionDefinition[];
|
|
21
21
|
};
|
|
22
22
|
export declare function dedupeAndMergeDefinitions(coreDefinitions: ContentTypeOrSectionDefinition[], duplicates: ContentTypeOrSectionDefinition[], primaryIdentifier: 'id' | 'name'): ContentTypeOrSectionDefinition[];
|
|
23
|
-
export declare function mergeCMSFile(fileName: string): Promise<void>;
|
|
24
|
-
export declare function mergeCMSFiles(): Promise<void>;
|
|
23
|
+
export declare function mergeCMSFile(fileName: string, basePath: string): Promise<void>;
|
|
24
|
+
export declare function mergeCMSFiles(basePath: string): Promise<void>;
|
package/dist/utils/hcms.js
CHANGED
|
@@ -51,9 +51,10 @@ async function confirmUserChoice(duplicates, fileName) {
|
|
|
51
51
|
}
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
|
-
async function mergeCMSFile(fileName) {
|
|
55
|
-
const
|
|
56
|
-
const
|
|
54
|
+
async function mergeCMSFile(fileName, basePath) {
|
|
55
|
+
const { coreCMSDir, userCMSDir, tmpCMSDir } = (0, directory_1.withBasePath)(basePath);
|
|
56
|
+
const coreFilePath = path_1.default.join(coreCMSDir, fileName);
|
|
57
|
+
const customFilePath = path_1.default.join(userCMSDir, fileName);
|
|
57
58
|
const coreFile = (0, fs_extra_1.readFileSync)(coreFilePath, 'utf8');
|
|
58
59
|
const coreDefinitions = JSON.parse(coreFile);
|
|
59
60
|
const primaryIdentifierForDefinitions = fileName === 'content-types.json' ? 'id' : 'name';
|
|
@@ -85,7 +86,7 @@ async function mergeCMSFile(fileName) {
|
|
|
85
86
|
}
|
|
86
87
|
}
|
|
87
88
|
try {
|
|
88
|
-
(0, fs_extra_1.writeFileSync)(path_1.default.join(
|
|
89
|
+
(0, fs_extra_1.writeFileSync)(path_1.default.join(tmpCMSDir, fileName), JSON.stringify(output));
|
|
89
90
|
console.log(`${chalk_1.default.green('success')} - CMS file ${chalk_1.default.dim(fileName)} created`);
|
|
90
91
|
}
|
|
91
92
|
catch (err) {
|
|
@@ -93,10 +94,10 @@ async function mergeCMSFile(fileName) {
|
|
|
93
94
|
}
|
|
94
95
|
}
|
|
95
96
|
exports.mergeCMSFile = mergeCMSFile;
|
|
96
|
-
async function mergeCMSFiles() {
|
|
97
|
+
async function mergeCMSFiles(basePath) {
|
|
97
98
|
try {
|
|
98
|
-
await mergeCMSFile('content-types.json');
|
|
99
|
-
await mergeCMSFile('sections.json');
|
|
99
|
+
await mergeCMSFile('content-types.json', basePath);
|
|
100
|
+
await mergeCMSFile('sections.json', basePath);
|
|
100
101
|
}
|
|
101
102
|
catch (err) {
|
|
102
103
|
console.error(`${chalk_1.default.red('error')} - ${err}`);
|
package/dist/utils/hcms.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hcms.js","sourceRoot":"","sources":["../../src/utils/hcms.ts"],"names":[],"mappings":";;;;AAAA,wDAAuB;AACvB,0DAAyB;AACzB,sCAAmC;AACnC,uCAAkE;AAElE,
|
|
1
|
+
{"version":3,"file":"hcms.js","sourceRoot":"","sources":["../../src/utils/hcms.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/hcms.test.js
CHANGED
|
@@ -13,14 +13,15 @@ jest.mock('fs-extra', () => ({
|
|
|
13
13
|
describe('mergeCMSFile', () => {
|
|
14
14
|
it("should create a resulting file that contains all core definitions if a custom definitions file doesn't exist", async () => {
|
|
15
15
|
const { readFileSync, existsSync, writeFileSync } = require('fs-extra');
|
|
16
|
+
const { tmpCMSDir } = (0, directory_1.withBasePath)('.');
|
|
16
17
|
existsSync.mockReturnValueOnce(false);
|
|
17
18
|
readFileSync.mockReturnValueOnce(JSON.stringify(hcms_1.coreContentTypes));
|
|
18
|
-
await (0, hcms_2.mergeCMSFile)('content-types.json');
|
|
19
|
-
expect(writeFileSync).toHaveBeenCalledWith(path_1.default.join(
|
|
19
|
+
await (0, hcms_2.mergeCMSFile)('content-types.json', '.');
|
|
20
|
+
expect(writeFileSync).toHaveBeenCalledWith(path_1.default.join(tmpCMSDir, 'content-types.json'), JSON.stringify(hcms_1.coreContentTypes));
|
|
20
21
|
existsSync.mockReturnValueOnce(false);
|
|
21
22
|
readFileSync.mockReturnValueOnce(JSON.stringify(hcms_1.coreSections));
|
|
22
|
-
await (0, hcms_2.mergeCMSFile)('sections.json');
|
|
23
|
-
expect(writeFileSync).toHaveBeenCalledWith(path_1.default.join(
|
|
23
|
+
await (0, hcms_2.mergeCMSFile)('sections.json', '.');
|
|
24
|
+
expect(writeFileSync).toHaveBeenCalledWith(path_1.default.join(tmpCMSDir, 'sections.json'), JSON.stringify(hcms_1.coreSections));
|
|
24
25
|
});
|
|
25
26
|
});
|
|
26
27
|
describe('splitCustomDefinitions', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hcms.test.js","sourceRoot":"","sources":["../../src/utils/hcms.test.ts"],"names":[],"mappings":";;;AAAA,wDAAuB;AACvB,4CAS0B;AAE1B,iCAIe;AACf,
|
|
1
|
+
{"version":3,"file":"hcms.test.js","sourceRoot":"","sources":["../../src/utils/hcms.test.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"3.0.
|
|
1
|
+
{"version":"3.0.80","commands":{"build":{"id":"build","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"cms-sync":{"id":"cms-sync","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{"dry-run":{"name":"dry-run","type":"boolean","char":"d","allowNo":false}},"args":[]},"dev":{"id":"dev","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"generate-graphql":{"id":"generate-graphql","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{"debug":{"name":"debug","type":"boolean","char":"d","allowNo":false},"core":{"name":"core","type":"boolean","char":"c","hidden":true,"allowNo":false}},"args":[]},"start":{"id":"start","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"test":{"id":"test","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{},"args":[]}}}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@faststore/cli",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.80",
|
|
4
4
|
"description": "FastStore CLI",
|
|
5
5
|
"author": "Emerson Laurentino @emersonlaurentino",
|
|
6
6
|
"bin": {
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
"oclif"
|
|
70
70
|
],
|
|
71
71
|
"types": "dist/index.d.ts",
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "a3f57ed88cba732ba13cfab351caca6aeefa93ef"
|
|
73
73
|
}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
|
-
/// <reference types="node" />
|
|
4
|
-
import { Readable } from 'stream';
|
|
5
|
-
export interface ContentFromPath {
|
|
6
|
-
path: string | null;
|
|
7
|
-
content: string | Readable | Buffer | NodeJS.ReadableStream;
|
|
8
|
-
}
|
|
9
|
-
declare const getContentFromPath: (path: string, remove?: boolean) => ContentFromPath;
|
|
10
|
-
export { getContentFromPath };
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getContentFromPath = void 0;
|
|
4
|
-
const path_1 = require("path");
|
|
5
|
-
const fs_extra_1 = require("fs-extra");
|
|
6
|
-
const directory_1 = require("./directory");
|
|
7
|
-
const getContentFromPath = (path, remove) => {
|
|
8
|
-
const content = remove
|
|
9
|
-
? ''
|
|
10
|
-
: (0, fs_extra_1.readFileSync)((0, path_1.resolve)((0, directory_1.getRoot)(), path)).toString('base64');
|
|
11
|
-
return {
|
|
12
|
-
content,
|
|
13
|
-
path: path.split(path_1.sep).join('/'),
|
|
14
|
-
};
|
|
15
|
-
};
|
|
16
|
-
exports.getContentFromPath = getContentFromPath;
|
|
17
|
-
//# sourceMappingURL=contentFromPath.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"contentFromPath.js","sourceRoot":"","sources":["../../src/utils/contentFromPath.ts"],"names":[],"mappings":";;;AAAA,+BAAkD;AAElD,uCAAuC;AACvC,2CAAqC;AAOrC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,MAAgB,EAAmB,EAAE;IAC7E,MAAM,OAAO,GAAG,MAAM;QACpB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,IAAA,uBAAY,EAAC,IAAA,cAAW,EAAC,IAAA,mBAAO,GAAE,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAEjE,OAAO;QACL,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;KAChC,CAAA;AACH,CAAC,CAAA;AAEQ,gDAAkB"}
|