Skip to content

Commit 496cca8

Browse files
committed
Merge branch 'master' into etabakov/remove-old-commands
2 parents ff256fa + 0d8e511 commit 496cca8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+354
-66
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ test-reports.xml
3535

3636
npm-debug.log
3737
node_modules
38+
3839
docs/html
40+
docs-cli
3941

4042
!test-scripts/*.js

Gruntfile.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,29 @@ module.exports = function (grunt) {
125125
"!lib/common/test-scripts/**/*",
126126
"!lib/common/scripts/**/*",
127127
"*.tgz"]
128+
},
129+
template: {
130+
'process-markdowns': {
131+
options: {
132+
data: {
133+
"isJekyll": true,
134+
"isHtml": true,
135+
"isConsole": true,
136+
"isWindows": true,
137+
"isMacOS": true,
138+
"isLinux": true,
139+
"formatListOfNames": () => {},
140+
"constants": ""
141+
}
142+
},
143+
files: [{
144+
expand: true,
145+
cwd: "docs/man_pages/",
146+
src: "**/*.md",
147+
dest: "docs-cli/",
148+
ext: ".md"
149+
}]
150+
}
128151
}
129152
});
130153

@@ -133,6 +156,7 @@ module.exports = function (grunt) {
133156
grunt.loadNpmTasks("grunt-contrib-watch");
134157
grunt.loadNpmTasks("grunt-shell");
135158
grunt.loadNpmTasks("grunt-ts");
159+
grunt.loadNpmTasks("grunt-template");
136160

137161
grunt.registerTask("set_package_version", function (version) {
138162
var buildVersion = version !== undefined ? version : buildNumber;
@@ -183,4 +207,5 @@ module.exports = function (grunt) {
183207
grunt.registerTask("all", ["clean", "test", "lint"]);
184208
grunt.registerTask("rebuild", ["clean", "ts:devlib"]);
185209
grunt.registerTask("default", "ts:devlib");
210+
grunt.registerTask("docs-jekyll", ['template']);
186211
};

docs/build-jekyll-md.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
rm -rf docs-cli
5+
npm install --ignore-scripts
6+
7+
grunt docs-jekyll

docs/man_pages/device/device-android.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
device android
1+
<% if (isJekyll) { %>---
2+
title: tns device android
3+
position: 1
4+
---<% } %>
5+
# tns device android
26
==========
37

48
Usage | Synopsis

docs/man_pages/device/device-ios.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
device ios
1+
<% if (isJekyll) { %>---
2+
title: tns device ios
3+
position: 2
4+
---<% } %>
5+
# tns device ios
26
==========
37

48
Usage | Synopsis

docs/man_pages/device/device-list-applications.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
device list-applications
1+
<% if (isJekyll) { %>---
2+
title: tns device list-applications
3+
position: 3
4+
---<% } %>
5+
# tns device list-applications
26
==========
37

48
Usage | Synopsis

docs/man_pages/device/device-log.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
device log
1+
<% if (isJekyll) { %>---
2+
title: tns device log
3+
position: 4
4+
---<% } %>
5+
# tns device log
26
==========
37

48
Usage | Synopsis

docs/man_pages/device/device-run.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
device run
1+
<% if (isJekyll) { %>---
2+
title: tns device run
3+
position: 5
4+
---<% } %>
5+
# tns device run
26
==========
37

48
Usage | Synopsis

docs/man_pages/device/device.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
device
1+
<% if (isJekyll) { %>---
2+
title: tns device
3+
position: 6
4+
---<% } %>
5+
# tns device
26
==========
37

48
Usage | Synopsis

docs/man_pages/general/autocomplete-disable.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
autocomplete disable
1+
<% if (isJekyll) { %>---
2+
title: tns autocomplete disable
3+
position: 1
4+
---<% } %>
5+
# tns autocomplete disable
26
==========
37

48
Usage | Synopsis
@@ -23,4 +27,5 @@ Command | Description
2327
[proxy](proxy.html) | Displays proxy settings.
2428
[proxy clear](proxy-clear.html) | Clears proxy settings.
2529
[proxy set](proxy-set.html) | Sets proxy settings.
30+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
2631
<% } %>

docs/man_pages/general/autocomplete-enable.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
autocomplete enable
1+
<% if (isJekyll) { %>---
2+
title: tns autocomplete enable
3+
position: 2
4+
---<% } %>
5+
# tns autocomplete enable
26
==========
37

48
Usage | Synopsis
@@ -23,4 +27,5 @@ Command | Description
2327
[proxy](proxy.html) | Displays proxy settings.
2428
[proxy clear](proxy-clear.html) | Clears proxy settings.
2529
[proxy set](proxy-set.html) | Sets proxy settings.
30+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
2631
<% } %>

docs/man_pages/general/autocomplete-status.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
autocomplete status
1+
<% if (isJekyll) { %>---
2+
title: tns autocomplete status
3+
position: 3
4+
---<% } %>
5+
# tns autocomplete status
26
==========
37

48
Usage | Synopsis
@@ -22,4 +26,5 @@ Command | Description
2226
[proxy](proxy.html) | Displays proxy settings.
2327
[proxy clear](proxy-clear.html) | Clears proxy settings.
2428
[proxy set](proxy-set.html) | Sets proxy settings.
29+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
2530
<% } %>

docs/man_pages/general/autocomplete.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
autocomplete
1+
<% if (isJekyll) { %>---
2+
title: tns autocomplete
3+
position: 4
4+
---<% } %>
5+
# tns autocomplete
26
==========
37

48
Usage | Synopsis
@@ -32,4 +36,5 @@ Command | Description
3236
[proxy](proxy.html) | Displays proxy settings.
3337
[proxy clear](proxy-clear.html) | Clears proxy settings.
3438
[proxy set](proxy-set.html) | Sets proxy settings.
39+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
3540
<% } %>

docs/man_pages/general/doctor.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
doctor
1+
<% if (isJekyll) { %>---
2+
title: tns doctor
3+
position: 5
4+
---<% } %>
5+
# tns doctor
26
==========
37

48
Usage | Synopsis
@@ -20,4 +24,5 @@ Command | Description
2024
[proxy](proxy.html) | Displays proxy settings.
2125
[proxy clear](proxy-clear.html) | Clears proxy settings.
2226
[proxy set](proxy-set.html) | Sets proxy settings.
27+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
2328
<% } %>

docs/man_pages/general/error-reporting.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
error-reporting
1+
<% if (isJekyll) { %>---
2+
title: tns error-reporting
3+
position: 6
4+
---<% } %>
5+
# tns error-reporting
26
==========
37

48
Usage | Synopsis
@@ -29,4 +33,5 @@ Command | Description
2933
[proxy](proxy.html) | Displays proxy settings.
3034
[proxy clear](proxy-clear.html) | Clears proxy settings.
3135
[proxy set](proxy-set.html) | Sets proxy settings.
36+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
3237
<% } %>

docs/man_pages/general/extension-install.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
extension install
1+
<% if (isJekyll) { %>---
2+
title: tns extension install
3+
position: 7
4+
---<% } %>
5+
# tns extension install
26
==========
37

48
Usage | Synopsis
@@ -32,4 +36,5 @@ Command | Description
3236
[proxy](proxy.html) | Displays proxy settings.
3337
[proxy clear](proxy-clear.html) | Clears proxy settings.
3438
[proxy set](proxy-set.html) | Sets proxy settings.
39+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
3540
<% } %>

docs/man_pages/general/extension-uninstall.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
extension uninstall
1+
<% if (isJekyll) { %>---
2+
title: tns extension uninstall
3+
position: 8
4+
---<% } %>
5+
# tns extension uninstall
26
==========
37

48
Usage | Synopsis
@@ -28,4 +32,5 @@ Command | Description
2832
[proxy](proxy.html) | Displays proxy settings.
2933
[proxy clear](proxy-clear.html) | Clears proxy settings.
3034
[proxy set](proxy-set.html) | Sets proxy settings.
35+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
3136
<% } %>

docs/man_pages/general/extension.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
extension
1+
<% if (isJekyll) { %>---
2+
title: tns extension
3+
position: 9
4+
---<% } %>
5+
# tns extension
26
==========
37

48
Usage | Synopsis
@@ -22,4 +26,5 @@ Command | Description
2226
[proxy](proxy.html) | Displays proxy settings.
2327
[proxy clear](proxy-clear.html) | Clears proxy settings.
2428
[proxy set](proxy-set.html) | Sets proxy settings.
29+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
2530
<% } %>

docs/man_pages/general/help.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
help
1+
<% if (isJekyll) { %>---
2+
title: tns help
3+
position: 10
4+
---<% } %>
5+
# tns help
26
==========
37

48
Usage | Synopsis

docs/man_pages/general/info.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
info
1+
<% if (isJekyll) { %>---
2+
title: tns info
3+
position: 11
4+
---<% } %>
5+
# tns info
26
==========
37

48
Usage | Synopsis
@@ -20,4 +24,5 @@ Command | Description
2024
[proxy](proxy.html) | Displays proxy settings.
2125
[proxy clear](proxy-clear.html) | Clears proxy settings.
2226
[proxy set](proxy-set.html) | Sets proxy settings.
27+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
2328
<% } %>

docs/man_pages/general/proxy-clear.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
proxy clear
1+
<% if (isJekyll) { %>---
2+
title: tns proxy clear
3+
position: 12
4+
---<% } %>
5+
# tns proxy clear
26
==========
37

48
Usage | Synopsis

docs/man_pages/general/proxy-set.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
proxy set
1+
<% if (isJekyll) { %>---
2+
title: tns proxy set
3+
position: 13
4+
---<% } %>
5+
# tns proxy set
26
==========
37

48
Usage | Synopsis

docs/man_pages/general/proxy.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
proxy
1+
<% if (isJekyll) { %>---
2+
title: tns proxy
3+
position: 14
4+
---<% } %>
5+
# tns proxy
26
==========
37

48
Usage | Synopsis

docs/man_pages/general/update.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Update
2+
==========
3+
4+
Usage | Synopsis
5+
------|-------
6+
General | `$ tns update`
7+
8+
Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
9+
In order to get the latest development release instead, pass next as argument:
10+
`tns update next`
11+
12+
Also you can also switch to specific version by passing it to the command:
13+
`tns update 3.0.0`
14+
15+
<% if(isHtml) { %>
16+
### Related Commands
17+
18+
Command | Description
19+
----------|----------
20+
[usage-reporting](usage-reporting.html) | Configures anonymous usage reporting for the NativeScript CLI.
21+
[error-reporting](error-reporting.html) | Configures anonymous error reporting for the NativeScript CLI.
22+
[autocomplete](autocomplete.html) | Prints your current command-line completion settings. If disabled, prompts you to enable it.
23+
[help](help.html) | Lists the available commands or shows information about the selected command.
24+
[doctor](doctor.html) | Checks your system for configuration problems which might prevent the NativeScript CLI from working properly.
25+
[proxy](proxy.html) | Displays proxy settings.
26+
[proxy clear](proxy-clear.html) | Clears proxy settings.
27+
[proxy set](proxy-set.html) | Sets proxy settings.
28+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
29+
<% } %>

docs/man_pages/general/usage-reporting.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
usage-reporting
1+
<% if (isJekyll) { %>---
2+
title: tns usage-reporting
3+
position: 15
4+
---<% } %>
5+
# tns usage-reporting
26
==========
37

48
Usage | Synopsis
@@ -29,4 +33,5 @@ Command | Description
2933
[proxy](proxy.html) | Displays proxy settings.
3034
[proxy clear](proxy-clear.html) | Clears proxy settings.
3135
[proxy set](proxy-set.html) | Sets proxy settings.
36+
[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
3237
<% } %>

docs/man_pages/index.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
#NativeScript
1+
<% if (isJekyll) { %>---
2+
title: NativeScript CLI
3+
description:
4+
position: 1
5+
---<% } %>
6+
7+
# NativeScript
28

39
Usage | Synopsis
410
------|-------
@@ -16,6 +22,7 @@ Command | Description
1622
[doctor](general/doctor.html) | Checks your system for configuration problems which might prevent the NativeScript CLI from working properly.
1723
[info](general/info.html) | Displays version information about the NativeScript CLI, core modules, and runtimes.
1824
[proxy](general/proxy.html) | Displays proxy settings.
25+
[update](general/update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
1926

2027
## Project Development Commands
2128
Command | Description

0 commit comments

Comments
 (0)