Skip to content

Commit

Permalink
Merge 5f13cbe into c14761a
Browse files Browse the repository at this point in the history
  • Loading branch information
zBritva committed Jan 25, 2019
2 parents c14761a + 5f13cbe commit e64dd11
Show file tree
Hide file tree
Showing 19 changed files with 886 additions and 303 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 2.1.1
* Remove internal modules
* Add jsnext:main
* set sideEffects: false

## 2.1.0
* Update packages to fix vulnerabilities
* API 2.1.0 support
Expand Down
14 changes: 9 additions & 5 deletions karma.conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import { Config, ConfigOptions } from "karma";
const testRecursivePath = "test/**/*.ts";
const srcOriginalRecursivePath = "src/**/*.ts";
const srcRecursivePath = "lib/**/*.js";
const srcCssRecursivePath = "lib/**/*.css";
const coverageFolder = "coverage";

process.env.CHROME_BIN = require("puppeteer").executablePath();
Expand All @@ -46,8 +45,13 @@ module.exports = (config: Config) => {
reporters: [
"progress",
"coverage",
"karma-remap-istanbul"
"coverage-istanbul"
],
coverageIstanbulReporter: {
reports: ["html", "lcovonly", "text-summary"],
combineBrowserReports: true,
fixWebpackSourcePaths: true
},
singleRun: true,
plugins: [
"karma-remap-istanbul",
Expand All @@ -56,12 +60,12 @@ module.exports = (config: Config) => {
"karma-webpack",
"karma-jasmine",
"karma-sourcemap-loader",
"karma-chrome-launcher"
"karma-chrome-launcher",
"karma-coverage-istanbul-reporter"
],
files: [
"node_modules/jquery/dist/jquery.min.js",
"node_modules/jasmine-jquery/lib/jasmine-jquery.js",
srcCssRecursivePath,
srcRecursivePath,
testRecursivePath,
{
Expand All @@ -84,7 +88,7 @@ module.exports = (config: Config) => {
],
preprocessors: {
[testRecursivePath]: ["webpack"],
[srcRecursivePath]: ["webpack", "sourcemap", "coverage"]
[srcRecursivePath]: ["webpack", "coverage"]
},
typescriptPreprocessor: {
options: tsconfig.compilerOptions
Expand Down

0 comments on commit e64dd11

Please sign in to comment.