Merge branch 'feature/extension-manifest'

Author: Igor Olshevsky

cli

@@ -61,7 +61,7 @@
     "onCommand:go.tools.install",
     "onDebugResolve:go"
   ],
-  "main": "./out/src/goMain",
+  "main": "./main.js",
   "contributes": {
     "languages": [
       {
@@ -1368,6 +1368,9 @@
       ]
     }
   },
+  "extension": {
+    "type": "extension.simple"
+  },
   "__metadata": {
     "id": "d6f6cfea-4b6f-41f4-b571-6ad2ab7918da",
     "publisherDisplayName": "Microsoft",

extensions/frontend/package.json

@@ -48,7 +48,7 @@ func init() {
 					_, err = strategy.Build()
 					_, err = strategy.Pack()
 					_, err = strategy.Publish()
-					_, err = strategy.AddToRegistry()
+					_, err = strategy.AddToRegistry(&context)
 
 					if err != nil {
 						log.Fatal(err)

src/cli/extensions.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 	"github.com/shurcooL/graphql"
+	"io/ioutil"
+	"path/filepath"
 )
 
 type ExtensionContext struct {
@@ -16,7 +18,7 @@ type ExtensionLifecycle interface {
 	Build() (bool, error)
 	Pack() (string, error)
 	Publish() (bool, error)
-	AddToRegistry() (bool, error)
+	AddToRegistry(context *ExtensionContext) (bool, error)
 }
 
 type AbstractExtension struct {
@@ -40,22 +42,30 @@ func (ae AbstractExtension) Build() (bool, error) {
 	return runCommand(ae.Context.Dir, ae.Manifest.Scripts.Build, "")
 }
 
-func (ae AbstractExtension) AddToRegistry() (bool, error) {
+func (ae AbstractExtension) AddToRegistry(ctx *ExtensionContext) (bool, error) {
+	manifest := ae.Manifest.String()
+
+	data, err := ioutil.ReadFile(filepath.Join(ctx.Dir, ctx.ManifestFile))
+
+	if err == nil {
+		manifest = string(data)
+	}
+
 	mutation, variables := NewPublishExtensionMutation(PublishExtensionVariables{
 		force:       true,
+		manifest:    manifest,
 		name:        ae.Manifest.Name,
 		bundle:      ae.Manifest.Bundle,
 		version:     ae.Manifest.Version,
-		manifest:    ae.Manifest.String(),
 		extensionID: ae.Manifest.ExtensionID,
 	})
 
-	err := ae.Context.GraphqlClient.Mutate(context.Background(), &mutation, variables)
+	netErr := ae.Context.GraphqlClient.Mutate(context.Background(), &mutation, variables)
 
 	fmt.Printf("Mutation %s \n", ae.Manifest.String())
 
-	if err != nil {
-		return false, err
+	if netErr != nil {
+		return false, netErr
 	}
 
 	return true, nil