Steven Silvester 6 years ago
parent
commit
d9848b1820
4 changed files with 14 additions and 28 deletions
  1. 0 6
      packages/coreutils/package.json
  2. 7 16
      packages/services/package.json
  3. 4 3
      tests/test-services/package.json
  4. 3 3
      yarn.lock

+ 0 - 6
packages/coreutils/package.json

@@ -42,14 +42,8 @@
     "url-parse": "~1.4.3"
   },
   "devDependencies": {
-    "@types/chai": "~4.0.10",
     "@types/comment-json": "^1.1.0",
-    "@types/jest": "^23.3.1",
     "@types/minimist": "~1.2.0",
-    "jest": "^23.5.0",
-    "karma": "~2.0.4",
-    "karma-chrome-launcher": "~2.2.0",
-    "puppeteer": "^1.5.0",
     "rimraf": "~2.6.2",
     "typedoc": "~0.12.0",
     "typescript": "~3.1.1"

+ 7 - 16
packages/services/package.json

@@ -30,20 +30,11 @@
     "url": "https://github.com/jupyterlab/jupyterlab"
   },
   "scripts": {
-    "build": "jlpm run build:src",
-    "build:src": "tsc -b src",
-    "build:test": "tsc --project tests",
+    "build": "tsc -b src",
     "clean": "rimraf docs && rimraf lib && rimraf test/build && rimraf test/coverage",
     "docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src",
-    "prepublishOnly": "jlpm run build:src && webpack",
-    "test": "python test/run-test.py",
-    "test:coverage": "python test/run_test.py --TestApp.coverage==True",
-    "test:debug": "python test/run_test.py --debug",
-    "test:devtool": "python test/run_test.py --TestApp.devtool==True",
-    "watch": "tsc -b src --watch",
-    "watch:all": "npm-run-all -p watch watch:test",
-    "watch:test": "python tests/run_test.py --debug",
-    "watch:test:all": "python tests/run_test.py --debug --watchAll"
+    "prepublishOnly": "jlpm run build && webpack",
+    "watch": "tsc -b src --watch"
   },
   "dependencies": {
     "@jupyterlab/coreutils": "^2.2.1-alpha.0",
@@ -55,15 +46,12 @@
   },
   "devDependencies": {
     "@types/text-encoding": "0.0.33",
-    "@types/ws": "^6.0.0",
-    "npm-run-all": "~4.1.1",
     "rimraf": "~2.6.2",
     "text-encoding": "~0.5.5",
-<<<<<<< HEAD
-    "ts-jest": "^23.1.4",
     "typedoc": "~0.12.0",
     "typescript": "~3.1.1",
     "webpack": "~4.12.0",
+<<<<<<< HEAD
     "webpack-cli": "^3.0.3",
 =======
     "typescript": "~2.9.2",
@@ -72,5 +60,8 @@
   },
   "publishConfig": {
     "access": "public"
+=======
+    "webpack-cli": "^3.0.3"
+>>>>>>> 86684a44c... wip jest
   }
 }

+ 4 - 3
tests/test-services/package.json

@@ -13,8 +13,8 @@
     "watch:src": "tsc -w --listEmittedFiles"
   },
   "dependencies": {
-    "@jupyterlab/coreutils": "^2.1.4",
-    "@jupyterlab/services": "^3.1.4",
+    "@jupyterlab/coreutils": "^2.2.1-alpha.0",
+    "@jupyterlab/services": "^3.2.1-alpha.0",
     "@phosphor/algorithm": "^1.1.2",
     "@phosphor/coreutils": "^1.3.0",
     "@phosphor/signaling": "^1.2.2",
@@ -28,7 +28,8 @@
   "devDependencies": {
     "@types/chai": "~4.0.10",
     "@types/jest": "^23.3.1",
+    "@types/ws": "^6.0.1",
     "rimraf": "~2.6.2",
-    "typescript": "~2.9.2"
+    "typescript": "~3.1.1"
   }
 }

+ 3 - 3
yarn.lock

@@ -988,9 +988,9 @@
   version "1.13.6"
   resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.6.tgz#128d1685a7c34d31ed17010fc87d6a12c1de6976"
 
-"@types/ws@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.0.tgz#4787c4194c29cc6361208dcf4e580e208794e012"
+"@types/ws@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.1.tgz#ca7a3f3756aa12f62a0a62145ed14c6db25d5a28"
   dependencies:
     "@types/events" "*"
     "@types/node" "*"