Merge main to feature/debugconfig #1158

.gitignore

@@ -10,6 +10,7 @@ telemetryCache
 quickStart.html
 .gitcommit
 media/libs/
+package.json.bk
 
 # Auto generated definitions
 src/**/*.gen.ts

CONTRIBUTING.md

@@ -32,8 +32,22 @@ When you launch the extension or run tests from Visual Studio Code, it will auto
 
 If you prefer, you can build from the command line:
 
--   To build one time: `npm run compile`
--   To build and watch for file changes: `npm run watch`
+-   To build one time:
+    ```
+    npm run compile
+    ```
+-   To build and watch for file changes:
+    ```
+    npm run watch
+    ```
+-   To build a release artifact:
+    ```
+    npm run package
+    ```
+-   To build an "alpha" artifact (useful for letting others test a particular build):
+    ```
+    npm run packageAlpha
+    ```
 
 #### If you run out of memory while building
 

build-scripts/packageAlpha.ts

@@ -0,0 +1,32 @@
+/*!
+ * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+//
+// Creates an artifact that can be given to users for testing alpha builds:
+//
+//     aws-toolkit-vscode-1.99.0-SNAPSHOT.vsix
+//
+// The script works like this:
+// 1. temporarily change `version` in package.json
+// 2. invoke `vsce package`
+// 3. restore the original package.json
+//
+
+import * as child_process from 'child_process'
+import * as fs from 'fs-extra'
+
+const packageJsonFile = './package.json'
+// Create a backup so that we can restore the original later.
+fs.copyFileSync(packageJsonFile, `${packageJsonFile}.bk`)
+
+const packageJson = JSON.parse(fs.readFileSync('./package.json', { encoding: 'UTF-8' }).toString())
+packageJson.version = '1.99.0-SNAPSHOT'
+
+fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, undefined, '  '))
+
+child_process.execSync(`vsce package`)
+
+// Restore the original package.json.
+fs.copyFileSync(`${packageJsonFile}.bk`, packageJsonFile)

media/js/submitFeedbackVue.js

@@ -5,9 +5,9 @@ console.log('Loaded!')
         el: '#app',
         data: {
             comment: '',
-            sentiment: 'Positive',
+            sentiment: '',
             isSubmitting: false,
-            error: ''
+            error: '',
         },
         mounted() {
             this.$nextTick(function() {
@@ -32,9 +32,9 @@ console.log('Loaded!')
                 vscode.postMessage({
                     command: 'submitFeedback',
                     comment: this.comment,
-                    sentiment: this.sentiment
+                    sentiment: this.sentiment,
                 })
-            }
-        }
+            },
+        },
     })
 })()