Skip to content

Commit

Permalink
Merge dev/beta into master (#38)
Browse files Browse the repository at this point in the history
* Visual based on new tools 3.0.1

* Update powerbi-visuals-tools to 3.0.2
  • Loading branch information
zBritva authored and uve committed Sep 28, 2018
1 parent d2fa634 commit ac25bb6
Show file tree
Hide file tree
Showing 43 changed files with 15,564 additions and 14,582 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@ node_modules
dist
typings
.api
.vscode/*
*.log
/coverage
webpack.statistics.html
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ sudo: required
dist: trusty
language: node_js
node_js:
- "7"
before_install:
- sudo apt-get install -y chromium-browser
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- "10"
install:
- npm install
script:
Expand Down
37 changes: 0 additions & 37 deletions .vscode/settings.json

This file was deleted.

3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 3.0.0
* [email protected] based visual

## 2.1.2

* Additional minimal height calculation now is applied only if rotation option is enabled
Expand Down
99 changes: 0 additions & 99 deletions karma.conf.js

This file was deleted.

128 changes: 128 additions & 0 deletions karma.conf.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
/*
* Power BI Visualizations
*
* Copyright (c) Microsoft Corporation
* All rights reserved.
* MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the ""Software""), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

"use strict";

const webpackConfig = require("./test.webpack.config.js");
const tsconfig = require("./test.tsconfig.json");
const path = require("path");

const testRecursivePath = "test/visualTest.ts";
const srcOriginalRecursivePath = "src/**/*.ts";
const srcRecursivePath = ".tmp/drop/**/*.js";
const coverageFolder = "coverage";
const globals = "./test/globals.ts";

process.env.CHROME_BIN = require("puppeteer").executablePath();

import { Config, ConfigOptions } from "karma";

module.exports = (config: Config) => {
config.set(<ConfigOptions>{
browserNoActivityTimeout: 100000,
browsers: ["ChromeHeadless"],
colors: true,
frameworks: ["jasmine"],
reporters: [
"progress",
"coverage",
"coverage-istanbul"
],
singleRun: true,
plugins: [
"karma-coverage",
"karma-typescript",
"karma-webpack",
"karma-jasmine",
"karma-sourcemap-loader",
"karma-chrome-launcher",
"karma-coverage-istanbul-reporter"
],
files: [
"node_modules/jquery/dist/jquery.min.js",
"node_modules/jasmine-jquery/lib/jasmine-jquery.js",
globals,
srcRecursivePath,
testRecursivePath,
{
pattern: srcOriginalRecursivePath,
included: false,
served: true
}
],
preprocessors: {
[testRecursivePath]: ["webpack"],
[srcRecursivePath]: ["sourcemap"]
},
typescriptPreprocessor: {
options: tsconfig.compilerOptions
},
coverageIstanbulReporter: {
// reports can be any that are listed here: https://github.com/istanbuljs/istanbuljs/tree/aae256fb8b9a3d19414dcf069c592e88712c32c6/packages/istanbul-reports/lib
reports: {
lcovonly: coverageFolder + "lcov.info",
html: coverageFolder,
"text-summary": null
},

// base output directory. If you include %browser% in the path it will be replaced with the karma browser name
dir: path.join(__dirname, "coverage"),

// Combines coverage information from multiple browsers into one report rather than outputting a report
// for each browser.
combineBrowserReports: true,

// if using webpack and pre-loaders, work around webpack breaking the source path
fixWebpackSourcePaths: true,

// Omit files with no statements, no functions and no branches from the report
skipFilesWithNoCoverage: true,

// Most reporters accept additional config options. You can pass these through the `report-config` option
"report-config": {
// all options available at: https://github.com/istanbuljs/istanbuljs/blob/aae256fb8b9a3d19414dcf069c592e88712c32c6/packages/istanbul-reports/lib/html/index.js#L135-L137
html: {
// outputs the report in ./coverage/html
subdir: "html"
}
}
},
coverageReporter: {
dir: coverageFolder,
reporters: [
{ type: "html" },
{ type: "lcov" }
]
},
mime: {
"text/x-typescript": ["ts", "tsx"]
},
webpack: webpackConfig,
webpackMiddleware: {
stats: "errors-only"
}
});
};
Loading

0 comments on commit ac25bb6

Please sign in to comment.