Skip to content
This repository has been archived by the owner on Aug 14, 2024. It is now read-only.

Stabilize Karma tests #60

Merged
merged 2 commits into from
Sep 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
/dist
/tmp
/out-tsc
src/**/*.js
src/**/*.map
src/**/*.d.ts
lib/**/*.js
lib/**/*.map
lib/**/*.d.ts

# dependencies
/node_modules
Expand Down
13 changes: 0 additions & 13 deletions .npmignore

This file was deleted.

12 changes: 6 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@ const path = require('path');

module.exports = config => {
config.set({
basePath: '.',
basePath: 'lib',
frameworks: [
'jasmine'
],
files: [
{pattern: 'src/**/*.spec.ts'}
{pattern: '**/*.spec.ts'}
],
preprocessors: {
'**/*.ts': 'webpack',
},

webpack: {
mode: 'development',
entry: './src/index.ts',
resolve: {
extensions: ['.tsx', '.ts', '.js']
},
Expand All @@ -27,14 +26,12 @@ module.exports = config => {
rules: [
{
test: /\.ts$/,
use: 'ts-loader',
include: path.resolve('src')
use: 'ts-loader'
},
{
test: /\.ts$/,
use: {loader: 'istanbul-instrumenter-loader'},
enforce: 'post',
include: path.resolve('src'),
exclude: /\.spec\.ts$/
}

Expand Down Expand Up @@ -109,5 +106,8 @@ module.exports = config => {
browsers: ['Chrome'],
colors: true,
singleRun: false,

browserNoActivityTimeout: 60000,
browserDisconnectTolerance: 3
});
};
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions src/tsconfig.dist.json → lib/tsconfig.dist.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../dist",
"sourceMap": false,
"sourceMap": true,
"declaration": true
},
"exclude": [
Expand Down
3 changes: 1 addition & 2 deletions src/tsconfig.spec.json → lib/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"sourceMap": true,
"declaration": true
"sourceMap": false
},
"include": [
"**/*.spec.ts",
Expand Down
18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
"name": "music-metadata-browser",
"version": "1.4.0",
"description": "Browserifed version of music-metadata",
"main": "dist/index.js",
"typings": "dist/index",
"main": "lib/index.js",
"typings": "lib/index",
"files": [
"lib/**/*.js",
"lib/**/*.d.ts"
],
"repository": "https://github.com/Borewit/music-metadata-browser.git",
"author": {
"name": "Borewit",
Expand Down Expand Up @@ -53,12 +57,12 @@
"url": "https://github.com/Borewit/music-metadata-browser/issues"
},
"scripts": {
"clean": "del-cli dist/** src/**/*.js src/**/*.js.map src/**/*.d.ts coverage",
"compile-dist": "tsc -p src/tsconfig.dist.json",
"compile-test": "tsc -p src/tsconfig.spec.json",
"clean": "del-cli lib/**/*.js lib/**/*.js.map lib/**/*.d.ts coverage",
"compile-lib": "tsc -p lib/tsconfig.dist.json",
"compile-test": "tsc -p lib/tsconfig.spec.json",
"prepublishOnly": "yarn run build",
"build": "npm run compile-dist",
"tslint": "tslint 'src/**/*.ts' --exclude 'src/**/*.d.ts'",
"build": "npm run compile-lib && npm run compile-test",
"tslint": "tslint 'lib/**/*.ts' --exclude 'lib/**/*.d.ts'",
"eslint": "eslint karma.conf.js",
"lint": "npm run tslint && npm run eslint",
"test": "karma start --single-run",
Expand Down
2 changes: 0 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"compileOnSave": false,
"compilerOptions": {
"sourceMap": true,
"declaration": false,
"module": "commonjs",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
Expand Down