Merge pull request #33 from Microsoft/develop

Dev to master with summarization ability
microsoft · Mar 7, 2019 · f9328c4 · f9328c4
2 parents 668fe7f + bfbb845
commit f9328c4
Show file tree

Hide file tree

Showing 13 changed files with 2,943 additions and 4,094 deletions.
diff --git a/capabilities.json b/capabilities.json
@@ -16,13 +16,13 @@
  "name": "summary",
  "displayName": "Preview",
  "description": "Preview text; only displayed on cards",
- "kind": 0
+ "kind": 1
  },
  {
  "name": "content",
  "displayName": "Content",
  "description": "Full content to display in the reader",
- "kind": 0
+ "kind": 1
  },
  {
  "name": "imageUrl",
@@ -46,7 +46,7 @@
  "name": "metadata",
  "displayName": "MetaData Fields",
  "description": "Key-value pairs for the table on the back of the cards",
- "kind": 0
+ "kind": 1
  },
  {
  "name": "topBarColor",

diff --git a/lib/@uncharted/cards/example/font-awesome.min.css b/lib/@uncharted/cards/example/font-awesome.min.css
diff --git a/lib/@uncharted/cards/example/fonts/FontAwesome.otf b/lib/@uncharted/cards/example/fonts/FontAwesome.otf
diff --git a/lib/@uncharted/cards/example/fonts/fontawesome-webfont.eot b/lib/@uncharted/cards/example/fonts/fontawesome-webfont.eot
diff --git a/lib/@uncharted/cards/example/fonts/fontawesome-webfont.svg b/lib/@uncharted/cards/example/fonts/fontawesome-webfont.svg
diff --git a/lib/@uncharted/cards/example/fonts/fontawesome-webfont.ttf b/lib/@uncharted/cards/example/fonts/fontawesome-webfont.ttf
diff --git a/lib/@uncharted/cards/example/fonts/fontawesome-webfont.woff b/lib/@uncharted/cards/example/fonts/fontawesome-webfont.woff
diff --git a/lib/@uncharted/cards/example/fonts/fontawesome-webfont.woff2 b/lib/@uncharted/cards/example/fonts/fontawesome-webfont.woff2
diff --git a/lib/@uncharted/cards/example/index.html b/lib/@uncharted/cards/example/index.html
@@ -2,7 +2,7 @@
 <html>
  <head>
  <title>Cards</title>
- <link rel="stylesheet" href="font-awesome.min.css">
+ <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
  <link rel="stylesheet" href="style.css">
  <script src="http://code.jquery.com/jquery-3.2.1.js"></script>
  </head>

diff --git a/lib/@uncharted/cards/package.json b/lib/@uncharted/cards/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@uncharted/cards",
- "version": "0.13.6",
+ "version": "0.13.7",
  "main": "dist/uncharted.cards.js",
  "scripts": {
  "test": "./node_modules/.bin/karma start",
@@ -27,12 +27,11 @@
  "clean-webpack-plugin": "^0.1.16",
  "cross-env": "^5.0.5",
  "css-loader": "^0.28.4",
- "eslint": "^4.6.1",
- "eslint-loader": "^1.9.0",
- "extract-text-webpack-plugin": "^3.0.0",
+ "eslint": "^5.15.1",
+ "eslint-loader": "^2.1.2",
  "handlebars": "^4.0.10",
  "handlebars-loader": "^1.7.0",
- "karma": "^2.0.0",
+ "karma": "^4.0.1",
  "karma-chrome-launcher": "^2.2.0",
  "karma-mocha": "^1.3.0",
  "karma-mocha-reporter": "^2.2.5",
@@ -47,7 +46,8 @@
  "sinon": "^4.4.6",
  "sinon-chai": "^3.0.0",
  "style-loader": "^0.18.2",
- "webpack": "^3.11.0",
- "webpack-dev-server": "^2.11.1"
+ "webpack": "^4.29.6",
+ "webpack-cli": "^3.2.3",
+ "webpack-dev-server": "^3.2.1"
  }
 }
diff --git a/lib/@uncharted/cards/webpack.config.js b/lib/@uncharted/cards/webpack.config.js
@@ -1,7 +1,6 @@
 const path = require('path');
 const webpack = require('webpack');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 const OUTPUT_FILE_NAME = 'uncharted.cards';
 
@@ -36,18 +35,24 @@ const config = {
  loader: 'babel-loader',
  options: {
  presets: [
- [ 'latest', { es2015: { modules: false } } ],
+ ['latest', { es2015: { modules: false } }],
  ],
  },
  exclude: /node_modules/,
  },
  {
- test: /\.scss$/,
- use: isServing
- ? ['style-loader', 'css-loader', 'sass-loader']
- : ExtractTextPlugin.extract({
- use: ['css-loader', 'sass-loader'],
- }),
+ test: /\.scss$|\.css$/,
+ use: [
+ {
+ loader: "style-loader" // creates style nodes from JS strings
+ },
+ {
+ loader: "css-loader" // translates CSS into CommonJS
+ },
+ {
+ loader: "sass-loader" // compiles Sass to CSS
+ }
+ ]
  },
  {
  test: /\.handlebars$/,
@@ -78,7 +83,6 @@ const config = {
 if (!isServing) {
  config.plugins.push(...[
  new CleanWebpackPlugin(['dist']),
- new ExtractTextPlugin(`${outputFileName}.css`),
  ]);
 }
 
@@ -92,6 +96,8 @@ if (isProduction) {
  },
  }),
  ]);
+
+ config.mode = 'production';
 } else {
  config.output.libraryTarget = 'window';
  config.output.library = ['Uncharted', 'Cards'];
@@ -103,6 +109,8 @@ if (isProduction) {
  },
  }),
  ]);
+
+ config.mode = 'development';
 }
 
 module.exports = config;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "powerbi-visuals-cardbrowser",
- "version": "1.1.3",
+ "version": "1.1.4",
  "description": "Card Browser, a custom visual for PowerBI",
  "main": "src/index.js",
  "scripts": {
@@ -26,28 +26,27 @@
  "url": "https://github.com/Microsoft/PowerBI-visuals-CardBrowser"
  },
  "privateSubmodules": {
- "@uncharted/cards": "0.13.6"
+ "@uncharted/cards": "0.13.7"
  },
  "devDependencies": {
  "@types/jest": "^22.2.3",
  "@types/jquery": "^3.3.0",
  "@types/lodash-es": "^4.17.0",
- "@types/moment": "^2.13.0",
  "@types/node": "^9.4.1",
  "babel-core": "^6.26.0",
  "babel-loader": "^7.1.2",
  "babel-polyfill": "^6.26.0",
  "babel-preset-env": "^1.6.1",
  "chai": "^4.1.2",
- "chokidar": "^2.0.0",
+ "chokidar": "^2.1.2",
  "clean-css": "^4.1.9",
  "connect": "^3.6.5",
- "eslint": "^4.17.0",
- "eslint-loader": "^1.9.0",
+ "eslint": "^5.15.1",
+ "eslint-loader": "^2.1.2",
  "fs-extra": "^7.0.0",
  "handlebars": "^4.0.11",
  "handlebars-loader": "^1.6.0",
- "jest": "^22.4.3",
+ "jest": "^24.3.0",
  "jquery": "^3.3.1",
  "json": "^9.0.6",
  "memory-fs": "^0.4.1",
@@ -59,15 +58,16 @@
  "onchange": "^3.3.0",
  "powerbi-visuals": "^0.6.0",
  "serve-static": "^1.13.2",
- "sinon": "^4.2.2",
- "sinon-chai": "^2.14.0",
+ "sinon": "^7.2.7",
+ "sinon-chai": "^3.3.0",
  "targz": "^1.0.1",
  "ts-jest": "^22.4.2",
  "ts-loader": "^3.5.0",
  "tslint": "^5.9.1",
  "tslint-loader": "^3.5.3",
  "tslint-microsoft-contrib": "^5.0.3",
  "typescript": "^2.7.2",
+ "upath": "^1.1.1",
  "webpack": "^3.11.0"
  },
  "dependencies": {
@@ -93,6 +93,7 @@
  "js",
  "jsx",
  "json"
- ]
+ ],
+ "testURL": "http://localhost/"
  }
 }