Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Commit 307edb6

Browse files
author
Eyal
authored
Merge branch 'master' into scheyal-patch-3
2 parents 598c15a + 3443954 commit 307edb6

File tree

450 files changed

+424
-92
lines changed

Some content is hidden

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

450 files changed

+424
-92
lines changed

Internal-Hackathon-Oct-18-2019.md

Lines changed: 99 additions & 0 deletions

README.md

Lines changed: 12 additions & 5 deletions

packages/chatdown/README.md

Lines changed: 8 additions & 4 deletions

packages/chatdown/src/commands/chatdown.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ export default class Chatdown extends Command {
5858
if (typeof writeConfirmation === 'string') {
5959
process.stdout.write(`${chalk.green('Successfully wrote file:')} ${writeConfirmation}\n`)
6060
}
61+
} else if (flags.in && !fileContents) {
62+
throw new CLIError('No file contents found in: ' + flags.in)
6163
} else {
6264
return this._help()
6365
}

packages/cli/README.md

Lines changed: 8 additions & 8 deletions

packages/cli/scripts/postinstall.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const getUserConfig = async () => {
3838
const userConfig = await getUserConfig()
3939
userConfig.lastVersionCheck = new Date()
4040
if (userConfig.telemetry === null) {
41-
const disableTelemetry = await cli.prompt(chalk.red('Telemetry is disabled. Would you like to opt in? Only command and flags usage will be sent. (Y/N)'))
41+
const disableTelemetry = await cli.prompt(chalk.red('Help us improve products by allowing Microsoft to collect anonymous command and flags usage: (Y/N)'))
4242
if (disableTelemetry === 'Y' || disableTelemetry === 'y') {
4343
userConfig.telemetry = true
4444
console.log(chalk.blue('Telemetry has been enabled.'))

packages/cli/src/hooks/init/inithook.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const hook: Hook<'init'> = async function (opts) {
6666
// Ensure telemetry is set
6767
try {
6868
if (userConfig.telemetry === null) {
69-
const disableTelemetry = await cli.prompt(chalk.red('Telemetry is disabled. Would you like to opt in?. Only command and flags usage will be sent. (Y/N)'))
69+
const disableTelemetry = await cli.prompt(chalk.red('Help us improve products by allowing Microsoft to collect anonymous command and flags usage: (Y/N)'))
7070
if (disableTelemetry === 'Y' || disableTelemetry === 'y') {
7171
userConfig.telemetry = true
7272
this.log(chalk.blue('Telemetry has been enabled.'))

packages/command/src/readpipeddata.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const ReadPipedStdin = {
1616
}, 1000)
1717

1818
stdin.on('data', chunk => {
19+
clearTimeout(timer)
1920
input += chunk
2021
})
2122

packages/command/test/command.test.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,20 +95,6 @@ describe('command', () => {
9595
.do(output => expect(output.stderr).to.equal(''))
9696
.it('Command should return empty string if no stdin')
9797

98-
fancy
99-
.stdin('test reading of piped data')
100-
.stdout()
101-
.do(async () => {
102-
try {
103-
const resp: any = await ReadPipedStdin.read()
104-
if (resp) console.log(resp)
105-
} catch (error) {
106-
if (error) console.log(`Error: ${error}`)
107-
}
108-
})
109-
.do(output => expect(output.stdout).to.equal('test reading of piped data\n'))
110-
.it('should read and echo the stdin input')
111-
11298
fancy
11399
.stdin('')
114100
.stdout()

0 commit comments

Comments
 (0)