Some bug fixes.

gburning · Dec 9, 2016 · 110685d · 110685d
1 parent 7eb0e45
commit 110685d
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 81 deletions.
diff --git a/backlogs-panel/styles/main.css → backlogs-panel/css/main.css b/backlogs-panel/styles/main.css → backlogs-panel/css/main.css
diff --git a/backlogs-panel/gruntfile.js b/backlogs-panel/gruntfile.js
diff --git a/backlogs-panel/img/logo.png → backlogs-panel/images/logo.png b/backlogs-panel/img/logo.png → backlogs-panel/images/logo.png
diff --git a/backlogs-panel/index.html b/backlogs-panel/index.html
@@ -3,25 +3,20 @@
 <html lang="en">
 <head>
     <meta charset="utf-8" />
-    <script src="dist/VSS.SDK.min.js"></script>
+    <script src="lib/VSS.SDK.min.js"></script>
 
-    <link href="dist/main.css" rel="stylesheet"></link>
+    <link href="css/main.css" rel="stylesheet"></link>
 </head>
 <body>
     <script type="text/javascript">
         // Initialize framework 
         VSS.init({
             explicitNotifyLoaded: true,
-            usePlatformScripts: true,
-            moduleLoaderConfig: {
-                paths: {
-                    "scripts": "dist"
-                }
-            }
+            usePlatformScripts: true
         });
 
         // Load main entry point for extension
-        VSS.require(["dist/app"], function () {
+        VSS.require(["scripts/app"], function () {
             // Loading succeeded
             VSS.notifyLoadSucceeded();
         });

diff --git a/backlogs-panel/package.json b/backlogs-panel/package.json
@@ -1,14 +1,16 @@
 {
   "devDependencies": {
-    "grunt": "^1.0.1",
-    "grunt-cli": "^1.2.0",
-    "grunt-contrib-clean": "^1.0.0",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-exec": "~1.0.0",
-    "grunt-ts": "6.0.0-beta.3",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.4",
     "tfx-cli": "^0.3.45",
     "typescript": "^2.1.4"
   },
+  "scripts": {
+    "build": "tsc -p .",
+    "postbuild": "npm run package",
+    "package": "tfx extension create",
+    "clean": "rimraf ./dist && rimraf ./*.vsix"
+  },
   "name": "tags-mru",
   "private": true,
   "version": "0.0.0",
@@ -17,8 +19,5 @@
     "@types/react": "^0.14.54",
     "@types/react-dom": "^0.14.19",
     "vss-web-extension-sdk": "^1.109.0"
-  },
-  "scripts": {
-    "build": "grunt"
   }
 }
diff --git a/backlogs-panel/scripts/app.tsx → backlogs-panel/src/app.tsx b/backlogs-panel/scripts/app.tsx → backlogs-panel/src/app.tsx
diff --git a/...s-panel/scripts/components/assignedto.tsx → backlogs-panel/src/components/assignedto.tsx b/...s-panel/scripts/components/assignedto.tsx → backlogs-panel/src/components/assignedto.tsx
diff --git a/...s-panel/scripts/components/devdetails.tsx → backlogs-panel/src/components/devdetails.tsx b/...s-panel/scripts/components/devdetails.tsx → backlogs-panel/src/components/devdetails.tsx
diff --git a/...logs-panel/scripts/components/spinner.tsx → backlogs-panel/src/components/spinner.tsx b/...logs-panel/scripts/components/spinner.tsx → backlogs-panel/src/components/spinner.tsx
diff --git a/...s-panel/scripts/components/widgetbase.tsx → backlogs-panel/src/components/widgetbase.tsx b/...s-panel/scripts/components/widgetbase.tsx → backlogs-panel/src/components/widgetbase.tsx
diff --git a/backlogs-panel/scripts/identityHelper.ts → backlogs-panel/src/identityHelper.ts b/backlogs-panel/scripts/identityHelper.ts → backlogs-panel/src/identityHelper.ts
diff --git a/backlogs-panel/scripts/interfaces.ts → backlogs-panel/src/interfaces.ts b/backlogs-panel/scripts/interfaces.ts → backlogs-panel/src/interfaces.ts
diff --git a/backlogs-panel/scripts/main.tsx → backlogs-panel/src/main.tsx b/backlogs-panel/scripts/main.tsx → backlogs-panel/src/main.tsx
diff --git a/backlogs-panel/scripts/model.ts → backlogs-panel/src/model.ts b/backlogs-panel/scripts/model.ts → backlogs-panel/src/model.ts
diff --git a/backlogs-panel/scripts/workdetailsdata.ts → backlogs-panel/src/workdetailsdata.ts b/backlogs-panel/scripts/workdetailsdata.ts → backlogs-panel/src/workdetailsdata.ts
diff --git a/backlogs-panel/tsconfig.json b/backlogs-panel/tsconfig.json
@@ -10,7 +10,7 @@
         ]
     },
     "include": [
-        "scripts/**/*.ts",
-        "scripts/**/*.tsx"
+        "src/**/*.ts",
+        "src/**/*.tsx"
     ]
 }
diff --git a/backlogs-panel/vss-extension.json b/backlogs-panel/vss-extension.json
@@ -1,14 +1,14 @@
 {
     "manifestVersion": 1,
     "id": "vsts-sample-backlogs-panel",
-    "version": "0.1.0",
+    "version": "0.1.4",
     "name": "Details panel",
     "scopes": [ "vso.work" ],
     "description": "Sample backlog panel extension that appears on all the backlog levels.",
     "publisher": "ms-samples",
     "public": false,
     "icons": {
-        "default": "img/logo.png"
+        "default": "images/logo.png"
     },
     "targets": [
         {
@@ -37,16 +37,26 @@
     },
     "files": [
         {
-            "path": "img",
+            "path": "images",
             "addressable": true
         },
         {
-            "path": "dist",
+            "path": "css",
             "addressable": true
         },
+        {
+            "path": "dist",
+            "addressable": true,
+            "packagePath": "scripts"
+        },
         {
             "path": "index.html",
             "addressable": true
+        },
+        {
+            "path": "node_modules/vss-web-extension-sdk/lib",
+            "addressable": true,
+            "packagePath": "lib"
         }
     ],
     "categories": [

diff --git a/build-results-enhancer/buildDumpSection.html b/build-results-enhancer/buildDumpSection.html
@@ -7,7 +7,7 @@
             usePlatformScripts: true, 
             moduleLoaderConfig: { 
                 paths: { 
-                    "enhancer": "scripts/enhancer" 
+                    "enhancer": "scripts" 
                 } 
             }
         });

diff --git a/build-results-enhancer/infoTab.html b/build-results-enhancer/infoTab.html
@@ -6,7 +6,7 @@
         VSS.init( { 
             usePlatformScripts: true, 
             moduleLoaderConfig: { 
-                paths: { "enhancer": "scripts/enhancer" } 
+                paths: { "enhancer": "scripts" } 
             } 
         });
 

diff --git a/build-results-enhancer/statusSection.html b/build-results-enhancer/statusSection.html
@@ -6,7 +6,7 @@
         VSS.init( { 
             usePlatformScripts: true, 
             moduleLoaderConfig: { 
-                paths: { "enhancer": "scripts/enhancer" } 
+                paths: { "enhancer": "scripts" } 
             } 
         });
 

diff --git a/build-results-enhancer/vss-extension.json b/build-results-enhancer/vss-extension.json
@@ -1,7 +1,7 @@
 {
     "manifestVersion": 1,
     "id": "samples-build-results-enhancer",
-    "version": "0.2.2",
+    "version": "0.2.3",
     "name": "Build Results Enhancer",
     "description": "A simple extension that demonstrates how to extend build summary page.",
     "publisher": "fabrikam",

diff --git a/calendar-public-events/main.html b/calendar-public-events/main.html
@@ -12,13 +12,14 @@
             usePlatformScripts: true,
             moduleLoaderConfig: { 
                 paths: { 
-                    "PublicEvents": "scripts/PublicEvents" 
+                    "PublicEvents": "scripts" 
                 } 
             }
         });
 
         VSS.require( [ "PublicEvents/PublicEventsSource" ], function (PubEvents) {
-            VSS.register("public-events-source", function (context) {
+            var context = VSS.getExtensionContext();
+            VSS.register(context.publisherId + "." + context.extensionId + "." + "public-events-source", function (context) {
                 return new PubEvents.PublicEventsSource();
             });
             VSS.notifyLoadSucceeded();