Skip to content

Commit

Permalink
update all the things
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffbdye committed Sep 23, 2021
1 parent d543ab8 commit 7cb4c31
Show file tree
Hide file tree
Showing 8 changed files with 3,048 additions and 794 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ npm-debug.log
.DS_Store
/src/appsettings.secrets.ts
/spec/.working/
.nyc_output
coverage
12 changes: 3 additions & 9 deletions jasmine.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
{
"spec_dir": "./src",
"spec_files": ["**/*.spec.ts"],
"reporters": [
{
"name": "jasmine-spec-reporter#SpecReporter",
"options": {
"displayStacktrace": "all"
}
}
],
"stopSpecOnExpectationFailure": false
"helpers": ["../jasmine/helpers/jasmine-reporter.js"],
"stopSpecOnExpectationFailure": false,
"random": false
}
13 changes: 13 additions & 0 deletions jasmine/helpers/jasmine-reporter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const JasmineConsoleReporter = require('jasmine-console-reporter');
const reporter = new JasmineConsoleReporter({
colors: 1,
cleanStack: 1,
verbosity: 4,
listStyle: 'indent',
timeUnit: 'ms',
timeThreshold: { ok: 500, warn: 1000, oof: 3000 },
activity: false,
emoji: true,
beep: true
});
jasmine.getEnv().addReporter(reporter);
3,778 changes: 3,016 additions & 762 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
"main": "bundle.js",
"scripts": {
"test": "jasmine-ts --config=jasmine.json",
"watch": "nodemon --ext ts --exec 'npm run test'",
"watch": "nodemon --ext ts --exec 'npm run coverage'",
"lint": "tslint --project tslint.json",
"serve": "webpack-dev-server --config webpack-serve.config.js",
"init": "sh ./sh/dev-init.sh",
"build": "webpack --config webpack-build.config.js"
"build": "webpack --config webpack-build.config.js",
"coverage": "nyc -r lcov -e .ts -x \"*.spec.ts\" npm run test"
},
"repository": {
"type": "git",
Expand All @@ -22,24 +23,25 @@
},
"homepage": "https://github.com/jeffbdye/RunMap#readme",
"devDependencies": {
"@ganbarodigital/jasmine-ts": "0.3.1",
"@types/jasmine": "3.3.14",
"@types/mapbox__mapbox-sdk": "0.6.2",
"@types/mapbox-gl": "1.8.1",
"@types/uuid": "3.4.5",
"jasmine": "3.5.0",
"jasmine-spec-reporter": "5.0.2",
"nodemon": "2.0.4",
"ts-node": "8.10.2",
"jasmine": "3.9.0",
"jasmine-console-reporter": "3.1.0",
"jasmine-ts": "0.4.0",
"nodemon": "2.0.12",
"nyc": "15.1.0",
"ts-node": "10.2.1",
"tslint": "5.18.0",
"webpack-dev-server": "4.2.1"
},
"dependencies": {
"@mapbox/mapbox-sdk": "0.9.0",
"@turf/turf": "5.1.6",
"mapbox-gl": "1.11.0",
"ts-loader": "6.0.4",
"typescript": "4.2.2",
"ts-loader": "9.2.6",
"typescript": "4.4.3",
"uuid": "3.3.2",
"webpack": "5.53.0",
"webpack-cli": "4.8.0",
Expand Down
2 changes: 1 addition & 1 deletion webpack-build.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const common = require('./webpack.config');

module.exports = merge(common, {
Expand Down
4 changes: 2 additions & 2 deletions webpack-serve.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const path = require('path');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const common = require('./webpack.config');

module.exports = merge(common, {
devServer: {
contentBase: path.join(__dirname, 'public'),
static: path.join(__dirname, 'public'),
compress: true,
port: 9000
},
Expand Down
11 changes: 0 additions & 11 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@ module.exports = {
resolve: {
extensions: ['.ts', '.js']
},
optimization: {
splitChunks: {
cacheGroups: {
commons: {
test: /[\\/]node_modules[\\/]/,
name: 'vendor',
chunks: 'all',
},
},
},
},
output: {
filename: '[name].js',
path: path.join(__dirname, 'public'),
Expand Down

0 comments on commit 7cb4c31

Please sign in to comment.