From 176975679d9e38d5dea90a7f1f829ac5c1e0dd7c Mon Sep 17 00:00:00 2001 From: krassowski <5832902+krassowski@users.noreply.github.com> Date: Mon, 26 Sep 2022 23:48:12 +0100 Subject: [PATCH] Change NPM namespace to @jupyter-lsp --- .github/workflows/job.test.yml | 2 +- CHANGELOG.md | 3 +- atest/05_Features/Signature.robot | 2 +- atest/Keywords.resource | 2 +- atest/Variables.resource | 10 +-- docs/Installation.ipynb | 2 +- package.json | 12 ++-- packages/_example-extractor/package.json | 6 +- packages/_example-extractor/src/api.spec.ts | 2 +- packages/_example-extractor/src/index.ts | 10 +-- packages/_klingon-integration/package.json | 6 +- packages/_klingon-integration/src/index.ts | 2 +- packages/code-jumpers/package.json | 4 +- packages/completion-theme/package.json | 4 +- packages/completion-theme/src/index.ts | 5 +- packages/completion-theme/src/types.ts | 2 +- packages/jupyterlab-lsp/jest.config.js | 2 +- packages/jupyterlab-lsp/package.json | 14 ++-- .../src/features/completion/completion.ts | 2 +- .../features/completion/completion_handler.ts | 8 +-- .../src/features/completion/index.ts | 2 +- .../jupyterlab-lsp/src/features/jump_to.ts | 10 +-- packages/jupyterlab-lsp/src/index.ts | 6 +- packages/jupyterlab-lsp/src/tokens.ts | 2 +- packages/lsp-ws-connection/package.json | 4 +- packages/metapackage/package.json | 18 ++--- packages/metapackage/src/index.ts | 14 ++-- packages/theme-material/package.json | 6 +- packages/theme-material/src/index.ts | 6 +- packages/theme-vscode/package.json | 6 +- packages/theme-vscode/src/index.ts | 6 +- .../jupyterlab_lsp/jupyterlab_lsp/__init__.py | 4 +- .../jupyterlab_lsp/jupyterlab_lsp/_paths.py | 2 +- python_packages/jupyterlab_lsp/setup.py | 4 +- .../klingon_ls_specification/setup.py | 2 +- scripts/distcheck.py | 2 +- scripts/integrity.py | 6 +- yarn.lock | 72 +++++++++---------- 38 files changed, 134 insertions(+), 138 deletions(-) diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index 5ba83cf82..bab4c95a2 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -457,7 +457,7 @@ jobs: - name: Install the server package run: cd dist && python -m pip install -vv jupyter_lsp*.whl - name: install the source extension - run: cd dist && jupyter labextension install krassowski-jupyterlab-lsp-*.tgz --log-level DEBUG + run: cd dist && jupyter labextension install jupyter-lsp-jupyterlab-lsp-*.tgz --log-level DEBUG - name: Validate the install run: | set -eux diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c16973f2..49e2d0678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## Changelog -### `@krassowski/jupyterlab-lsp 4.0.0` (not-yet-released) +### `@jupyter-lsp/jupyterlab-lsp 4.0.0-alpha.0` (not-yet-released) - features: - implement jump target selector and jump to references ([#739]) @@ -11,6 +11,7 @@ - fix `undefined` being inserted for path-like completion items with no `insertText` ([#833]) - reduce signature flickering when typing and hover flicker when moving mouse ([#836]) - refactoring: + - changed NPM packages namespace from `@krassowski` to `@jupyter-lsp` ([#862]) - move client capabilities to features ([#738]) - documentation: - add missing `--channel` to conda instruction for texlab ([#789], thanks @justin-f-perez) diff --git a/atest/05_Features/Signature.robot b/atest/05_Features/Signature.robot index ae2859b4c..4001d9c16 100644 --- a/atest/05_Features/Signature.robot +++ b/atest/05_Features/Signature.robot @@ -9,7 +9,7 @@ Force Tags feature:signature *** Variables *** -${SIGNATURE PLUGIN ID} @krassowski/jupyterlab-lsp:signature +${SIGNATURE PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:signature ${SIGNATURE_BOX} css:.lsp-signature-help ${SIGNATURE_HIGHLIGHTED_ARG} css:.lsp-signature-help mark ${SIGNATURE_DETAILS_CSS} .lsp-signature-help details diff --git a/atest/Keywords.resource b/atest/Keywords.resource index 2c5575a8f..6386f7c5b 100644 --- a/atest/Keywords.resource +++ b/atest/Keywords.resource @@ -90,7 +90,7 @@ Initialize User Settings Reset Plugin Settings [Arguments] ${package}=jupyterlab-lsp ${plugin}=plugin - ${LSP PLUGIN SETTINGS FILE} = Set Variable @krassowski${/}${package}${/}${plugin}.jupyterlab-settings + ${LSP PLUGIN SETTINGS FILE} = Set Variable @jupyter-lsp${/}${package}${/}${plugin}.jupyterlab-settings Create File ${SETTINGS DIR}${/}${LSP PLUGIN SETTINGS FILE} {} Tear Down Everything diff --git a/atest/Variables.resource b/atest/Variables.resource index 41e8c85ab..0d3c7aba7 100644 --- a/atest/Variables.resource +++ b/atest/Variables.resource @@ -52,11 +52,11 @@ ${CM CURSOR} css:.CodeMirror-cursor ${CM CURSORS} ... css:.jp-MainAreaWidget:not(.lm-mod-hidden) .CodeMirror-cursors:not([style='visibility: hidden']) # settings -${LSP PLUGIN ID} @krassowski/jupyterlab-lsp:plugin -${COMPLETION PLUGIN ID} @krassowski/jupyterlab-lsp:completion -${HIGHLIGHTS PLUGIN ID} @krassowski/jupyterlab-lsp:highlights -${JUMP PLUGIN ID} @krassowski/jupyterlab-lsp:jump_to -${DIAGNOSTICS PLUGIN ID} @krassowski/jupyterlab-lsp:diagnostics +${LSP PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:plugin +${COMPLETION PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:completion +${HIGHLIGHTS PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:highlights +${JUMP PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:jump_to +${DIAGNOSTICS PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:diagnostics ${CSS USER SETTINGS} .jp-SettingsRawEditor-user ${JLAB XP CLOSE SETTINGS} ... ${JLAB XP DOCK TAB}\[contains(., 'Settings')]/*[contains(@class, 'm-TabBar-tabCloseIcon')] diff --git a/docs/Installation.ipynb b/docs/Installation.ipynb index d940b6cfd..a5f6775d8 100644 --- a/docs/Installation.ipynb +++ b/docs/Installation.ipynb @@ -214,7 +214,7 @@ " 'chktex' \\\n", " 'jupyter-lsp={JUPYTER_LSP_VERSION}' \\\n", " && jupyter labextension install --no-build \\\n", - " '@krassowski/jupyterlab-lsp@{JUPYTERLAB_LSP_VERSION}' \\\n", + " '@jupyter-lsp/jupyterlab-lsp@{JUPYTERLAB_LSP_VERSION}' \\\n", " && jupyter lab build --dev-build=False --minimize=True \\\n", " && conda clean --all -f -y \\\n", " && rm -rf \\\n", diff --git a/package.json b/package.json index dd1ce4d42..20ec61d6f 100644 --- a/package.json +++ b/package.json @@ -45,14 +45,14 @@ "bootstrap": "jlpm --no-optional --prefer-offline && lerna bootstrap && jlpm clean && jlpm build && jlpm lint", "build": "jlpm build:schema && jlpm build:meta && jlpm build:ws && jlpm build:labextension", "build:schema": "lerna run build:schema --stream", - "build:meta": "lerna run build --stream --scope @krassowski/jupyterlab-lsp-metapackage", + "build:meta": "lerna run build --stream --scope @jupyter-lsp/jupyterlab-lsp-metapackage", "build:labextension": "lerna run build:labextension --stream", - "build:completion-theme": "lerna run build --stream --scope @krassowski/completion-theme", - "build:theme-vscode": "lerna run build --stream --scope @krassowski/theme-vscode", - "build:theme-material": "lerna run build --stream --scope @krassowski/theme-material", - "build:jupyterlab-lsp": "lerna run build --stream --scope @krassowski/jupyterlab-lsp", + "build:completion-theme": "lerna run build --stream --scope @jupyter-lsp/completion-theme", + "build:theme-vscode": "lerna run build --stream --scope @jupyter-lsp/theme-vscode", + "build:theme-material": "lerna run build --stream --scope @jupyter-lsp/theme-material", + "build:jupyterlab-lsp": "lerna run build --stream --scope @jupyter-lsp/jupyterlab-lsp", "build:ws": "lerna run build --stream --scope lsp-ws-connection", - "build:jump": "lerna run build --stream --scope @krassowski/code-jumpers", + "build:jump": "lerna run build --stream --scope @jupyter-lsp/code-jumpers", "watch": "lerna run --parallel watch", "bundle": "lerna run --parallel bundle", "clean": "lerna run --parallel clean", diff --git a/packages/_example-extractor/package.json b/packages/_example-extractor/package.json index 0d2649d13..c9a096087 100644 --- a/packages/_example-extractor/package.json +++ b/packages/_example-extractor/package.json @@ -1,6 +1,6 @@ { - "name": "@krassowski/jupyterlab-lsp-example-extractor", - "description": "Example extractor package from @krassowski/jupyterlab-lsp", + "name": "@jupyter-lsp/jupyterlab-lsp-example-extractor", + "description": "Example extractor package from @jupyter-lsp/jupyterlab-lsp", "version": "0.0.0", "private": true, "main": "lib/index.js", @@ -10,7 +10,7 @@ "lib/**/*.{js,ts}" ], "dependencies": { - "@krassowski/jupyterlab-lsp": "^3.6" + "@jupyter-lsp/jupyterlab-lsp": "^4.0.0-alpha.0" }, "devDependencies": { "@babel/preset-env": "^7.4.3", diff --git a/packages/_example-extractor/src/api.spec.ts b/packages/_example-extractor/src/api.spec.ts index 388cc1eec..e33dd4afd 100644 --- a/packages/_example-extractor/src/api.spec.ts +++ b/packages/_example-extractor/src/api.spec.ts @@ -1,4 +1,4 @@ -import { IExtractedCode } from '@krassowski/jupyterlab-lsp'; +import { IExtractedCode } from '@jupyter-lsp/jupyterlab-lsp'; import { expect } from 'chai'; import { extractor } from '.'; diff --git a/packages/_example-extractor/src/index.ts b/packages/_example-extractor/src/index.ts index 5252ad1a1..9a6d9ee2e 100644 --- a/packages/_example-extractor/src/index.ts +++ b/packages/_example-extractor/src/index.ts @@ -1,13 +1,13 @@ +import { + ILSPCodeExtractorsManager, + RegExpForeignCodeExtractor +} from '@jupyter-lsp/jupyterlab-lsp'; import { JupyterFrontEnd, JupyterFrontEndPlugin } from '@jupyterlab/application'; -import { - ILSPCodeExtractorsManager, - RegExpForeignCodeExtractor -} from '@krassowski/jupyterlab-lsp'; -const NS = '@krassowski/jupyterlab-lsp-example-extractor'; +const NS = '@jupyter-lsp/jupyterlab-lsp-example-extractor'; export const extractor = new RegExpForeignCodeExtractor({ language: 'foo', diff --git a/packages/_klingon-integration/package.json b/packages/_klingon-integration/package.json index c363d8531..b2886afe5 100644 --- a/packages/_klingon-integration/package.json +++ b/packages/_klingon-integration/package.json @@ -1,6 +1,6 @@ { - "name": "@krassowski/jupyterlab-lsp-klingon-integration", - "description": "Klingon language integration for testing @krassowski/jupyterlab-lsp", + "name": "@jupyter-lsp/jupyterlab-lsp-klingon-integration", + "description": "Klingon language integration for testing @jupyter-lsp/jupyterlab-lsp", "version": "0.0.0", "private": true, "main": "lib/index.js", @@ -20,7 +20,7 @@ }, "jupyterlab": { "extension": true, - "outputDir": "../../python_packages/klingon_ls_specification/klingon_ls_specification/labextensions/@krassowski/jupyterlab-lsp-klingon-integration" + "outputDir": "../../python_packages/klingon_ls_specification/klingon_ls_specification/labextensions/@jupyter-lsp/jupyterlab-lsp-klingon-integration" }, "scripts": { "build": "jlpm run build:lib && jlpm run build:labextension", diff --git a/packages/_klingon-integration/src/index.ts b/packages/_klingon-integration/src/index.ts index 49b41d3f8..27b234516 100644 --- a/packages/_klingon-integration/src/index.ts +++ b/packages/_klingon-integration/src/index.ts @@ -3,7 +3,7 @@ import { JupyterFrontEndPlugin } from '@jupyterlab/application'; -const NS = '@krassowski/jupyterlab-lsp-klingon-integration'; +const NS = '@jupyter-lsp/jupyterlab-lsp-klingon-integration'; const plugin: JupyterFrontEndPlugin = { id: `${NS}:PLUGIN`, diff --git a/packages/code-jumpers/package.json b/packages/code-jumpers/package.json index fe4cbe166..d8b415161 100644 --- a/packages/code-jumpers/package.json +++ b/packages/code-jumpers/package.json @@ -1,5 +1,5 @@ { - "name": "@krassowski/code-jumpers", + "name": "@jupyter-lsp/code-jumpers", "version": "1.2.0", "description": "Implementation underlying the jump to definition functionality in JupyterLab-LSP", "keywords": [ @@ -56,6 +56,6 @@ }, "jupyterlab": { "extension": false, - "outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@krassowski/code-jumpers" + "outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@jupyter-lsp/code-jumpers" } } diff --git a/packages/completion-theme/package.json b/packages/completion-theme/package.json index bc9260508..4ed5e7331 100644 --- a/packages/completion-theme/package.json +++ b/packages/completion-theme/package.json @@ -1,5 +1,5 @@ { - "name": "@krassowski/completion-theme", + "name": "@jupyter-lsp/completion-theme", "version": "3.3.0", "description": "Completion theme manager for JupyterLab-LSP", "keywords": [ @@ -42,6 +42,6 @@ "jupyterlab": { "extension": true, "schemaDir": "schema", - "outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@krassowski/completion-theme" + "outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@jupyter-lsp/completion-theme" } } diff --git a/packages/completion-theme/src/index.ts b/packages/completion-theme/src/index.ts index 356a600ca..2fd3d7ae8 100644 --- a/packages/completion-theme/src/index.ts +++ b/packages/completion-theme/src/index.ts @@ -19,6 +19,7 @@ import { KernelKind, PLUGIN_ID } from './types'; +export * from './types'; export class CompletionThemeManager implements ILSPCompletionThemeManager { protected current_icons: Map; @@ -173,8 +174,6 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager { } } -const LSP_CATEGORY = 'Language server protocol'; - export const COMPLETION_THEME_MANAGER: JupyterFrontEndPlugin = { id: PLUGIN_ID, @@ -195,7 +194,7 @@ export const COMPLETION_THEME_MANAGER: JupyterFrontEndPlugin( PLUGIN_ID + ':ILSPFeatureManager' diff --git a/packages/lsp-ws-connection/package.json b/packages/lsp-ws-connection/package.json index 7fc131e45..035620f99 100644 --- a/packages/lsp-ws-connection/package.json +++ b/packages/lsp-ws-connection/package.json @@ -24,8 +24,8 @@ "lsp", "languageserver" ], - "homepage": "https://github.com/krassowski/jupyterlab-lsp/tree/master/packages/lsp-ws-connection", - "repository": "github:krassowski/jupyterlab-lsp", + "homepage": "https://github.com/jupyter-lsp/jupyterlab-lsp/tree/master/packages/lsp-ws-connection", + "repository": "github:jupyter-lsp/jupyterlab-lsp", "dependencies": { "vscode-languageserver-protocol": "^3.16.0", "vscode-languageserver-types": "^3.16.0", diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json index 38baabe02..b1039ed41 100644 --- a/packages/metapackage/package.json +++ b/packages/metapackage/package.json @@ -1,6 +1,6 @@ { - "name": "@krassowski/jupyterlab-lsp-metapackage", - "version": "3.10.1", + "name": "@jupyter-lsp/jupyterlab-lsp-metapackage", + "version": "4.0.0-alpha.0", "description": "JupyterLab LSP - Meta Package. All of the packages used by JupyterLab LSP", "homepage": "https://github.com/jupyter-lsp/jupyterlab-lsp", "bugs": { @@ -26,13 +26,13 @@ "watch": "tsc -b --watch --preserveWatchOutput" }, "dependencies": { - "@krassowski/code-jumpers": "file:../code-jumpers", - "@krassowski/completion-theme": "file:../completion-theme", - "@krassowski/jupyterlab-lsp": "file:../jupyterlab-lsp", - "@krassowski/jupyterlab-lsp-example-extractor": "file:../_example-extractor", - "@krassowski/jupyterlab-lsp-klingon-integration": "file:../_klingon-integration", - "@krassowski/theme-material": "file:../theme-material", - "@krassowski/theme-vscode": "file:../theme-vscode", + "@jupyter-lsp/code-jumpers": "file:../code-jumpers", + "@jupyter-lsp/completion-theme": "file:../completion-theme", + "@jupyter-lsp/jupyterlab-lsp": "file:../jupyterlab-lsp", + "@jupyter-lsp/jupyterlab-lsp-example-extractor": "file:../_example-extractor", + "@jupyter-lsp/jupyterlab-lsp-klingon-integration": "file:../_klingon-integration", + "@jupyter-lsp/theme-material": "file:../theme-material", + "@jupyter-lsp/theme-vscode": "file:../theme-vscode", "lsp-ws-connection": "file:../lsp-ws-connection" }, "devDependencies": { diff --git a/packages/metapackage/src/index.ts b/packages/metapackage/src/index.ts index 7d3c5d0f8..9ce38b9b2 100644 --- a/packages/metapackage/src/index.ts +++ b/packages/metapackage/src/index.ts @@ -1,8 +1,8 @@ -import '@krassowski/code-jumpers'; -import '@krassowski/completion-theme'; -import '@krassowski/jupyterlab-lsp'; -import '@krassowski/jupyterlab-lsp-example-extractor'; -import '@krassowski/jupyterlab-lsp-klingon-integration'; -import '@krassowski/theme-material'; -import '@krassowski/theme-vscode'; +import '@jupyter-lsp/code-jumpers'; +import '@jupyter-lsp/completion-theme'; +import '@jupyter-lsp/jupyterlab-lsp'; +import '@jupyter-lsp/jupyterlab-lsp-example-extractor'; +import '@jupyter-lsp/jupyterlab-lsp-klingon-integration'; +import '@jupyter-lsp/theme-material'; +import '@jupyter-lsp/theme-vscode'; import 'lsp-ws-connection'; diff --git a/packages/theme-material/package.json b/packages/theme-material/package.json index 3b7ad76f8..48546f4d3 100644 --- a/packages/theme-material/package.json +++ b/packages/theme-material/package.json @@ -1,5 +1,5 @@ { - "name": "@krassowski/theme-material", + "name": "@jupyter-lsp/theme-material", "version": "2.1.1", "description": "Material theme for JupyterLab-LSP", "keywords": [ @@ -33,13 +33,13 @@ "clean": "rimraf lib" }, "dependencies": { - "@krassowski/completion-theme": "^3.0.0" + "@jupyter-lsp/completion-theme": "^3.0.0" }, "devDependencies": {}, "peerDependencies": {}, "jupyterlab": { "extension": true, "schemaDir": "schema", - "outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@krassowski/theme-material" + "outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@jupyter-lsp/theme-material" } } diff --git a/packages/theme-material/src/index.ts b/packages/theme-material/src/index.ts index 7b7607663..9ee39573e 100644 --- a/packages/theme-material/src/index.ts +++ b/packages/theme-material/src/index.ts @@ -1,10 +1,10 @@ import '../style/completer.css'; -import { JupyterFrontEndPlugin } from '@jupyterlab/application'; import { ICompletionIconSet, ICompletionTheme, ILSPCompletionThemeManager -} from '@krassowski/completion-theme/lib/types'; +} from '@jupyter-lsp/completion-theme'; +import { JupyterFrontEndPlugin } from '@jupyterlab/application'; import alpha_t_over_code from '../style/icons/alpha-t-and-code.svg'; import alphabetical from '../style/icons/alphabetical.svg'; @@ -78,7 +78,7 @@ export const plugin: JupyterFrontEndPlugin = { // while for now it only styles completion, // we may decide to allow styling of more // components, reusing these plugins. - id: '@krassowski/theme-material', + id: '@jupyter-lsp/theme-material', requires: [ILSPCompletionThemeManager], activate: (app, completionThemeManager: ILSPCompletionThemeManager) => { completionThemeManager.register_theme(completionTheme); diff --git a/packages/theme-vscode/package.json b/packages/theme-vscode/package.json index 11aa699c8..ca2152874 100644 --- a/packages/theme-vscode/package.json +++ b/packages/theme-vscode/package.json @@ -1,5 +1,5 @@ { - "name": "@krassowski/theme-vscode", + "name": "@jupyter-lsp/theme-vscode", "version": "2.1.1", "description": "VSCode theme for JupyterLab-LSP", "keywords": [ @@ -33,13 +33,13 @@ "clean": "rimraf lib" }, "dependencies": { - "@krassowski/completion-theme": "^3.0.0" + "@jupyter-lsp/completion-theme": "^3.0.0" }, "devDependencies": {}, "peerDependencies": {}, "jupyterlab": { "extension": true, "schemaDir": "schema", - "outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@krassowski/theme-vscode" + "outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@jupyter-lsp/theme-vscode" } } diff --git a/packages/theme-vscode/src/index.ts b/packages/theme-vscode/src/index.ts index cee396aeb..2d086750f 100644 --- a/packages/theme-vscode/src/index.ts +++ b/packages/theme-vscode/src/index.ts @@ -1,9 +1,9 @@ -import { JupyterFrontEndPlugin } from '@jupyterlab/application'; import { ICompletionIconSet, ICompletionTheme, ILSPCompletionThemeManager -} from '@krassowski/completion-theme/lib/types'; +} from '@jupyter-lsp/completion-theme'; +import { JupyterFrontEndPlugin } from '@jupyterlab/application'; import '../style/completer.css'; import dark_file from '../style/icons/dark/file.svg'; @@ -129,7 +129,7 @@ const completionTheme: ICompletionTheme = { }; export const plugin: JupyterFrontEndPlugin = { - id: '@krassowski/theme-vscode', + id: '@jupyter-lsp/theme-vscode', requires: [ILSPCompletionThemeManager], activate: (app, completionThemeManager: ILSPCompletionThemeManager) => { completionThemeManager.register_theme(completionTheme); diff --git a/python_packages/jupyterlab_lsp/jupyterlab_lsp/__init__.py b/python_packages/jupyterlab_lsp/jupyterlab_lsp/__init__.py index ce35e8dde..3c4e4ac96 100644 --- a/python_packages/jupyterlab_lsp/jupyterlab_lsp/__init__.py +++ b/python_packages/jupyterlab_lsp/jupyterlab_lsp/__init__.py @@ -5,7 +5,7 @@ def _jupyter_labextension_paths(): return [ { - "src": "labextensions/@krassowski/jupyterlab-lsp", - "dest": "@krassowski/jupyterlab-lsp", + "src": "labextensions/@jupyter-lsp/jupyterlab-lsp", + "dest": "@jupyter-lsp/jupyterlab-lsp", } ] diff --git a/python_packages/jupyterlab_lsp/jupyterlab_lsp/_paths.py b/python_packages/jupyterlab_lsp/jupyterlab_lsp/_paths.py index 568ac7fa0..5ca237717 100644 --- a/python_packages/jupyterlab_lsp/jupyterlab_lsp/_paths.py +++ b/python_packages/jupyterlab_lsp/jupyterlab_lsp/_paths.py @@ -1,4 +1,4 @@ from pathlib import Path LAB_EXTENSION_PATH = Path(__file__).parent / "labextensions" -MAIN_PACKAGE_PATH = LAB_EXTENSION_PATH / "@krassowski" / "jupyterlab-lsp" +MAIN_PACKAGE_PATH = LAB_EXTENSION_PATH / "@jupyter-lsp" / "jupyterlab-lsp" diff --git a/python_packages/jupyterlab_lsp/setup.py b/python_packages/jupyterlab_lsp/setup.py index 78d27750e..fbf698d8d 100644 --- a/python_packages/jupyterlab_lsp/setup.py +++ b/python_packages/jupyterlab_lsp/setup.py @@ -6,7 +6,7 @@ LABEXTENSIONS_DIR = Path("jupyterlab_lsp/labextensions") LABEXTENSIONS_INSTALL_DIR = Path("share") / "jupyter" / "labextensions" -LAB_PACKAGE_PATH = LABEXTENSIONS_DIR / "@krassowski" / "jupyterlab-lsp" / "package.json" +LAB_PACKAGE_PATH = LABEXTENSIONS_DIR / "@jupyter-lsp" / "jupyterlab-lsp" / "package.json" def get_data_files(): @@ -20,7 +20,7 @@ def get_data_files(): extension_files.append( ( - str(LABEXTENSIONS_INSTALL_DIR / "@krassowski" / "jupyterlab-lsp"), + str(LABEXTENSIONS_INSTALL_DIR / "@jupyter-lsp" / "jupyterlab-lsp"), ["jupyterlab_lsp/install.json"], ) ) diff --git a/python_packages/klingon_ls_specification/setup.py b/python_packages/klingon_ls_specification/setup.py index 51f9c1272..6f89861c3 100644 --- a/python_packages/klingon_ls_specification/setup.py +++ b/python_packages/klingon_ls_specification/setup.py @@ -6,7 +6,7 @@ LABEXTENSIONS_INSTALL_DIR = Path("share") / "jupyter" / "labextensions" LAB_PACKAGE_PATH = ( LABEXTENSIONS_DIR - / "@krassowski" + / "@jupyter-lsp" / "jupyterlab-lsp-klingon-integration" / "package.json" ) diff --git a/scripts/distcheck.py b/scripts/distcheck.py index 52c2fe358..732488aab 100644 --- a/scripts/distcheck.py +++ b/scripts/distcheck.py @@ -26,7 +26,7 @@ # just one, for now LABEXTENSION_PATHS = [ - "jupyterlab_lsp/jupyterlab_lsp/labextensions/@krassowski/jupyterlab-lsp" + "jupyterlab_lsp/jupyterlab_lsp/labextensions/@jupyter-lsp/jupyterlab-lsp" ] diff --git a/scripts/integrity.py b/scripts/integrity.py index addac7677..b60320b66 100644 --- a/scripts/integrity.py +++ b/scripts/integrity.py @@ -47,7 +47,7 @@ CONTRIBUTING = ROOT / "CONTRIBUTING.md" # TS stuff -NPM_NS = "@krassowski" +NPM_NS = "@jupyter-lsp" PACKAGES = { package["name"]: [path.parent, package] for path, package in [ @@ -61,9 +61,6 @@ JS_LSP_NAME = f"{NPM_NS}/jupyterlab-lsp" JS_LSP_VERSION = PACKAGES[JS_LSP_NAME][1]["version"] -JS_CJS_NAME = f"{NPM_NS}/code-jumpers" -JS_CJS_VERSION = PACKAGES[JS_CJS_NAME][1]["version"] - PY_PATH = ROOT / "python_packages" PY_SERVER_PATH = PY_PATH / "jupyter_lsp" PY_FRONT_PATH = PY_PATH / "jupyterlab_lsp" @@ -175,7 +172,6 @@ def test_jlab_versions(path): [ [PY_SERVER_NAME, Version(PY_SERVER_VERSION).base_version], [JS_LSP_NAME, JS_LSP_VERSION], - [JS_CJS_NAME, JS_CJS_VERSION], ], ) def test_changelog_versions(pkg, version): diff --git a/yarn.lock b/yarn.lock index 8f984d76d..7be924599 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1444,6 +1444,42 @@ resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60" integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA== +"@jupyter-lsp/code-jumpers@file:packages/code-jumpers": + version "1.2.0" + +"@jupyter-lsp/completion-theme@file:packages/completion-theme": + version "3.3.0" + +"@jupyter-lsp/jupyterlab-lsp-example-extractor@file:packages/_example-extractor": + version "0.0.0" + dependencies: + "@jupyter-lsp/jupyterlab-lsp" "^4.0" + +"@jupyter-lsp/jupyterlab-lsp-klingon-integration@file:packages/_klingon-integration": + version "0.0.0" + dependencies: + "@jupyterlab/application" "^3.1.0" + +"@jupyter-lsp/jupyterlab-lsp@file:packages/jupyterlab-lsp": + version "4.0.0" + 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" + lodash.mergewith "^4.6.1" + lsp-ws-connection "~0.7.0" + +"@jupyter-lsp/theme-material@file:packages/theme-material": + version "2.1.1" + dependencies: + "@jupyter-lsp/completion-theme" "^3.0.0" + +"@jupyter-lsp/theme-vscode@file:packages/theme-vscode": + version "2.1.1" + dependencies: + "@jupyter-lsp/completion-theme" "^3.0.0" + "@jupyterlab/application@^3.0.0": version "3.2.5" resolved "https://registry.yarnpkg.com/@jupyterlab/application/-/application-3.2.5.tgz#1d53842e3a7f6325afe144aa6a3066aced700fbb" @@ -2351,42 +2387,6 @@ react-dom "^17.0.1" typestyle "^2.0.4" -"@krassowski/code-jumpers@file:packages/code-jumpers": - version "1.2.0" - -"@krassowski/completion-theme@file:packages/completion-theme": - version "3.3.0" - -"@krassowski/jupyterlab-lsp-example-extractor@file:packages/_example-extractor": - version "0.0.0" - dependencies: - "@krassowski/jupyterlab-lsp" "^3.6" - -"@krassowski/jupyterlab-lsp-klingon-integration@file:packages/_klingon-integration": - version "0.0.0" - dependencies: - "@jupyterlab/application" "^3.1.0" - -"@krassowski/jupyterlab-lsp@file:packages/jupyterlab-lsp": - version "3.10.1" - dependencies: - "@krassowski/code-jumpers" "~1.2.0" - "@krassowski/completion-theme" "~3.3.0" - "@krassowski/theme-material" "~2.1.1" - "@krassowski/theme-vscode" "~2.1.1" - lodash.mergewith "^4.6.1" - lsp-ws-connection "~0.7.0" - -"@krassowski/theme-material@file:packages/theme-material": - version "2.1.1" - dependencies: - "@krassowski/completion-theme" "^3.0.0" - -"@krassowski/theme-vscode@file:packages/theme-vscode": - version "2.1.1" - dependencies: - "@krassowski/completion-theme" "^3.0.0" - "@lerna/add@5.4.3": version "5.4.3" resolved "https://registry.yarnpkg.com/@lerna/add/-/add-5.4.3.tgz#633e3ddaf342fd1b04161439a266aed9fb37e82e"