Merge branch 'master' into doc-directory

# Conflicts:
#	package-lock.json
#	package.json
build-validation
David Tookey 5 years ago
commit 99ed430049

@ -1,6 +0,0 @@
module.exports = {
transform: {'^.+\.ts?$': 'ts-jest'},
testEnvironment: 'node',
testRegex: '/tests/.*\.(ts|tsx)$',
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node']
}

1772
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -9,10 +9,9 @@
"url": "git://github.com/username/repository.git"
},
"scripts": {
"test": "jest --verbose",
"test": "mocha -r ts-node/register tests/**/*-test.ts",
"clean": "gulp clean",
"build": "gulp",
"ts-compile": "tsc --outDir build/util",
"start": "npm run build && electron ./build",
"start-fast": "gulp runFast && electron ./build",
"dev": "npm run build && electron ./build --debug",
@ -44,6 +43,8 @@
},
"devDependencies": {
"@types/jquery": "^3.5.1",
"@types/mocha": "^8.0.3",
"@types/chai": "^4.2.14",
"devtron": "^1.4.0",
"electron": "^7.2.4",
"electron-settings": "^3.0.7",
@ -52,6 +53,10 @@
"gulp": "^4.0.2",
"gulp-typescript": "^6.0.0-alpha.1",
"gulp-exec": "^5.0.0",
"del": "^6.0.0"
"del": "^6.0.0",
"chai": "^4.2.0",
"mocha": "^8.2.0",
"nyc": "^15.1.0",
"ts-node": "^9.0.0"
}
}

@ -0,0 +1,5 @@
describe('default', ()=>{
it('print', ()=>{
console.log("okay?")
})
})
Loading…
Cancel
Save