@faststore/cli 3.0.127 → 3.0.128
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 +25 -20
- package/dist/commands/build.js +4 -0
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/dev.js +13 -4
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/start.js +11 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/utils/directory.js +3 -3
- package/dist/utils/directory.js.map +1 -1
- package/dist/utils/directory.test.js +10 -1
- package/dist/utils/directory.test.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +2 -2
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.128 linux-x64 node-v18.20.4
|
|
34
34
|
$ faststore --help [COMMAND]
|
|
35
35
|
USAGE
|
|
36
36
|
$ faststore COMMAND
|
|
@@ -41,26 +41,27 @@ USAGE
|
|
|
41
41
|
## Commands
|
|
42
42
|
|
|
43
43
|
<!-- commands -->
|
|
44
|
-
* [`faststore build [PATH]`](#faststore-build-path)
|
|
44
|
+
* [`faststore build [ACCOUNT] [PATH]`](#faststore-build-account-path)
|
|
45
45
|
* [`faststore cms-sync [PATH]`](#faststore-cms-sync-path)
|
|
46
46
|
* [`faststore create [PATH]`](#faststore-create-path)
|
|
47
|
-
* [`faststore dev [PATH]`](#faststore-dev-path)
|
|
47
|
+
* [`faststore dev [ACCOUNT] [PATH] [PORT]`](#faststore-dev-account-path-port)
|
|
48
48
|
* [`faststore generate-graphql [PATH]`](#faststore-generate-graphql-path)
|
|
49
49
|
* [`faststore help [COMMAND]`](#faststore-help-command)
|
|
50
|
-
* [`faststore start [PATH]`](#faststore-start-path)
|
|
50
|
+
* [`faststore start [ACCOUNT] [PATH] [PORT]`](#faststore-start-account-path-port)
|
|
51
51
|
* [`faststore test [PATH]`](#faststore-test-path)
|
|
52
52
|
|
|
53
|
-
## `faststore build [PATH]`
|
|
53
|
+
## `faststore build [ACCOUNT] [PATH]`
|
|
54
54
|
|
|
55
55
|
```
|
|
56
56
|
USAGE
|
|
57
|
-
$ faststore build [PATH]
|
|
57
|
+
$ faststore build [ACCOUNT] [PATH]
|
|
58
58
|
|
|
59
59
|
ARGUMENTS
|
|
60
|
-
|
|
60
|
+
ACCOUNT The account for which the Discovery is running. Currently noop.
|
|
61
|
+
PATH The path where the FastStore being built is. Defaults to cwd.
|
|
61
62
|
```
|
|
62
63
|
|
|
63
|
-
_See code: [dist/commands/build.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
64
|
+
_See code: [dist/commands/build.ts](https://github.com/vtex/faststore/blob/v3.0.128/dist/commands/build.ts)_
|
|
64
65
|
|
|
65
66
|
## `faststore cms-sync [PATH]`
|
|
66
67
|
|
|
@@ -75,7 +76,7 @@ FLAGS
|
|
|
75
76
|
-d, --dry-run
|
|
76
77
|
```
|
|
77
78
|
|
|
78
|
-
_See code: [dist/commands/cms-sync.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
79
|
+
_See code: [dist/commands/cms-sync.ts](https://github.com/vtex/faststore/blob/v3.0.128/dist/commands/cms-sync.ts)_
|
|
79
80
|
|
|
80
81
|
## `faststore create [PATH]`
|
|
81
82
|
|
|
@@ -95,19 +96,21 @@ EXAMPLES
|
|
|
95
96
|
$ yarn faststore create discovery
|
|
96
97
|
```
|
|
97
98
|
|
|
98
|
-
_See code: [dist/commands/create.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
99
|
+
_See code: [dist/commands/create.ts](https://github.com/vtex/faststore/blob/v3.0.128/dist/commands/create.ts)_
|
|
99
100
|
|
|
100
|
-
## `faststore dev [PATH]`
|
|
101
|
+
## `faststore dev [ACCOUNT] [PATH] [PORT]`
|
|
101
102
|
|
|
102
103
|
```
|
|
103
104
|
USAGE
|
|
104
|
-
$ faststore dev [PATH]
|
|
105
|
+
$ faststore dev [ACCOUNT] [PATH] [PORT]
|
|
105
106
|
|
|
106
107
|
ARGUMENTS
|
|
107
|
-
|
|
108
|
+
ACCOUNT The account for which the Discovery is running. Currently noop.
|
|
109
|
+
PATH The path where the FastStore being run is. Defaults to cwd.
|
|
110
|
+
PORT The port where FastStore should run. Defaults to 3000.
|
|
108
111
|
```
|
|
109
112
|
|
|
110
|
-
_See code: [dist/commands/dev.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
113
|
+
_See code: [dist/commands/dev.ts](https://github.com/vtex/faststore/blob/v3.0.128/dist/commands/dev.ts)_
|
|
111
114
|
|
|
112
115
|
## `faststore generate-graphql [PATH]`
|
|
113
116
|
|
|
@@ -122,7 +125,7 @@ FLAGS
|
|
|
122
125
|
-d, --debug
|
|
123
126
|
```
|
|
124
127
|
|
|
125
|
-
_See code: [dist/commands/generate-graphql.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
128
|
+
_See code: [dist/commands/generate-graphql.ts](https://github.com/vtex/faststore/blob/v3.0.128/dist/commands/generate-graphql.ts)_
|
|
126
129
|
|
|
127
130
|
## `faststore help [COMMAND]`
|
|
128
131
|
|
|
@@ -144,17 +147,19 @@ DESCRIPTION
|
|
|
144
147
|
|
|
145
148
|
_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.1.22/src/commands/help.ts)_
|
|
146
149
|
|
|
147
|
-
## `faststore start [PATH]`
|
|
150
|
+
## `faststore start [ACCOUNT] [PATH] [PORT]`
|
|
148
151
|
|
|
149
152
|
```
|
|
150
153
|
USAGE
|
|
151
|
-
$ faststore start [PATH]
|
|
154
|
+
$ faststore start [ACCOUNT] [PATH] [PORT]
|
|
152
155
|
|
|
153
156
|
ARGUMENTS
|
|
154
|
-
|
|
157
|
+
ACCOUNT The account for which the Discovery is running. Currently noop.
|
|
158
|
+
PATH The path where the FastStore being run is. Defaults to cwd.
|
|
159
|
+
PORT The port where FastStore should run. Defaults to 3000.
|
|
155
160
|
```
|
|
156
161
|
|
|
157
|
-
_See code: [dist/commands/start.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
162
|
+
_See code: [dist/commands/start.ts](https://github.com/vtex/faststore/blob/v3.0.128/dist/commands/start.ts)_
|
|
158
163
|
|
|
159
164
|
## `faststore test [PATH]`
|
|
160
165
|
|
|
@@ -166,5 +171,5 @@ ARGUMENTS
|
|
|
166
171
|
PATH The path where the FastStore being tested is. Defaults to cwd.
|
|
167
172
|
```
|
|
168
173
|
|
|
169
|
-
_See code: [dist/commands/test.ts](https://github.com/vtex/faststore/blob/v3.0.
|
|
174
|
+
_See code: [dist/commands/test.ts](https://github.com/vtex/faststore/blob/v3.0.128/dist/commands/test.ts)_
|
|
170
175
|
<!-- commandsstop -->
|
package/dist/commands/build.js
CHANGED
|
@@ -11,6 +11,10 @@ const directory_1 = require("../utils/directory");
|
|
|
11
11
|
const generate_1 = require("../utils/generate");
|
|
12
12
|
class Build extends core_1.Command {
|
|
13
13
|
static args = [
|
|
14
|
+
{
|
|
15
|
+
name: 'account',
|
|
16
|
+
description: 'The account for which the Discovery is running. Currently noop.',
|
|
17
|
+
},
|
|
14
18
|
{
|
|
15
19
|
name: 'path',
|
|
16
20
|
description: 'The path where the FastStore being built is. Defaults to cwd.',
|
|
@@ -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,gDAA8D;AAC9D,kDAAiD;AACjD,gDAA4C;AAE5C,MAAqB,KAAM,SAAQ,cAAO;IACxC,MAAM,CAAC,IAAI,GAAG;QACZ;YACE,IAAI,EAAE,MAAM;YACZ,WAAW,EACT,+DAA+D;SAClE;KACF,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAExC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;QAE3C,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,cAAc,GAAG,IAAA,qCAA0B,GAAE,CAAA;QAEnD,MAAM,WAAW,GAAG,IAAA,yBAAS,EAAC,GAAG,cAAc,YAAY,EAAE;YAC3D,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,MAAM;YACX,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;QAEF,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAClD,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;SACjC;QAED,MAAM,2BAA2B,CAAC,QAAQ,CAAC,CAAA;QAC3C,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAA;IAC/B,CAAC;;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/dev.js
CHANGED
|
@@ -31,7 +31,7 @@ const defaultIgnored = [
|
|
|
31
31
|
'**/.faststore/**',
|
|
32
32
|
];
|
|
33
33
|
const devAbortController = new AbortController();
|
|
34
|
-
async function storeDev(rootDir, tmpDir, coreDir) {
|
|
34
|
+
async function storeDev(rootDir, tmpDir, coreDir, port) {
|
|
35
35
|
const envVars = dotenv_1.default.parse((0, fs_1.readFileSync)(path_1.default.join(rootDir, 'vtex.env')));
|
|
36
36
|
const packageManager = (0, commands_1.getPreferredPackageManager)();
|
|
37
37
|
(0, runCommandSync_1.runCommandSync)({
|
|
@@ -46,7 +46,7 @@ async function storeDev(rootDir, tmpDir, coreDir) {
|
|
|
46
46
|
console.log(`${chalk_1.default.yellow('warn')} - Failed to copy @generated schema back to node_modules, autocomplete and DX might be impacted.`);
|
|
47
47
|
console.log(`Attempted to copy from ${path_1.default.join(tmpDir, '@generated')} to ${path_1.default.join(coreDir, '@generated')}`);
|
|
48
48
|
}
|
|
49
|
-
const devProcess = (0, child_process_1.spawn)(`${packageManager} dev-only`, {
|
|
49
|
+
const devProcess = (0, child_process_1.spawn)(`${packageManager} dev-only --port ${port}`, {
|
|
50
50
|
shell: true,
|
|
51
51
|
cwd: tmpDir,
|
|
52
52
|
signal: devAbortController.signal,
|
|
@@ -71,14 +71,23 @@ function copyGenerated(from, to) {
|
|
|
71
71
|
}
|
|
72
72
|
class Dev extends core_1.Command {
|
|
73
73
|
static args = [
|
|
74
|
+
{
|
|
75
|
+
name: 'account',
|
|
76
|
+
description: 'The account for which the Discovery is running. Currently noop.',
|
|
77
|
+
},
|
|
74
78
|
{
|
|
75
79
|
name: 'path',
|
|
76
80
|
description: 'The path where the FastStore being run is. Defaults to cwd.',
|
|
77
|
-
}
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
name: 'port',
|
|
84
|
+
description: 'The port where FastStore should run. Defaults to 3000.',
|
|
85
|
+
},
|
|
78
86
|
];
|
|
79
87
|
async run() {
|
|
80
88
|
const { args } = await this.parse(Dev);
|
|
81
89
|
const basePath = args.path ?? process.cwd();
|
|
90
|
+
const port = args.port ?? 3000;
|
|
82
91
|
const { getRoot, tmpDir, coreDir } = (0, directory_1.withBasePath)(basePath);
|
|
83
92
|
const queueChange = ( /* path: string, remove: boolean */) => {
|
|
84
93
|
(0, generate_1.generate)({ basePath });
|
|
@@ -98,7 +107,7 @@ class Dev extends core_1.Command {
|
|
|
98
107
|
watcher.close();
|
|
99
108
|
});
|
|
100
109
|
await (0, generate_1.generate)({ setup: true, basePath });
|
|
101
|
-
storeDev(getRoot(), tmpDir, coreDir);
|
|
110
|
+
storeDev(getRoot(), tmpDir, coreDir, port);
|
|
102
111
|
return await new Promise((resolve, reject) => {
|
|
103
112
|
watcher
|
|
104
113
|
.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,0DAA0B;AAC1B,gEAAgC;AAChC,4DAA4B;AAE5B,2BAA0C;AAC1C,wDAAwB;AACxB,kDAAkD;AAClD,gDAA6C;AAC7C,gDAA+D;AAC/D,4DAAyD;AAGzD;;;;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,kBAAkB,GAAG,IAAI,eAAe,EAAE,CAAA;AAEhD,KAAK,UAAU,QAAQ,CAAC,OAAe,EAAE,MAAc,EAAE,OAAe;
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/start.js
CHANGED
|
@@ -7,20 +7,29 @@ const directory_1 = require("../utils/directory");
|
|
|
7
7
|
const commands_1 = require("../utils/commands");
|
|
8
8
|
class Start extends core_1.Command {
|
|
9
9
|
static args = [
|
|
10
|
+
{
|
|
11
|
+
name: 'account',
|
|
12
|
+
description: 'The account for which the Discovery is running. Currently noop.',
|
|
13
|
+
},
|
|
10
14
|
{
|
|
11
15
|
name: 'path',
|
|
12
16
|
description: 'The path where the FastStore being run is. Defaults to cwd.',
|
|
13
|
-
}
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
name: 'port',
|
|
20
|
+
description: 'The port where FastStore should run. Defaults to 3000.',
|
|
21
|
+
},
|
|
14
22
|
];
|
|
15
23
|
async run() {
|
|
16
24
|
const { args } = await this.parse(Start);
|
|
17
25
|
const basePath = args.path ?? process.cwd();
|
|
26
|
+
const port = args.port ?? 3000;
|
|
18
27
|
const { tmpDir } = (0, directory_1.withBasePath)(basePath);
|
|
19
28
|
const packageManager = (0, commands_1.getPreferredPackageManager)();
|
|
20
29
|
if (!(0, fs_extra_1.existsSync)(tmpDir)) {
|
|
21
30
|
throw Error('The ".faststore" directory could not be found. If you are trying to serve your store, run "faststore build" first.');
|
|
22
31
|
}
|
|
23
|
-
return (0, child_process_1.spawn)(`${packageManager} run serve`, {
|
|
32
|
+
return (0, child_process_1.spawn)(`${packageManager} run serve -p ${port}`, {
|
|
24
33
|
shell: true,
|
|
25
34
|
cwd: tmpDir,
|
|
26
35
|
stdio: 'inherit',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;AAAA,sCAAqC;AACrC,iDAAqC;AACrC,uCAAqC;AACrC,kDAAiD;AACjD,gDAA8D;AAE9D,MAAqB,KAAM,SAAQ,cAAO;IACxC,MAAM,CAAC,IAAI,GAAG;QACZ;YACE,IAAI,EAAE,MAAM;YACZ,WAAW,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;AAAA,sCAAqC;AACrC,iDAAqC;AACrC,uCAAqC;AACrC,kDAAiD;AACjD,gDAA8D;AAE9D,MAAqB,KAAM,SAAQ,cAAO;IACxC,MAAM,CAAC,IAAI,GAAG;QACZ;YACE,IAAI,EAAE,SAAS;YACf,WAAW,EACT,iEAAiE;SACpE;QACD;YACE,IAAI,EAAE,MAAM;YACZ,WAAW,EACT,6DAA6D;SAChE;QACD;YACE,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,wDAAwD;SACtE;KACF,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAA;QAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAA;QACzC,MAAM,cAAc,GAAG,IAAA,qCAA0B,GAAE,CAAA;QAEnD,IAAI,CAAC,IAAA,qBAAU,EAAC,MAAM,CAAC,EAAE;YACvB,MAAM,KAAK,CACT,oHAAoH,CACrH,CAAA;SACF;QAED,OAAO,IAAA,qBAAK,EAAC,GAAG,cAAc,iBAAiB,IAAI,EAAE,EAAE;YACrD,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,MAAM;YACX,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;IACJ,CAAC;;AApCH,wBAqCC"}
|
package/dist/utils/directory.js
CHANGED
|
@@ -13,9 +13,9 @@ const withBasePath = (basepath) => {
|
|
|
13
13
|
if (basepath.endsWith(tmpFolderName)) {
|
|
14
14
|
// if the current working directory is the build folder (tmp folder), return the starter root
|
|
15
15
|
// this makes sure the semantics of the starter root are consistent with the directories declared below
|
|
16
|
-
return path_1.default.join(basepath, '..');
|
|
16
|
+
return path_1.default.resolve(process.cwd(), path_1.default.join(basepath, '..'));
|
|
17
17
|
}
|
|
18
|
-
return basepath;
|
|
18
|
+
return path_1.default.resolve(process.cwd(), basepath);
|
|
19
19
|
};
|
|
20
20
|
/*
|
|
21
21
|
* This will loop from the basepath until the process.cwd() looking for node_modules/@faststore/core
|
|
@@ -28,7 +28,7 @@ const withBasePath = (basepath) => {
|
|
|
28
28
|
const parents = [];
|
|
29
29
|
let attemptedPath;
|
|
30
30
|
do {
|
|
31
|
-
attemptedPath = path_1.default.join(basepath, ...parents, coreFromNodeModules);
|
|
31
|
+
attemptedPath = path_1.default.join(resolvedCwd, basepath, ...parents, coreFromNodeModules);
|
|
32
32
|
if (node_fs_1.default.existsSync(attemptedPath)) {
|
|
33
33
|
return attemptedPath;
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/utils/directory.ts"],"names":[],"mappings":";;;;AAAA,wDAAuB;AACvB,8DAAwB;AAEjB,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;
|
|
1
|
+
{"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/utils/directory.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,10 @@ const pathsToMatch = (expected, desired) => {
|
|
|
8
8
|
const desiredResolved = path_1.default.resolve(desired);
|
|
9
9
|
return expectedResolved === desiredResolved;
|
|
10
10
|
};
|
|
11
|
+
const originalProcessCwd = process.cwd;
|
|
12
|
+
beforeEach(() => {
|
|
13
|
+
process.cwd = originalProcessCwd;
|
|
14
|
+
});
|
|
11
15
|
describe('withBasePath as the current dir `.`', () => {
|
|
12
16
|
const basePath = '.';
|
|
13
17
|
describe('tmpDir', () => {
|
|
@@ -61,7 +65,6 @@ describe('withBasePath as the current dir `.`', () => {
|
|
|
61
65
|
describe('userStoreConfigFile', () => {
|
|
62
66
|
it('returns the path of the user discovery.config file', () => {
|
|
63
67
|
const { userStoreConfigFile: userStoreConfigFileWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
64
|
-
console.log('userStoreConfigFileWithBase', userStoreConfigFileWithBase);
|
|
65
68
|
expect(pathsToMatch(userStoreConfigFileWithBase, './discovery.config.js')).toBe(true);
|
|
66
69
|
});
|
|
67
70
|
});
|
|
@@ -76,11 +79,15 @@ describe('withBasePath as an arbitrary dir', () => {
|
|
|
76
79
|
const basePath = path_1.default.join(__dirname, '..', '__mocks__', 'store');
|
|
77
80
|
describe('coreDir', () => {
|
|
78
81
|
it('is the faststoreDir + core', () => {
|
|
82
|
+
const mockedCwd = jest.fn(() => { return './src/__mocks__/store'; });
|
|
83
|
+
process.cwd = mockedCwd;
|
|
79
84
|
const { coreDir: coreDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
80
85
|
expect(pathsToMatch(coreDirWithBase, './src/__mocks__/store/node_modules/@faststore/core')).toBe(true);
|
|
81
86
|
});
|
|
82
87
|
describe('when is in a monorepo', () => {
|
|
83
88
|
it('can look at its parent until it reaches the monorepo directory', () => {
|
|
89
|
+
const mockedCwd = jest.fn(() => { return './src/__mocks__/monorepo'; });
|
|
90
|
+
process.cwd = mockedCwd;
|
|
84
91
|
const { coreDir: coreDirWithBase } = (0, directory_1.withBasePath)(path_1.default.join(__dirname, '..', '__mocks__', 'monorepo', 'discovery'));
|
|
85
92
|
expect(pathsToMatch(coreDirWithBase, './src/__mocks__/monorepo/node_modules/@faststore/core')).toBe(true);
|
|
86
93
|
});
|
|
@@ -130,6 +137,8 @@ describe('withBasePath as an arbitrary dir', () => {
|
|
|
130
137
|
});
|
|
131
138
|
describe('coreCMSDir', () => {
|
|
132
139
|
it('returns the path of the CMS dir on @faststore/core package', () => {
|
|
140
|
+
const mockedCwd = jest.fn(() => { return './src/__mocks__/store'; });
|
|
141
|
+
process.cwd = mockedCwd;
|
|
133
142
|
const { coreCMSDir: coreCMSDirWithBase } = (0, directory_1.withBasePath)(basePath);
|
|
134
143
|
expect(pathsToMatch(coreCMSDirWithBase, './src/__mocks__/store/node_modules/@faststore/core/cms/faststore')).toBe(true);
|
|
135
144
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directory.test.js","sourceRoot":"","sources":["../../src/utils/directory.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"directory.test.js","sourceRoot":"","sources":["../../src/utils/directory.test.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"3.0.
|
|
1
|
+
{"version":"3.0.128","commands":{"build":{"id":"build","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"account","description":"The account for which the Discovery is running. Currently noop."},{"name":"path","description":"The path where the FastStore being built is. Defaults to cwd."}]},"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":[{"name":"path","description":"The path where the FastStore being synched with the CMS is. Defaults to cwd."}]},"create":{"id":"create","description":"Creates a discovery folder based on the starter.store template.","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"examples":["$ yarn faststore create discovery"],"flags":{},"args":[{"name":"path","description":"The path where the Discovery folder will be created. Defaults to ./discovery."}]},"dev":{"id":"dev","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"account","description":"The account for which the Discovery is running. Currently noop."},{"name":"path","description":"The path where the FastStore being run is. Defaults to cwd."},{"name":"port","description":"The port where FastStore should run. Defaults to 3000."}]},"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":[{"name":"path","description":"The path where the FastStore GraphQL customization is. Defaults to cwd."}]},"start":{"id":"start","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"account","description":"The account for which the Discovery is running. Currently noop."},{"name":"path","description":"The path where the FastStore being run is. Defaults to cwd."},{"name":"port","description":"The port where FastStore should run. Defaults to 3000."}]},"test":{"id":"test","strict":true,"pluginName":"@faststore/cli","pluginAlias":"@faststore/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"path","description":"The path where the FastStore being tested is. Defaults to cwd."}]}}}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@faststore/cli",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.128",
|
|
4
4
|
"description": "FastStore CLI",
|
|
5
5
|
"author": "Emerson Laurentino @emersonlaurentino",
|
|
6
6
|
"bin": {
|
|
@@ -74,5 +74,5 @@
|
|
|
74
74
|
"oclif"
|
|
75
75
|
],
|
|
76
76
|
"types": "dist/index.d.ts",
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "37e2acff2335defce528f67e09ad38d5675964c8"
|
|
78
78
|
}
|