Update package.json files, add workspaces in package.json of the repo…

… and re-establish paths in relevant files.
jupyter · Apr 27, 2023 · 99069d8 · 99069d8
1 parent 4a83fed
commit 99069d8
Show file tree

Hide file tree

Showing 11 changed files with 1,290 additions and 3,997 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ MANIFEST
 .cache
 .pytest_cache
 .idea
+.yarn
 
 
 .spyderproject

diff --git a/package.json b/package.json
@@ -1,72 +1,24 @@
 {
  "private": true,
  "devDependencies": {
- "@jupyterlab/buildutils": "4.0.0-beta.1",
+ "@jupyterlab/buildutils": "4.0.0-beta.2",
  "lerna": "^4.0.0",
  "rimraf": "^2.6.3"
  },
+ "workspaces": [
+ "packages/*"
+ ],
  "scripts": {
- "build": "tsc -b",
- "build:test": "tsc --build tsconfig.test.json",
- "clean": "rimraf lib && rimraf tsconfig.tsbuildinfo",
- "docs": "typedoc src",
- "test": "jest",
- "test:cov": "jest --collect-coverage",
- "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
- "test:debug:watch": "node --inspect-brk node_modules/.bin/jest --runInBand --watch",
- "watch": "tsc -b --watch"
+ "build": "lerna run build",
+ "build:dev": "tsc --build",
+ "clean": "lerna run clean",
+ "publish": "npm run clean && npm run build && lerna publish --no-private -m \"Publish npm packages\"",
+ "test": "lerna run test",
+ "update:all": "update-dependency --lerna --minimal --regex .*",
+ "update:lab": "update-dependency --lerna --minimal --regex ^@jupyterlab/",
+ "update:lab:next": "update-dependency --lerna --minimal --regex ^@jupyterlab/ ^next",
+ "updated": "lerna updated",
+ "watch": "tsc --build --watch"
  },
- "name": "nbdime",
- "dependencies": {
- "@babel/core": "^7.5.0",
- "@babel/preset-env": "^7.5.0",
- "@fortawesome/fontawesome-free": "^5.12.0",
- "@jupyterlab/application": "^4.0.0-beta.0",
- "@jupyterlab/apputils": "^4.0.0-beta.0",
- "@jupyterlab/builder": "^4.0.0-beta.0",
- "@jupyterlab/cells": "^4.0.0-beta.0",
- "@jupyterlab/codeeditor": "^4.0.0-beta.0",
- "@jupyterlab/codemirror": "^4.0.0-beta.0",
- "@jupyterlab/coreutils": "^6.0.0-beta.0",
- "@jupyterlab/docregistry": "^4.0.0-beta.1",
- "@jupyterlab/mathjax": "^4.0.0-alpha.17",
- "@jupyterlab/nbformat": "^4.0.0-beta.0",
- "@jupyterlab/notebook": "^4.0.0-beta.0",
- "@jupyterlab/outputarea": "^4.0.0-beta.0",
- "@jupyterlab/rendermime": "^4.0.0-beta.0",
- "@jupyterlab/services": "^7.0.0-beta.0",
- "@jupyterlab/settingregistry": "4.0.0-beta.1",
- "@jupyterlab/theme-light-extension": "4.0.0-beta.1",
- "@lumino/algorithm": "^2.0.0",
- "@lumino/commands": "^2.0.0",
- "@lumino/coreutils": "^2.0.0",
- "@lumino/disposable": "^2.0.0",
- "@lumino/dragdrop": "^2.0.0",
- "@lumino/messaging": "^2.0.0",
- "@lumino/signaling": "^2.0.0",
- "@lumino/widgets": "^2.0.0",
- "@types/file-saver": "^2.0.0",
- "@types/jest": "^26.0.0",
- "@types/json-stable-stringify": "^1.0.32",
- "@types/node": "^14.14.13",
- "@types/sanitizer": "^0.0.28",
- "alertify.js": "^1.0.12",
- "css-loader": "^3.0.0",
- "file-loader": "^4.0.0",
- "file-saver": "^2.0.1",
- "fs-extra": "^8.1.0",
- "identity-obj-proxy": "^3.0.0",
- "jest": "^26.0.0",
- "jest-fetch-mock": "^1.6.6",
- "json-stable-stringify": "^1.0.1",
- "mkdirp": "^0.5.1",
- "source-map-loader": "^0.2.4",
- "style-loader": "^0.23.1",
- "ts-jest": "^26.0.0",
- "ts-loader": "^8.2.0",
- "typescript": "^4.9.0",
- "url-loader": "^2.0.1",
- "webpack": "^4.29.6",
- "webpack-cli": "^3.2.3"
- }
+ "name": "nbdime-top-repo"
 }
diff --git a/packages/labextension/package.json b/packages/labextension/package.json
@@ -42,23 +42,23 @@
  "watch": "tsc --build --watch"
  },
  "dependencies": {
- "@jupyterlab/apputils": "^4.0.0-beta.0",
+ "@jupyterlab/apputils": "^4.0.0-beta.2",
  "@jupyterlab/coreutils": "^6.0.0-beta.1",
- "@jupyterlab/nbformat": "^4.0.0-beta.1",
- "@jupyterlab/notebook": "4.0.0-beta.1",
- "@jupyterlab/rendermime": "4.0.0-beta.1",
+ "@jupyterlab/nbformat": "^4.0.0-beta.2",
+ "@jupyterlab/notebook": "4.0.0-beta.2",
+ "@jupyterlab/rendermime": "4.0.0-beta.2",
  "@jupyterlab/services": "^7.0.0-beta.1",
- "@jupyterlab/settingregistry": "4.0.0-beta.1",
+ "@jupyterlab/settingregistry": "4.0.0-beta.2",
  "@lumino/algorithm": "^2.0.0",
  "@lumino/coreutils": "^2.0.0",
  "@lumino/disposable": "^2.0.0",
  "@lumino/widgets": "^2.0.0",
  "nbdime": "^6.1.2"
  },
  "devDependencies": {
- "@jupyterlab/application": "^4.0.0-beta.0",
- "@jupyterlab/builder": "^4.0.0-beta.0",
- "@jupyterlab/docregistry": "^4.0.0-beta.0",
+ "@jupyterlab/application": "^4.0.0-beta.2",
+ "@jupyterlab/builder": "^4.0.0-beta.2",
+ "@jupyterlab/docregistry": "^4.0.0-beta.2",
  "@lumino/commands": "^2.0.0",
  "mkdirp": "^0.5.1",
  "rimraf": "^2.6.3",

diff --git a/packages/labextension/src/widget.ts b/packages/labextension/src/widget.ts
@@ -24,23 +24,23 @@ import {
 
 import type {
  IDiffEntry
-} from '../../nbdime/lib/diff/diffentries';
+} from 'nbdime/lib/diff/diffentries';
 
 import {
  NotebookDiffModel
-} from '../../nbdime/lib/diff/model';
+} from 'nbdime/lib/diff/model';
 
 import {
  NotebookDiffWidget, CELLDIFF_CLASS
-} from '../../nbdime/lib/diff/widget';
+} from 'nbdime/lib/diff/widget';
 
 import {
  UNCHANGED_DIFF_CLASS, CHUNK_PANEL_CLASS
-} from '../../nbdime/lib/diff/widget/common';
+} from 'nbdime/lib/diff/widget/common';
 
 import {
  requestApiJson
-} from '../../nbdime/lib/request';
+} from 'nbdime/lib/request';
 
 
 

diff --git a/packages/nbdime/package.json b/packages/nbdime/package.json
@@ -19,24 +19,25 @@
  "watch": "tsc --build --watch"
  },
  "dependencies": {
- "@jupyterlab/codeeditor": "^4.0.0-beta.0",
- "@jupyterlab/codemirror": "^4.0.0-beta.0",
+ "@jupyterlab/codeeditor": "^4.0.0-beta.2",
+ "@jupyterlab/codemirror": "^4.0.0-beta.2",
  "@jupyterlab/coreutils": "^6.0.0-beta.0",
- "@jupyterlab/nbformat": "^4.0.0-beta.0",
- "@jupyterlab/outputarea": "^4.0.0-beta.0",
- "@jupyterlab/rendermime": "^4.0.0-beta.0",
+ "@jupyterlab/nbformat": "^4.0.0-beta.2",
+ "@jupyterlab/outputarea": "^4.0.0-beta.2",
+ "@jupyterlab/rendermime": "^4.0.0-beta.2",
  "@jupyterlab/services": "^7.0.0-beta.0",
  "@lumino/algorithm": "^2.0.0",
  "@lumino/coreutils": "^2.0.0",
  "@lumino/dragdrop": "^2.0.0",
  "@lumino/signaling": "^2.0.0",
  "@lumino/widgets": "^2.0.0",
+ "codemirror": "^5.0.0",
  "json-stable-stringify": "^1.0.1"
  },
  "devDependencies": {
  "@babel/core": "^7.5.0",
  "@babel/preset-env": "^7.5.0",
- "@jupyterlab/apputils": "^4.0.0-beta.0",
+ "@jupyterlab/apputils": "^4.0.0-beta.2",
  "@lumino/messaging": "^2.0.0",
  "@types/json-stable-stringify": "^1.0.32",
  "@types/node": "^18.15.0",
@@ -49,8 +50,5 @@
  "rimraf": "^5.0.0",
  "ts-jest": "^29.1.0",
  "typescript": "^4.9.0"
- },
- "peerDependencies": {
- "codemirror": "^5.0.0"
  }
 }
diff --git a/packages/webapp/package.json b/packages/webapp/package.json
@@ -12,16 +12,16 @@
  },
  "dependencies": {
  "@fortawesome/fontawesome-free": "^5.12.0",
- "@jupyterlab/application": "^4.0.0-beta.0",
- "@jupyterlab/apputils": "^4.0.0-beta.0",
- "@jupyterlab/cells": "^4.0.0-beta.0",
- "@jupyterlab/codemirror": "^4.0.0-beta.0",
+ "@jupyterlab/application": "^4.0.0-beta.2",
+ "@jupyterlab/apputils": "^4.0.0-beta.2",
+ "@jupyterlab/cells": "^4.0.0-beta.2",
+ "@jupyterlab/codemirror": "^4.0.0-beta.2",
  "@jupyterlab/coreutils": "^6.0.0-beta.1",
- "@jupyterlab/mathjax2": "^4.0.0-beta.0",
- "@jupyterlab/nbformat": "^4.0.0-beta.0",
- "@jupyterlab/notebook": "^4.0.0-beta.0",
- "@jupyterlab/rendermime": "^4.0.0-beta.0",
- "@jupyterlab/theme-light-extension": "^4.0.0-beta.0",
+ "@jupyterlab/mathjax-extension": "^4.0.0-beta.2",
+ "@jupyterlab/nbformat": "^4.0.0-beta.2",
+ "@jupyterlab/notebook": "^4.0.0-beta.2",
+ "@jupyterlab/rendermime": "^4.0.0-beta.2",
+ "@jupyterlab/theme-light-extension": "^4.0.0-beta.2",
  "@lumino/dragdrop": "^2.0.0",
  "@lumino/widgets": "^2.0.0",
  "alertify.js": "^1.0.12",

diff --git a/packages/webapp/src/app/diff.ts b/packages/webapp/src/app/diff.ts
@@ -10,15 +10,15 @@ import { RenderMimeRegistry } from '@jupyterlab/rendermime';
 
 import { Sanitizer } from '@jupyterlab/apputils';
 
-import { MathJaxTypesetter } from '@jupyterlab/mathjax';
+import { MathJaxTypesetter } from '@jupyterlab/mathjax-extension';
 
-import type { IDiffEntry } from '../../../nbdime/lib/diff/diffentries';
+import type { IDiffEntry } from 'nbdime/lib/diff/diffentries';
 
-import { NotebookDiffModel } from '../../../nbdime/lib/diff/model';
+import { NotebookDiffModel } from 'nbdime/lib/diff/model';
 
-import { NotebookDiffWidget } from '../../../nbdime/lib/diff/widget';
+import { NotebookDiffWidget } from 'nbdime/lib/diff/widget';
 
-import { requestDiff } from '../../../nbdime/lib/request';
+import { requestDiff } from 'nbdime/lib/request';
 
 import {
  getBaseUrl,

diff --git a/packages/webapp/src/app/merge.ts b/packages/webapp/src/app/merge.ts
@@ -14,15 +14,15 @@ import { RenderMimeRegistry } from '@jupyterlab/rendermime';
 
 import { Sanitizer } from '@jupyterlab/apputils';
 
-import { NotebookMergeModel } from '../../../nbdime/lib/merge/model';
+import { NotebookMergeModel } from 'nbdime/lib/merge/model';
 
-import type { IMergeDecision } from '../../../nbdime/lib/merge/decisions';
+import type { IMergeDecision } from 'nbdime/lib/merge/decisions';
 
-import { NotebookMergeWidget } from '../../../nbdime/lib/merge/widget';
+import { NotebookMergeWidget } from 'nbdime/lib/merge/widget';
 
-import { stringify } from '../../../nbdime/lib/patch';
+import { stringify } from 'nbdime/lib/patch';
 
-import { requestMerge, requestApi } from '../../../nbdime/lib/request';
+import { requestMerge, requestApi } from 'nbdime/lib/request';
 
 import {
  getBaseUrl,

diff --git a/packages/webapp/src/app/save.ts b/packages/webapp/src/app/save.ts
@@ -8,7 +8,7 @@ import type * as nbformat from '@jupyterlab/nbformat';
 
 import type {
  NotebookMergeWidget
-} from '../../../nbdime/lib/merge/widget';
+} from 'nbdime/lib/merge/widget';
 
 
 

diff --git a/packages/webapp/src/app/staticdiff.ts b/packages/webapp/src/app/staticdiff.ts
@@ -8,7 +8,7 @@ import {
 
 import {
  EditorWidget
-} from '../../../nbdime/lib/common/editor';
+} from 'nbdime/lib/common/editor';