@appium/docutils 0.4.0 → 0.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/appium-docs.js +2 -0
- package/build/lib/builder/deploy.d.ts.map +1 -1
- package/build/lib/builder/deploy.js +22 -12
- package/build/lib/builder/deploy.js.map +1 -1
- package/build/lib/builder/nav.d.ts.map +1 -1
- package/build/lib/builder/nav.js +11 -5
- package/build/lib/builder/nav.js.map +1 -1
- package/build/lib/cli/command/build.d.ts +4 -3
- package/build/lib/cli/command/build.d.ts.map +1 -1
- package/build/lib/cli/command/build.js +4 -3
- package/build/lib/cli/command/build.js.map +1 -1
- package/build/lib/fs.d.ts +4 -0
- package/build/lib/fs.d.ts.map +1 -1
- package/build/lib/fs.js +29 -1
- package/build/lib/fs.js.map +1 -1
- package/lib/builder/deploy.ts +27 -17
- package/lib/builder/nav.ts +11 -9
- package/lib/cli/command/build.ts +4 -3
- package/lib/fs.ts +30 -0
- package/package.json +3 -3
package/bin/appium-docs.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAO,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAc1D,OAAO,EAAiC,0BAA0B,EAAY,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAO,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAc1D,OAAO,EAAiC,0BAA0B,EAAY,MAAM,SAAS,CAAC;AAsD9F;;;GAGG;AACH,wBAAsB,MAAM,CAAC,EAC3B,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,aAAa,EAAE,OAAO,EACtB,GAAmB,EACnB,KAAa,EACb,IAAY,EACZ,MAA8B,EAC9B,MAA8B,EAC9B,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAa,EACb,IAAyB,EACzB,IAAyB,EACzB,SAAS,EACT,QAAQ,GACT,GAAE,UAAe,iBAqEjB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAElC;;OAEG;IACH,SAAS,CAAC,EAAE,0BAA0B,CAAC;CACxC"}
|
|
@@ -20,24 +20,24 @@ const util_1 = require("../util");
|
|
|
20
20
|
const log = (0, logger_1.getLogger)('builder:deploy');
|
|
21
21
|
/**
|
|
22
22
|
* Runs `mike serve`
|
|
23
|
-
* @param
|
|
23
|
+
* @param mikePath Path to `mike` executable
|
|
24
24
|
* @param args Extra args to `mike build`
|
|
25
25
|
* @param opts Extra options for `teen_process.Subprocess.start`
|
|
26
26
|
*/
|
|
27
|
-
async function doServe(
|
|
28
|
-
const finalArgs = ['
|
|
29
|
-
return (0, util_1.spawnBackgroundProcess)(
|
|
27
|
+
async function doServe(mikePath, args = [], opts = {}) {
|
|
28
|
+
const finalArgs = ['serve', ...args];
|
|
29
|
+
return (0, util_1.spawnBackgroundProcess)(mikePath, finalArgs, opts);
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
32
32
|
* Runs `mike build`
|
|
33
|
-
* @param
|
|
33
|
+
* @param mikePath Path to `mike` executable
|
|
34
34
|
* @param args Extra args to `mike build`
|
|
35
35
|
* @param opts Extra options to `teen_process.exec`
|
|
36
36
|
*/
|
|
37
|
-
async function doDeploy(
|
|
38
|
-
const finalArgs = ['
|
|
39
|
-
log.debug('Executing %s via: %s %O', constants_1.NAME_MIKE,
|
|
40
|
-
return await (0, teen_process_1.exec)(
|
|
37
|
+
async function doDeploy(mikePath, args = [], opts = {}) {
|
|
38
|
+
const finalArgs = ['deploy', ...args];
|
|
39
|
+
log.debug('Executing %s via: %s %O', constants_1.NAME_MIKE, mikePath, finalArgs);
|
|
40
|
+
return await (0, teen_process_1.exec)(mikePath, finalArgs, opts);
|
|
41
41
|
}
|
|
42
42
|
/**
|
|
43
43
|
* Derives a deployment version from `package.json`
|
|
@@ -50,7 +50,13 @@ async function findDeployVersion(packageJsonPath, cwd = process.cwd()) {
|
|
|
50
50
|
if (!version) {
|
|
51
51
|
throw new error_1.DocutilsError('No "version" field found in package.json; please add one or specify a version to deploy');
|
|
52
52
|
}
|
|
53
|
-
return version
|
|
53
|
+
// return MAJOR.MINOR as the version by default, if that is a thing we can extract, otherwise
|
|
54
|
+
// just return the version as is
|
|
55
|
+
const versionParts = version.split('.');
|
|
56
|
+
if (versionParts.length === 1) {
|
|
57
|
+
return version;
|
|
58
|
+
}
|
|
59
|
+
return `${versionParts[0]}.${versionParts[1]}`;
|
|
54
60
|
}
|
|
55
61
|
/**
|
|
56
62
|
* Runs `mike build` or `mike serve`
|
|
@@ -80,6 +86,10 @@ async function deploy({ mkdocsYml: mkDocsYmlPath, packageJson: packageJsonPath,
|
|
|
80
86
|
port,
|
|
81
87
|
host,
|
|
82
88
|
};
|
|
89
|
+
const mikePath = await (0, fs_1.findMike)();
|
|
90
|
+
if (!mikePath) {
|
|
91
|
+
throw new error_1.DocutilsError(`Could not find ${constants_1.NAME_MIKE} executable; please run "${constants_1.NAME_BIN} init"`);
|
|
92
|
+
}
|
|
83
93
|
if (serve) {
|
|
84
94
|
const mikeArgs = [
|
|
85
95
|
...(0, util_1.argify)(lodash_1.default.pickBy(mikeOpts, (value) => lodash_1.default.isNumber(value) || Boolean(value))),
|
|
@@ -90,7 +100,7 @@ async function deploy({ mkdocsYml: mkDocsYmlPath, packageJson: packageJsonPath,
|
|
|
90
100
|
}
|
|
91
101
|
stop(); // discard
|
|
92
102
|
// unsure about how SIGHUP is handled here
|
|
93
|
-
await doServe(
|
|
103
|
+
await doServe(mikePath, mikeArgs, serveOpts);
|
|
94
104
|
}
|
|
95
105
|
else {
|
|
96
106
|
log.info('Deploying into branch %s', branch);
|
|
@@ -101,7 +111,7 @@ async function deploy({ mkdocsYml: mkDocsYmlPath, packageJson: packageJsonPath,
|
|
|
101
111
|
if (alias) {
|
|
102
112
|
mikeArgs.push(alias);
|
|
103
113
|
}
|
|
104
|
-
await doDeploy(
|
|
114
|
+
await doDeploy(mikePath, mikeArgs, execOpts);
|
|
105
115
|
log.success('Finished deployment into branch %s (%dms)', branch, stop());
|
|
106
116
|
}
|
|
107
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;AAEH,oDAAuB;AACvB,0DAA6B;AAC7B,+CAA0D;AAC1D,4CASsB;AACtB,oCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;AAEH,oDAAuB;AACvB,0DAA6B;AAC7B,+CAA0D;AAC1D,4CASsB;AACtB,oCAAuC;AACvC,8BAA2E;AAC3E,sCAAoC;AACpC,kCAA8F;AAE9F,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,gBAAgB,CAAC,CAAC;AAExC;;;;;GAKG;AACH,KAAK,UAAU,OAAO,CACpB,QAAgB,EAChB,OAAiB,EAAE,EACnB,OAAmC,EAAE;IAErC,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrC,OAAO,IAAA,6BAAsB,EAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,QAAQ,CAAC,QAAgB,EAAE,OAAiB,EAAE,EAAE,OAA+B,EAAE;IAC9F,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,qBAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACrE,OAAO,MAAM,IAAA,mBAAI,EAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,iBAAiB,CAAC,eAAwB,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IAC5E,MAAM,EAAC,GAAG,EAAC,GAAG,MAAM,IAAA,oBAAe,EAAC,eAAe,CAAC,CAAC,CAAC,mBAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjG,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,qBAAa,CACrB,yFAAyF,CAC1F,CAAC;KACH;IAED,6FAA6F;IAC7F,gCAAgC;IAChC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,OAAO,CAAC;KAChB;IACD,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;AACjD,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,MAAM,CAAC,EAC3B,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,aAAa,EAAE,OAAO,EACtB,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EACnB,KAAK,GAAG,KAAK,EACb,IAAI,GAAG,KAAK,EACZ,MAAM,GAAG,iCAAqB,EAC9B,MAAM,GAAG,iCAAqB,EAC9B,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,GAAG,IAAI,EACb,IAAI,GAAG,8BAAkB,EACzB,IAAI,GAAG,8BAAkB,EACzB,SAAS,EACT,QAAQ,MACM,EAAE;IAChB,MAAM,IAAI,GAAG,IAAA,gBAAS,EAAC,QAAQ,CAAC,CAAC;IAEjC,MAAM,UAAU,GAAG,MAAM,IAAA,eAAU,GAAE,CAAC;IAEtC,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,qBAAa,CACrB,kBAAkB,uBAAW,KAAK,uBAAW,+CAA+C,CAC7F,CAAC;KACH;IAED,aAAa,GAAG,aAAa,IAAI,CAAC,MAAM,IAAA,kBAAa,EAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,qBAAa,CACrB,kBAAkB,2BAAe,SAAS,GAAG,UAAU,oBAAQ,qBAAqB,CACrF,CAAC;KACH;IACD,OAAO,GAAG,OAAO,IAAI,CAAC,MAAM,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC;IAErE,wCAAwC;IACxC,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,QAAQ,GAAG;QACf,aAAa,EAAE,aAAa;QAC5B,IAAI;QACJ,MAAM;QACN,MAAM;QACN,MAAM;QACN,OAAO;QACP,MAAM;QACN,IAAI;QACJ,IAAI;KACL,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,aAAQ,GAAE,CAAC;IAClC,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,qBAAa,CACrB,kBAAkB,qBAAS,4BAA4B,oBAAQ,QAAQ,CACxE,CAAC;KACH;IACD,IAAI,KAAK,EAAE;QACT,MAAM,QAAQ,GAAG;YACf,GAAG,IAAA,aAAM,EAAC,gBAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7E,OAAO;SACR,CAAC;QACF,IAAI,KAAK,EAAE;YACT,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB;QACD,IAAI,EAAE,CAAC,CAAC,UAAU;QAClB,0CAA0C;QAC1C,MAAM,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;KAC9C;SAAM;QACL,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG;YACf,GAAG,IAAA,aAAM,EACP,gBAAC,CAAC,MAAM,CACN,QAAQ,EACR,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CACpF,CACF;YACD,OAAO;SACR,CAAC;QACF,IAAI,KAAK,EAAE;YACT,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB;QACD,MAAM,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAE7C,GAAG,CAAC,OAAO,CAAC,2CAA2C,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;KAC1E;AACH,CAAC;AAtFD,wBAsFC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nav.d.ts","sourceRoot":"","sources":["../../../lib/builder/nav.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAuBH,OAAO,EAAY,YAAY,EAAC,MAAM,UAAU,CAAC;AA4BjD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,aAAa,EAAE,CAgC3D;
|
|
1
|
+
{"version":3,"file":"nav.d.ts","sourceRoot":"","sources":["../../../lib/builder/nav.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAuBH,OAAO,EAAY,YAAY,EAAC,MAAM,UAAU,CAAC;AA4BjD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,aAAa,EAAE,CAgC3D;AAmJD;;;;;;;;GAQG;AACH,wBAAsB,SAAS,CAAC,EAC9B,GAAmB,EACnB,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,GAAW,GACZ,GAAE,aAAkB,iBAwFpB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;GAGG;AACH,UAAU,aAAa;IACrB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
|
package/build/lib/builder/nav.js
CHANGED
|
@@ -79,8 +79,10 @@ function parseNav(nav) {
|
|
|
79
79
|
}
|
|
80
80
|
exports.parseNav = parseNav;
|
|
81
81
|
/**
|
|
82
|
-
* Finds all items within the list of parsed nav data which correpsond to the header.
|
|
83
|
-
*
|
|
82
|
+
* Finds all items within the list of parsed nav data which correpsond to the header.
|
|
83
|
+
*
|
|
84
|
+
* This is imperfect, as it's possible for the header string to appear in multiple places in the
|
|
85
|
+
* nav, but let's just ignore that until we can't.
|
|
84
86
|
* @param navData Some parsed nav data
|
|
85
87
|
* @param header Header name
|
|
86
88
|
*/
|
|
@@ -88,6 +90,8 @@ function filterHeaderItems(navData, header) {
|
|
|
88
90
|
return lodash_1.default.filter(navData, (item) => lodash_1.default.toPath(item.keypath).includes(header));
|
|
89
91
|
}
|
|
90
92
|
/**
|
|
93
|
+
* Given a root header keypath (like a prefix), a numeric offset, and some parsed nav data, compute
|
|
94
|
+
* a keypath
|
|
91
95
|
*
|
|
92
96
|
* @param rootHeaderKeypath Root keypath as determined by {@linkcode getRootHeaderKeypath}
|
|
93
97
|
* @param offset Numeric offset within the array of items for the header
|
|
@@ -110,11 +114,15 @@ function getKeypathForHeaderItem(rootHeaderKeypath, offset, data) {
|
|
|
110
114
|
* the same header
|
|
111
115
|
*/
|
|
112
116
|
function navDataDidChange(newNavData, navData) {
|
|
113
|
-
|
|
117
|
+
// the result should be the items from newNavData which either don't appear in
|
|
118
|
+
// navdata, or the items which do appear in navData but have a different fileOrUrl
|
|
119
|
+
const matchedKeypaths = lodash_1.default.intersectionBy(newNavData, navData, 'keypath');
|
|
120
|
+
const diff = lodash_1.default.xorBy(newNavData, matchedKeypaths, 'fileOrUrl');
|
|
114
121
|
return !lodash_1.default.isEmpty(diff);
|
|
115
122
|
}
|
|
116
123
|
/**
|
|
117
124
|
* Find the "root" keypath for a particular header
|
|
125
|
+
*
|
|
118
126
|
* @param headerItems Some subset of the nav data having keypaths corresponding to `header`
|
|
119
127
|
* @param header Header string
|
|
120
128
|
* @returns The keypath up to the header string, inclusive
|
|
@@ -134,7 +142,6 @@ function getRootHeaderKeypath(headerItems, header) {
|
|
|
134
142
|
* by `dir`; if `all` is true, we just use the default header, because we will be returning a whole
|
|
135
143
|
* lot of headers).
|
|
136
144
|
*
|
|
137
|
-
*
|
|
138
145
|
* @param dir Abs path to directory containing markdown files generated by TypeDoc
|
|
139
146
|
* @param mkDocsDocsDir Configured `docs_dir` or via options
|
|
140
147
|
* @param navData Nav data parsed by {@linkcode parseNav}
|
|
@@ -160,7 +167,6 @@ async function getNavItemsForDir(dir, mkDocsDocsDir, navData, nav, all = false)
|
|
|
160
167
|
const offset = navHeaderItems.findIndex((item) => item.fileOrUrl === fileOrUrl);
|
|
161
168
|
const newOffset = offset >= 0 ? offset : navHeaderItems.length;
|
|
162
169
|
const data = navHeaderItems[offset];
|
|
163
|
-
log.warn(rootHeaderKeypath, newOffset, data);
|
|
164
170
|
const keypath = getKeypathForHeaderItem(rootHeaderKeypath, newOffset, data);
|
|
165
171
|
newNavHeaderItems.push({ keypath, fileOrUrl });
|
|
166
172
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nav.js","sourceRoot":"","sources":["../../../lib/builder/nav.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,6CAAmC;AACnC,oDAAuB;AACvB,0DAA6B;AAC7B,4CAMsB;AACtB,oCAAuC;AACvC,8BAQe;AACf,sCAAoC;AAEpC,kCAAiC;AAEjC,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,aAAa,CAAC,CAAC;AAErC;;;;;GAKG;AACH,KAAK,UAAU,yBAAyB,CACtC,SAAiB,EACjB,aAAqB;IAErB,IAAI,CAAC,mBAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC/B,MAAM,IAAI,qBAAa,CAAC,gCAAgC,SAAS,GAAG,CAAC,CAAC;KACvE;IACD,IAAI,CAAC,mBAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACnC,MAAM,IAAI,qBAAa,CAAC,gCAAgC,aAAa,GAAG,CAAC,CAAC;KAC3E;IACD,MAAM,MAAM,GAAG,mBAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,MAAM,YAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC,CAAC,CAAC;IACnE,OAAO,OAAO;SACX,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACzD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,QAAQ,CAAC,GAAiB;IACxC,IAAI,SAAS,GAAoB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAKpC,MAAM,KAAK,GAAgB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAC,CAAC,CAAC;IAEpD,OAAO,KAAK,CAAC,MAAM,EAAE;QACnB,oEAAoE;QACpE,MAAM,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;QAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,OAAO,EAAE;YACjC,IAAI,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACpB,MAAM,OAAO,GAAkB;oBAC7B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG;oBAC5C,SAAS,EAAE,IAAI;iBAChB,CAAC;gBAEF,yDAAyD;gBACzD,4CAA4C;gBAC5C,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;oBAC7B,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC;iBACpB;gBACD,SAAS,GAAG,CAAC,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;aACrC;iBAAM,IAAI,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACxC,KAAK,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAC,CAAC,CAAC;aACjF;SACF;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAhCD,4BAgCC;AAED
|
|
1
|
+
{"version":3,"file":"nav.js","sourceRoot":"","sources":["../../../lib/builder/nav.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,7 +113,7 @@ declare const _default: CommandModule<object, InferredOptionTypes<{
|
|
|
113
113
|
readonly remote: {
|
|
114
114
|
readonly alias: "r";
|
|
115
115
|
readonly describe: "Remote to push to";
|
|
116
|
-
readonly implies:
|
|
116
|
+
readonly implies: "push";
|
|
117
117
|
readonly group: BuildCommandGroup.Deploy;
|
|
118
118
|
readonly type: "string";
|
|
119
119
|
readonly requiresArg: true;
|
|
@@ -122,7 +122,7 @@ declare const _default: CommandModule<object, InferredOptionTypes<{
|
|
|
122
122
|
};
|
|
123
123
|
readonly prefix: {
|
|
124
124
|
readonly describe: "Subdirectory within <branch> to commit to";
|
|
125
|
-
readonly implies:
|
|
125
|
+
readonly implies: "branch";
|
|
126
126
|
readonly group: BuildCommandGroup.Deploy;
|
|
127
127
|
readonly type: "string";
|
|
128
128
|
readonly nargs: 1;
|
|
@@ -157,9 +157,10 @@ declare const _default: CommandModule<object, InferredOptionTypes<{
|
|
|
157
157
|
};
|
|
158
158
|
readonly rebase: {
|
|
159
159
|
readonly describe: "Rebase <branch> with remote before deploy";
|
|
160
|
-
readonly implies:
|
|
160
|
+
readonly implies: "deploy";
|
|
161
161
|
readonly group: BuildCommandGroup.Deploy;
|
|
162
162
|
readonly type: "boolean";
|
|
163
|
+
readonly defaultDescription: "true";
|
|
163
164
|
};
|
|
164
165
|
readonly serve: {
|
|
165
166
|
readonly describe: "Start development server";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../lib/cli/command/build.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAC,aAAa,EAAE,mBAAmB,EAAU,MAAM,OAAO,CAAC;AASvE,aAAK,iBAAiB;IACpB,KAAK,kBAAkB;IACvB,MAAM,uBAAuB;IAC7B,KAAK,uBAAuB;IAC5B,UAAU,kBAAkB;CAC7B
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../lib/cli/command/build.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAC,aAAa,EAAE,mBAAmB,EAAU,MAAM,OAAO,CAAC;AASvE,aAAK,iBAAiB;IACpB,KAAK,kBAAkB;IACvB,MAAM,uBAAuB;IAC7B,KAAK,uBAAuB;IAC5B,UAAU,kBAAkB;CAC7B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwLD,wBAyCyC"}
|
|
@@ -125,7 +125,7 @@ const opts = {
|
|
|
125
125
|
remote: {
|
|
126
126
|
alias: 'r',
|
|
127
127
|
describe: 'Remote to push to',
|
|
128
|
-
implies:
|
|
128
|
+
implies: 'push',
|
|
129
129
|
group: BuildCommandGroup.Deploy,
|
|
130
130
|
type: 'string',
|
|
131
131
|
requiresArg: true,
|
|
@@ -134,7 +134,7 @@ const opts = {
|
|
|
134
134
|
},
|
|
135
135
|
prefix: {
|
|
136
136
|
describe: 'Subdirectory within <branch> to commit to',
|
|
137
|
-
implies:
|
|
137
|
+
implies: 'branch',
|
|
138
138
|
group: BuildCommandGroup.Deploy,
|
|
139
139
|
type: 'string',
|
|
140
140
|
nargs: 1,
|
|
@@ -169,9 +169,10 @@ const opts = {
|
|
|
169
169
|
},
|
|
170
170
|
rebase: {
|
|
171
171
|
describe: 'Rebase <branch> with remote before deploy',
|
|
172
|
-
implies:
|
|
172
|
+
implies: 'deploy',
|
|
173
173
|
group: BuildCommandGroup.Deploy,
|
|
174
174
|
type: 'boolean',
|
|
175
|
+
defaultDescription: 'true',
|
|
175
176
|
},
|
|
176
177
|
serve: {
|
|
177
178
|
describe: 'Start development server',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../lib/cli/command/build.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../lib/cli/command/build.ts"],"names":[],"mappings":"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"}
|
package/build/lib/fs.d.ts
CHANGED
|
@@ -108,6 +108,10 @@ export declare function safeWriteFile(filepath: string, content: JsonValue, over
|
|
|
108
108
|
* Finds `npm` executable
|
|
109
109
|
*/
|
|
110
110
|
export declare const whichNpm: () => Promise<string>;
|
|
111
|
+
/**
|
|
112
|
+
* `mike` cannot be invoked via `python -m`, so we need to find the script.
|
|
113
|
+
*/
|
|
114
|
+
export declare const findMike: () => Promise<string | undefined>;
|
|
111
115
|
/**
|
|
112
116
|
* Finds the `typedoc` executable.
|
|
113
117
|
*
|
package/build/lib/fs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../lib/fs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,CAAC,MAAM,QAAQ,CAAC;AAGvB,OAAgB,EAAC,qBAAqB,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AACrE,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../lib/fs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,CAAC,MAAM,QAAQ,CAAC;AAGvB,OAAgB,EAAC,qBAAqB,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AACrE,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AAcpC,OAAO,EAAC,SAAS,EAAC,MAAM,SAAS,CAAC;AAKlC;;;;GAIG;AACH,eAAO,MAAM,UAAU;;;sBAAqB,CAAC;AAE7C;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAIjD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAEjD,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAIjD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,cAA8B,MAAM,uCAKxD,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,GAAG,SAAgB,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM7B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,mEAI9B,CAAC;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,kFAAsD,CAAC;AAEjF;;;;;GAKG;AACH,iBAAe,YAAY,CACzB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,IAAI,GACd,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAC,CAAC,CAAC;AAC1D,iBAAe,YAAY,CACzB,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,KAAK,GAChB,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,WAAW,CAAA;CAAC,CAAC,CAAC;AAsBhD;;GAEG;AACH,eAAO,MAAM,eAAe,0CAA0B,CAAC;AAEvD;;;;;GAKG;AACH,eAAO,MAAM,eAAe,qBAA+B,MAAM,8EAO/D,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,SAAS,mCACkB,MAAM,qCAE7C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,mCACmB,MAAM,qCAE7C,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,UAAQ,iBAMpF;AAOD;;GAEG;AACH,eAAO,MAAM,QAAQ,uBAAoD,CAAC;AAiB1E;;GAEG;AACH,eAAO,MAAM,QAAQ,mCAuBnB,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,WAAW,kBAA0C,QAAQ,MAAM,GAAG,SAAS,CAAC,sBAM3F,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,UAAU,SACX,QAAQ,MAAM,GAAG,SAAS,CAAC,sBACtC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,cACP,MAAM,gBAAwB,QAAQ,SAAS,CAAC,sBAyBlE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,aAA6B,MAAM,KAAG,QAAQ,MAAM,EAAE,CAAC,sBAM5E,CAAC"}
|
package/build/lib/fs.js
CHANGED
|
@@ -30,7 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
30
30
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
31
31
|
};
|
|
32
32
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
|
-
exports.findDirsIn = exports.readMkDocsYml = exports.findPython = exports.findTypeDoc = exports.whichNpm = exports.safeWriteFile = exports.readJson = exports.readJson5 = exports.readTypedocJson = exports.readPackageJson = exports.findMkDocsYml = exports.findTypeDocJsonPath = exports.findInPkgDir = exports.readYaml = exports.stringifyJson = exports.stringifyJson5 = exports.stringifyYaml = exports.findPkgDir = void 0;
|
|
33
|
+
exports.findDirsIn = exports.readMkDocsYml = exports.findPython = exports.findTypeDoc = exports.findMike = exports.whichNpm = exports.safeWriteFile = exports.readJson = exports.readJson5 = exports.readTypedocJson = exports.readPackageJson = exports.findMkDocsYml = exports.findTypeDocJsonPath = exports.findInPkgDir = exports.readYaml = exports.stringifyJson = exports.stringifyJson5 = exports.stringifyYaml = exports.findPkgDir = void 0;
|
|
34
34
|
const support_1 = require("@appium/support");
|
|
35
35
|
const find_up_1 = __importDefault(require("find-up"));
|
|
36
36
|
const JSON5 = __importStar(require("json5"));
|
|
@@ -43,6 +43,7 @@ const yaml_1 = __importDefault(require("yaml"));
|
|
|
43
43
|
const constants_1 = require("./constants");
|
|
44
44
|
const error_1 = require("./error");
|
|
45
45
|
const logger_1 = require("./logger");
|
|
46
|
+
const teen_process_1 = require("teen_process");
|
|
46
47
|
const log = (0, logger_1.getLogger)('fs');
|
|
47
48
|
/**
|
|
48
49
|
* Finds path to closest `package.json`
|
|
@@ -191,6 +192,33 @@ const whichPython3 = lodash_1.default.partial(cachedWhich, `${constants_1.NAME_P
|
|
|
191
192
|
* Finds `typedoc` executable
|
|
192
193
|
*/
|
|
193
194
|
const whichTypeDoc = lodash_1.default.partial(cachedWhich, constants_1.NAME_TYPEDOC, { nothrow: true });
|
|
195
|
+
/**
|
|
196
|
+
* `mike` cannot be invoked via `python -m`, so we need to find the script.
|
|
197
|
+
*/
|
|
198
|
+
exports.findMike = lodash_1.default.partial(async () => {
|
|
199
|
+
// see if it's in PATH
|
|
200
|
+
let mikePath = await cachedWhich(constants_1.NAME_MIKE, { nothrow: true });
|
|
201
|
+
if (mikePath) {
|
|
202
|
+
return mikePath;
|
|
203
|
+
}
|
|
204
|
+
// if it isn't, it may be in a user dir
|
|
205
|
+
const pythonPath = await (0, exports.findPython)();
|
|
206
|
+
if (!pythonPath) {
|
|
207
|
+
return;
|
|
208
|
+
}
|
|
209
|
+
try {
|
|
210
|
+
// the user dir can be found this way.
|
|
211
|
+
// usually it's something like ~/.local
|
|
212
|
+
const { stdout } = await (0, teen_process_1.exec)(pythonPath, ['-m', 'site', '--user-base']);
|
|
213
|
+
if (stdout) {
|
|
214
|
+
mikePath = node_path_1.default.join(stdout.trim(), 'bin', 'mike');
|
|
215
|
+
if (await support_1.fs.isExecutable(mikePath)) {
|
|
216
|
+
return mikePath;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
catch { }
|
|
221
|
+
});
|
|
194
222
|
/**
|
|
195
223
|
* Finds the `typedoc` executable.
|
|
196
224
|
*
|
package/build/lib/fs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../lib/fs.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6CAAmC;AACnC,sDAA6B;AAC7B,6CAA+B;AAC/B,oDAAuB;AACvB,0DAA6B;AAC7B,sDAA8B;AAC9B,wDAAqE;AAErE,qCAAmD;AACnD,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../lib/fs.ts"],"names":[],"mappings":"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"}
|
package/lib/builder/deploy.ts
CHANGED
|
@@ -18,7 +18,7 @@ import {
|
|
|
18
18
|
NAME_PYTHON,
|
|
19
19
|
} from '../constants';
|
|
20
20
|
import {DocutilsError} from '../error';
|
|
21
|
-
import {findMkDocsYml, findPython, readPackageJson} from '../fs';
|
|
21
|
+
import {findMike, findMkDocsYml, findPython, readPackageJson} from '../fs';
|
|
22
22
|
import {getLogger} from '../logger';
|
|
23
23
|
import {argify, spawnBackgroundProcess, SpawnBackgroundProcessOpts, stopwatch} from '../util';
|
|
24
24
|
|
|
@@ -26,33 +26,29 @@ const log = getLogger('builder:deploy');
|
|
|
26
26
|
|
|
27
27
|
/**
|
|
28
28
|
* Runs `mike serve`
|
|
29
|
-
* @param
|
|
29
|
+
* @param mikePath Path to `mike` executable
|
|
30
30
|
* @param args Extra args to `mike build`
|
|
31
31
|
* @param opts Extra options for `teen_process.Subprocess.start`
|
|
32
32
|
*/
|
|
33
33
|
async function doServe(
|
|
34
|
-
|
|
34
|
+
mikePath: string,
|
|
35
35
|
args: string[] = [],
|
|
36
36
|
opts: SpawnBackgroundProcessOpts = {}
|
|
37
37
|
) {
|
|
38
|
-
const finalArgs = ['
|
|
39
|
-
return spawnBackgroundProcess(
|
|
38
|
+
const finalArgs = ['serve', ...args];
|
|
39
|
+
return spawnBackgroundProcess(mikePath, finalArgs, opts);
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
/**
|
|
43
43
|
* Runs `mike build`
|
|
44
|
-
* @param
|
|
44
|
+
* @param mikePath Path to `mike` executable
|
|
45
45
|
* @param args Extra args to `mike build`
|
|
46
46
|
* @param opts Extra options to `teen_process.exec`
|
|
47
47
|
*/
|
|
48
|
-
async function doDeploy(
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
) {
|
|
53
|
-
const finalArgs = ['-m', NAME_MIKE, 'deploy', ...args];
|
|
54
|
-
log.debug('Executing %s via: %s %O', NAME_MIKE, pythonPath, finalArgs);
|
|
55
|
-
return await exec(pythonPath, finalArgs, opts);
|
|
48
|
+
async function doDeploy(mikePath: string, args: string[] = [], opts: TeenProcessExecOptions = {}) {
|
|
49
|
+
const finalArgs = ['deploy', ...args];
|
|
50
|
+
log.debug('Executing %s via: %s %O', NAME_MIKE, mikePath, finalArgs);
|
|
51
|
+
return await exec(mikePath, finalArgs, opts);
|
|
56
52
|
}
|
|
57
53
|
|
|
58
54
|
/**
|
|
@@ -68,7 +64,14 @@ async function findDeployVersion(packageJsonPath?: string, cwd = process.cwd()):
|
|
|
68
64
|
'No "version" field found in package.json; please add one or specify a version to deploy'
|
|
69
65
|
);
|
|
70
66
|
}
|
|
71
|
-
|
|
67
|
+
|
|
68
|
+
// return MAJOR.MINOR as the version by default, if that is a thing we can extract, otherwise
|
|
69
|
+
// just return the version as is
|
|
70
|
+
const versionParts = version.split('.');
|
|
71
|
+
if (versionParts.length === 1) {
|
|
72
|
+
return version;
|
|
73
|
+
}
|
|
74
|
+
return `${versionParts[0]}.${versionParts[1]}`;
|
|
72
75
|
}
|
|
73
76
|
|
|
74
77
|
/**
|
|
@@ -125,6 +128,13 @@ export async function deploy({
|
|
|
125
128
|
port,
|
|
126
129
|
host,
|
|
127
130
|
};
|
|
131
|
+
|
|
132
|
+
const mikePath = await findMike();
|
|
133
|
+
if (!mikePath) {
|
|
134
|
+
throw new DocutilsError(
|
|
135
|
+
`Could not find ${NAME_MIKE} executable; please run "${NAME_BIN} init"`
|
|
136
|
+
);
|
|
137
|
+
}
|
|
128
138
|
if (serve) {
|
|
129
139
|
const mikeArgs = [
|
|
130
140
|
...argify(_.pickBy(mikeOpts, (value) => _.isNumber(value) || Boolean(value))),
|
|
@@ -135,7 +145,7 @@ export async function deploy({
|
|
|
135
145
|
}
|
|
136
146
|
stop(); // discard
|
|
137
147
|
// unsure about how SIGHUP is handled here
|
|
138
|
-
await doServe(
|
|
148
|
+
await doServe(mikePath, mikeArgs, serveOpts);
|
|
139
149
|
} else {
|
|
140
150
|
log.info('Deploying into branch %s', branch);
|
|
141
151
|
const mikeArgs = [
|
|
@@ -150,7 +160,7 @@ export async function deploy({
|
|
|
150
160
|
if (alias) {
|
|
151
161
|
mikeArgs.push(alias);
|
|
152
162
|
}
|
|
153
|
-
await doDeploy(
|
|
163
|
+
await doDeploy(mikePath, mikeArgs, execOpts);
|
|
154
164
|
|
|
155
165
|
log.success('Finished deployment into branch %s (%dms)', branch, stop());
|
|
156
166
|
}
|
package/lib/builder/nav.ts
CHANGED
|
@@ -100,8 +100,10 @@ export function parseNav(nav: MkDocsYmlNav): ParsedNavData[] {
|
|
|
100
100
|
}
|
|
101
101
|
|
|
102
102
|
/**
|
|
103
|
-
* Finds all items within the list of parsed nav data which correpsond to the header.
|
|
104
|
-
*
|
|
103
|
+
* Finds all items within the list of parsed nav data which correpsond to the header.
|
|
104
|
+
*
|
|
105
|
+
* This is imperfect, as it's possible for the header string to appear in multiple places in the
|
|
106
|
+
* nav, but let's just ignore that until we can't.
|
|
105
107
|
* @param navData Some parsed nav data
|
|
106
108
|
* @param header Header name
|
|
107
109
|
*/
|
|
@@ -110,6 +112,8 @@ function filterHeaderItems(navData: ParsedNavData[], header: string) {
|
|
|
110
112
|
}
|
|
111
113
|
|
|
112
114
|
/**
|
|
115
|
+
* Given a root header keypath (like a prefix), a numeric offset, and some parsed nav data, compute
|
|
116
|
+
* a keypath
|
|
113
117
|
*
|
|
114
118
|
* @param rootHeaderKeypath Root keypath as determined by {@linkcode getRootHeaderKeypath}
|
|
115
119
|
* @param offset Numeric offset within the array of items for the header
|
|
@@ -136,16 +140,16 @@ function navDataDidChange(
|
|
|
136
140
|
newNavData: Array<Omit<ParsedNavData, 'name'>>,
|
|
137
141
|
navData: ParsedNavData[]
|
|
138
142
|
): boolean {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
);
|
|
143
|
+
// the result should be the items from newNavData which either don't appear in
|
|
144
|
+
// navdata, or the items which do appear in navData but have a different fileOrUrl
|
|
145
|
+
const matchedKeypaths = _.intersectionBy(newNavData, navData, 'keypath');
|
|
146
|
+
const diff = _.xorBy(newNavData, matchedKeypaths, 'fileOrUrl');
|
|
144
147
|
return !_.isEmpty(diff);
|
|
145
148
|
}
|
|
146
149
|
|
|
147
150
|
/**
|
|
148
151
|
* Find the "root" keypath for a particular header
|
|
152
|
+
*
|
|
149
153
|
* @param headerItems Some subset of the nav data having keypaths corresponding to `header`
|
|
150
154
|
* @param header Header string
|
|
151
155
|
* @returns The keypath up to the header string, inclusive
|
|
@@ -167,7 +171,6 @@ function getRootHeaderKeypath(headerItems: ParsedNavData[], header: string) {
|
|
|
167
171
|
* by `dir`; if `all` is true, we just use the default header, because we will be returning a whole
|
|
168
172
|
* lot of headers).
|
|
169
173
|
*
|
|
170
|
-
*
|
|
171
174
|
* @param dir Abs path to directory containing markdown files generated by TypeDoc
|
|
172
175
|
* @param mkDocsDocsDir Configured `docs_dir` or via options
|
|
173
176
|
* @param navData Nav data parsed by {@linkcode parseNav}
|
|
@@ -202,7 +205,6 @@ async function getNavItemsForDir(
|
|
|
202
205
|
const offset = navHeaderItems.findIndex((item) => item.fileOrUrl === fileOrUrl);
|
|
203
206
|
const newOffset = offset >= 0 ? offset : navHeaderItems.length;
|
|
204
207
|
const data = navHeaderItems[offset];
|
|
205
|
-
log.warn(rootHeaderKeypath, newOffset, data);
|
|
206
208
|
const keypath = getKeypathForHeaderItem(rootHeaderKeypath, newOffset, data);
|
|
207
209
|
newNavHeaderItems.push({keypath, fileOrUrl});
|
|
208
210
|
}
|
package/lib/cli/command/build.ts
CHANGED
|
@@ -124,7 +124,7 @@ const opts = {
|
|
|
124
124
|
remote: {
|
|
125
125
|
alias: 'r',
|
|
126
126
|
describe: 'Remote to push to',
|
|
127
|
-
implies:
|
|
127
|
+
implies: 'push',
|
|
128
128
|
group: BuildCommandGroup.Deploy,
|
|
129
129
|
type: 'string',
|
|
130
130
|
requiresArg: true,
|
|
@@ -133,7 +133,7 @@ const opts = {
|
|
|
133
133
|
},
|
|
134
134
|
prefix: {
|
|
135
135
|
describe: 'Subdirectory within <branch> to commit to',
|
|
136
|
-
implies:
|
|
136
|
+
implies: 'branch',
|
|
137
137
|
group: BuildCommandGroup.Deploy,
|
|
138
138
|
type: 'string',
|
|
139
139
|
nargs: 1,
|
|
@@ -168,9 +168,10 @@ const opts = {
|
|
|
168
168
|
},
|
|
169
169
|
rebase: {
|
|
170
170
|
describe: 'Rebase <branch> with remote before deploy',
|
|
171
|
-
implies:
|
|
171
|
+
implies: 'deploy',
|
|
172
172
|
group: BuildCommandGroup.Deploy,
|
|
173
173
|
type: 'boolean',
|
|
174
|
+
defaultDescription: 'true',
|
|
174
175
|
},
|
|
175
176
|
serve: {
|
|
176
177
|
describe: 'Start development server',
|
package/lib/fs.ts
CHANGED
|
@@ -14,6 +14,7 @@ import {JsonValue} from 'type-fest';
|
|
|
14
14
|
import {Application, TypeDocReader} from 'typedoc';
|
|
15
15
|
import YAML from 'yaml';
|
|
16
16
|
import {
|
|
17
|
+
NAME_MIKE,
|
|
17
18
|
NAME_MKDOCS_YML,
|
|
18
19
|
NAME_NPM,
|
|
19
20
|
NAME_PACKAGE_JSON,
|
|
@@ -24,6 +25,7 @@ import {
|
|
|
24
25
|
import {DocutilsError} from './error';
|
|
25
26
|
import {getLogger} from './logger';
|
|
26
27
|
import {MkDocsYml} from './model';
|
|
28
|
+
import { exec } from 'teen_process';
|
|
27
29
|
|
|
28
30
|
const log = getLogger('fs');
|
|
29
31
|
|
|
@@ -228,6 +230,34 @@ const whichPython3 = _.partial(cachedWhich, `${NAME_PYTHON}3`, {nothrow: true});
|
|
|
228
230
|
*/
|
|
229
231
|
const whichTypeDoc = _.partial(cachedWhich, NAME_TYPEDOC, {nothrow: true});
|
|
230
232
|
|
|
233
|
+
/**
|
|
234
|
+
* `mike` cannot be invoked via `python -m`, so we need to find the script.
|
|
235
|
+
*/
|
|
236
|
+
export const findMike = _.partial(async () => {
|
|
237
|
+
// see if it's in PATH
|
|
238
|
+
let mikePath = await cachedWhich(NAME_MIKE, {nothrow: true});
|
|
239
|
+
if (mikePath) {
|
|
240
|
+
return mikePath;
|
|
241
|
+
}
|
|
242
|
+
// if it isn't, it may be in a user dir
|
|
243
|
+
const pythonPath = await findPython();
|
|
244
|
+
if (!pythonPath) {
|
|
245
|
+
return;
|
|
246
|
+
}
|
|
247
|
+
try {
|
|
248
|
+
// the user dir can be found this way.
|
|
249
|
+
// usually it's something like ~/.local
|
|
250
|
+
const {stdout} = await exec(pythonPath, ['-m', 'site', '--user-base']);
|
|
251
|
+
if (stdout) {
|
|
252
|
+
mikePath = path.join(stdout.trim(), 'bin', 'mike');
|
|
253
|
+
if (await fs.isExecutable(mikePath)) {
|
|
254
|
+
return mikePath;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
catch {}
|
|
259
|
+
});
|
|
260
|
+
|
|
231
261
|
/**
|
|
232
262
|
* Finds the `typedoc` executable.
|
|
233
263
|
*
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appium/docutils",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.2",
|
|
4
4
|
"description": "Documentation generation utilities for Appium and related projects",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"start": "node ./build/lib/cli/index.js"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@appium/support": "^4.0
|
|
52
|
+
"@appium/support": "^4.1.0",
|
|
53
53
|
"@appium/tsconfig": "^0.3.0",
|
|
54
54
|
"@appium/typedoc-plugin-appium": "^0.6.5",
|
|
55
55
|
"@sliphua/lilconfig-ts-loader": "3.2.2",
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
"publishConfig": {
|
|
85
85
|
"access": "public"
|
|
86
86
|
},
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "ed20e007548e10f89a5212b2868ed7ec47f51c2a"
|
|
88
88
|
}
|