Mercurial > code > home > repos > streamed-graph

changeset 19:23fa6402c728

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more merge i think
author drewp@bigasterisk.com
date Thu, 12 Dec 2019 23:07:06 -0800
parents 4bf74032e2e8
children 9ec3cbc8791a
files package.json tasks.py
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/package.json	Thu Dec 12 22:57:14 2019 -0800
+++ b/package.json	Thu Dec 12 23:07:06 2019 -0800
@@ -9,6 +9,7 @@
     "@polymer/polymer": "^3.3.1",
     "@types/eventsource": "^1.1.2",
     "@types/jasmine": "^3.5.0",
+    "@types/jest": "^24.0.23",
     "@types/jsonld": "^1.5.0",
     "@types/n3": "^1.1.1",
     "@types/node": "^12.12.14",
--- a/tasks.py	Thu Dec 12 22:57:14 2019 -0800
+++ b/tasks.py	Thu Dec 12 23:07:06 2019 -0800
@@ -18,12 +18,9 @@
 @task
 def test(ctx):
     ctx.run(f'node_modules/.bin/webpack-cli --config webpack-test.config.ts')
-<<<<<<< working copy
     ctx.run(f'node_modules/.bin/ts-node node_modules/.bin/jasmine --config=jasmine.json')
 
 # one time:
 # yarn policies set-version v2
 # in vscode, ctrl-p then: ext install ark120202.vscode-typescript-pnp-plugin
 # or see https://next.yarnpkg.com/advanced/pnpify for a compatibility runner.
-=======
-    ctx.run(f'node_modules/.bin/ts-node node_modules/.bin/jasmine --config=jasmine.json')>>>>>>> merge rev