Skip to content

Commit

Permalink
Switch to workspaces after all cause lerna does not support portals
Browse files Browse the repository at this point in the history 
Using `workspace:*` over relative specs as paths are experimental,
and as of today did not work for me in any reasonable way (either
resolution worked but build did not, or both did not depending on
attempt).
  • Loading branch information
@krassowski
krassowski committed Jul 6, 2023
1 parent 66aa65c commit 17b886c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 110 deletions.
14 changes: 7 additions & 7 deletions packages/metapackage/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
"watch": "tsc -b --watch --preserveWatchOutput"
},
"dependencies": {
"@jupyter-lsp/code-jumpers": "portal:../code-jumpers",
"@jupyter-lsp/completion-theme": "portal:../completion-theme",
"@jupyter-lsp/jupyterlab-lsp": "portal:../jupyterlab-lsp",
"@jupyter-lsp/jupyterlab-lsp-example-extractor": "portal:../_example-extractor",
"@jupyter-lsp/jupyterlab-lsp-klingon-integration": "portal:../_klingon-integration",
"@jupyter-lsp/theme-material": "portal:../theme-material",
"@jupyter-lsp/theme-vscode": "portal:../theme-vscode"
"@jupyter-lsp/code-jumpers": "workspace:*",
"@jupyter-lsp/completion-theme": "workspace:*",
"@jupyter-lsp/jupyterlab-lsp": "workspace:*",
"@jupyter-lsp/jupyterlab-lsp-example-extractor": "workspace:*",
"@jupyter-lsp/jupyterlab-lsp-klingon-integration": "workspace:*",
"@jupyter-lsp/theme-material": "workspace:*",
"@jupyter-lsp/theme-vscode": "workspace:*"
},
"devDependencies": {
"rimraf": "^3.0.0",
Expand Down
117 changes: 14 additions & 103 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2604,23 +2604,7 @@ __metadata:
languageName: node
linkType: hard

"@jupyter-lsp/code-jumpers@portal:../code-jumpers::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/code-jumpers@portal:../code-jumpers::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage"
peerDependencies:
"@jupyterlab/apputils": ^4.0.0
"@jupyterlab/codeeditor": ^4.0.0
"@jupyterlab/coreutils": ^6.0.0
"@jupyterlab/docmanager": ^4.0.0
"@jupyterlab/docregistry": ^4.0.0
"@jupyterlab/fileeditor": ^4.0.0
"@jupyterlab/notebook": ^4.0.0
"@jupyterlab/observables": ^5.0.0
"@jupyterlab/translation": ^4.0.0
languageName: node
linkType: soft

"@jupyter-lsp/code-jumpers@workspace:packages/code-jumpers, @jupyter-lsp/code-jumpers@~1.2.0":
"@jupyter-lsp/code-jumpers@workspace:*, @jupyter-lsp/code-jumpers@workspace:packages/code-jumpers, @jupyter-lsp/code-jumpers@~1.2.0":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/code-jumpers@workspace:packages/code-jumpers"
dependencies:
Expand Down Expand Up @@ -2649,7 +2633,7 @@ __metadata:
languageName: unknown
linkType: soft

"@jupyter-lsp/completion-theme@^3.0.0, @jupyter-lsp/completion-theme@workspace:packages/completion-theme, @jupyter-lsp/completion-theme@~3.3.0":
"@jupyter-lsp/completion-theme@^3.0.0, @jupyter-lsp/completion-theme@workspace:*, @jupyter-lsp/completion-theme@workspace:packages/completion-theme, @jupyter-lsp/completion-theme@~3.3.0":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/completion-theme@workspace:packages/completion-theme"
dependencies:
Expand All @@ -2661,21 +2645,7 @@ __metadata:
languageName: unknown
linkType: soft

"@jupyter-lsp/completion-theme@portal:../completion-theme::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/completion-theme@portal:../completion-theme::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage"
languageName: node
linkType: soft

"@jupyter-lsp/jupyterlab-lsp-example-extractor@portal:../_example-extractor::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/jupyterlab-lsp-example-extractor@portal:../_example-extractor::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage"
dependencies:
"@jupyter-lsp/jupyterlab-lsp": ^4.0.0-alpha.0
languageName: node
linkType: soft

"@jupyter-lsp/jupyterlab-lsp-example-extractor@workspace:packages/_example-extractor":
"@jupyter-lsp/jupyterlab-lsp-example-extractor@workspace:*, @jupyter-lsp/jupyterlab-lsp-example-extractor@workspace:packages/_example-extractor":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/jupyterlab-lsp-example-extractor@workspace:packages/_example-extractor"
dependencies:
Expand All @@ -2689,15 +2659,7 @@ __metadata:
languageName: unknown
linkType: soft

"@jupyter-lsp/jupyterlab-lsp-klingon-integration@portal:../_klingon-integration::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/jupyterlab-lsp-klingon-integration@portal:../_klingon-integration::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage"
dependencies:
"@jupyterlab/application": ^4.0.0
languageName: node
linkType: soft

"@jupyter-lsp/jupyterlab-lsp-klingon-integration@workspace:packages/_klingon-integration":
"@jupyter-lsp/jupyterlab-lsp-klingon-integration@workspace:*, @jupyter-lsp/jupyterlab-lsp-klingon-integration@workspace:packages/_klingon-integration":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/jupyterlab-lsp-klingon-integration@workspace:packages/_klingon-integration"
dependencies:
Expand All @@ -2711,19 +2673,19 @@ __metadata:
version: 0.0.0-use.local
resolution: "@jupyter-lsp/jupyterlab-lsp-metapackage@workspace:packages/metapackage"
dependencies:
"@jupyter-lsp/code-jumpers": "portal:../code-jumpers"
"@jupyter-lsp/completion-theme": "portal:../completion-theme"
"@jupyter-lsp/jupyterlab-lsp": "portal:../jupyterlab-lsp"
"@jupyter-lsp/jupyterlab-lsp-example-extractor": "portal:../_example-extractor"
"@jupyter-lsp/jupyterlab-lsp-klingon-integration": "portal:../_klingon-integration"
"@jupyter-lsp/theme-material": "portal:../theme-material"
"@jupyter-lsp/theme-vscode": "portal:../theme-vscode"
"@jupyter-lsp/code-jumpers": "workspace:*"
"@jupyter-lsp/completion-theme": "workspace:*"
"@jupyter-lsp/jupyterlab-lsp": "workspace:*"
"@jupyter-lsp/jupyterlab-lsp-example-extractor": "workspace:*"
"@jupyter-lsp/jupyterlab-lsp-klingon-integration": "workspace:*"
"@jupyter-lsp/theme-material": "workspace:*"
"@jupyter-lsp/theme-vscode": "workspace:*"
rimraf: ^3.0.0
typescript: ~5.0.4
languageName: unknown
linkType: soft

"@jupyter-lsp/jupyterlab-lsp@^4.0.0-alpha.0, @jupyter-lsp/jupyterlab-lsp@workspace:packages/jupyterlab-lsp":
"@jupyter-lsp/jupyterlab-lsp@^4.0.0-alpha.0, @jupyter-lsp/jupyterlab-lsp@workspace:*, @jupyter-lsp/jupyterlab-lsp@workspace:packages/jupyterlab-lsp":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/jupyterlab-lsp@workspace:packages/jupyterlab-lsp"
dependencies:
Expand Down Expand Up @@ -2792,66 +2754,15 @@ __metadata:
languageName: unknown
linkType: soft

"@jupyter-lsp/jupyterlab-lsp@portal:../jupyterlab-lsp::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/jupyterlab-lsp@portal:../jupyterlab-lsp::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage"
dependencies:
"@jupyter-lsp/code-jumpers": ~1.2.0
"@jupyter-lsp/completion-theme": ~3.3.0
"@jupyter-lsp/theme-material": ~2.1.1
"@jupyter-lsp/theme-vscode": ~2.1.1
"@jupyterlab/lsp": ^4.0.0
lodash.mergewith: ^4.6.1
peerDependencies:
"@codemirror/state": "*"
"@codemirror/view": "*"
"@jupyterlab/application": ^4.0.0
"@jupyterlab/apputils": ^4.0.0
"@jupyterlab/cells": ^4.0.0
"@jupyterlab/codeeditor": ^4.0.0
"@jupyterlab/codemirror": ^4.0.0
"@jupyterlab/completer": ^3.3.0
"@jupyterlab/coreutils": ^6.0.0
"@jupyterlab/docmanager": ^4.0.0
"@jupyterlab/docregistry": ^4.0.0
"@jupyterlab/fileeditor": ^4.0.0
"@jupyterlab/notebook": ^4.0.0
"@jupyterlab/rendermime": ^4.0.0
"@jupyterlab/services": ^7.0.0
"@jupyterlab/statusbar": ^4.0.0
"@jupyterlab/tooltip": ^4.0.0
"@jupyterlab/ui-components": ^4.0.0
"@lumino/algorithm": "*"
"@lumino/widgets": ^2.0.0
react: "*"
languageName: node
linkType: soft

"@jupyter-lsp/theme-material@portal:../theme-material::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/theme-material@portal:../theme-material::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage"
dependencies:
"@jupyter-lsp/completion-theme": ^3.0.0
languageName: node
linkType: soft

"@jupyter-lsp/theme-material@workspace:packages/theme-material, @jupyter-lsp/theme-material@~2.1.1":
"@jupyter-lsp/theme-material@workspace:*, @jupyter-lsp/theme-material@workspace:packages/theme-material, @jupyter-lsp/theme-material@~2.1.1":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/theme-material@workspace:packages/theme-material"
dependencies:
"@jupyter-lsp/completion-theme": ^3.0.0
languageName: unknown
linkType: soft

"@jupyter-lsp/theme-vscode@portal:../theme-vscode::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/theme-vscode@portal:../theme-vscode::locator=%40jupyter-lsp%2Fjupyterlab-lsp-metapackage%40workspace%3Apackages%2Fmetapackage"
dependencies:
"@jupyter-lsp/completion-theme": ^3.0.0
languageName: node
linkType: soft

"@jupyter-lsp/theme-vscode@workspace:packages/theme-vscode, @jupyter-lsp/theme-vscode@~2.1.1":
"@jupyter-lsp/theme-vscode@workspace:*, @jupyter-lsp/theme-vscode@workspace:packages/theme-vscode, @jupyter-lsp/theme-vscode@~2.1.1":
version: 0.0.0-use.local
resolution: "@jupyter-lsp/theme-vscode@workspace:packages/theme-vscode"
dependencies:
Expand Down

0 comments on commit 17b886c

Please sign in to comment.