Skip to content

Commit e4a60e0

Browse files
authored
Merge main to feature/debugconfig #1158
2 parents 7b5aae7 + 8250dd6 commit e4a60e0

File tree

15 files changed

+402
-181
lines changed

15 files changed

+402
-181
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ telemetryCache
1010
quickStart.html
1111
.gitcommit
1212
media/libs/
13+
package.json.bk
1314

1415
# Auto generated definitions
1516
src/**/*.gen.ts

CONTRIBUTING.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,22 @@ When you launch the extension or run tests from Visual Studio Code, it will auto
3232

3333
If you prefer, you can build from the command line:
3434

35-
- To build one time: `npm run compile`
36-
- To build and watch for file changes: `npm run watch`
35+
- To build one time:
36+
```
37+
npm run compile
38+
```
39+
- To build and watch for file changes:
40+
```
41+
npm run watch
42+
```
43+
- To build a release artifact:
44+
```
45+
npm run package
46+
```
47+
- To build an "alpha" artifact (useful for letting others test a particular build):
48+
```
49+
npm run packageAlpha
50+
```
3751
3852
#### If you run out of memory while building
3953

build-scripts/packageAlpha.ts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*!
2+
* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
//
7+
// Creates an artifact that can be given to users for testing alpha builds:
8+
//
9+
// aws-toolkit-vscode-1.99.0-SNAPSHOT.vsix
10+
//
11+
// The script works like this:
12+
// 1. temporarily change `version` in package.json
13+
// 2. invoke `vsce package`
14+
// 3. restore the original package.json
15+
//
16+
17+
import * as child_process from 'child_process'
18+
import * as fs from 'fs-extra'
19+
20+
const packageJsonFile = './package.json'
21+
// Create a backup so that we can restore the original later.
22+
fs.copyFileSync(packageJsonFile, `${packageJsonFile}.bk`)
23+
24+
const packageJson = JSON.parse(fs.readFileSync('./package.json', { encoding: 'UTF-8' }).toString())
25+
packageJson.version = '1.99.0-SNAPSHOT'
26+
27+
fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, undefined, ' '))
28+
29+
child_process.execSync(`vsce package`)
30+
31+
// Restore the original package.json.
32+
fs.copyFileSync(`${packageJsonFile}.bk`, packageJsonFile)

media/js/submitFeedbackVue.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ console.log('Loaded!')
55
el: '#app',
66
data: {
77
comment: '',
8-
sentiment: 'Positive',
8+
sentiment: '',
99
isSubmitting: false,
10-
error: ''
10+
error: '',
1111
},
1212
mounted() {
1313
this.$nextTick(function() {
@@ -32,9 +32,9 @@ console.log('Loaded!')
3232
vscode.postMessage({
3333
command: 'submitFeedback',
3434
comment: this.comment,
35-
sentiment: this.sentiment
35+
sentiment: this.sentiment,
3636
})
37-
}
38-
}
37+
},
38+
},
3939
})
4040
})()

0 commit comments

Comments
 (0)