diff --git a/advanced/kernel-messaging/install.json b/advanced/kernel-messaging/install.json new file mode 100644 index 00000000..97ae33da --- /dev/null +++ b/advanced/kernel-messaging/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_kernel_messaging", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_kernel_messaging" +} diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index 72a984dd..d675eaf1 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -25,29 +25,30 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_kernel_messaging/static", + "clean:labextension": "rimraf jupyterlab_examples_kernel_messaging/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/nbformat": "^3.0.0-rc.2", - "@jupyterlab/translation": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/nbformat": "^3.0.0-rc.7", + "@jupyterlab/translation": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", @@ -55,7 +56,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-messaging/setup.py b/advanced/kernel-messaging/setup.py index 74f5d69b..754f3005 100644 --- a/advanced/kernel-messaging/setup.py +++ b/advanced/kernel-messaging/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_kernel_messaging setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_kernel_messaging" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/kernel-messaging" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/advanced/kernel-output/install.json b/advanced/kernel-output/install.json new file mode 100644 index 00000000..4b8ad737 --- /dev/null +++ b/advanced/kernel-output/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_kernel_output", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_kernel_output" +} diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 51c833ef..e52dfbcd 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -25,36 +25,37 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_kernel_output/static", + "clean:labextension": "rimraf jupyterlab_examples_kernel_output/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/outputarea": "^3.0.0-rc.2", - "@jupyterlab/translation": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/outputarea": "^3.0.0-rc.7", + "@jupyterlab/translation": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-output/setup.py b/advanced/kernel-output/setup.py index 6882deef..246977cd 100644 --- a/advanced/kernel-output/setup.py +++ b/advanced/kernel-output/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_kernel_output setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_kernel_output" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/kernel-output" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/advanced/server-extension/install.json b/advanced/server-extension/install.json new file mode 100644 index 00000000..772fb6ad --- /dev/null +++ b/advanced/server-extension/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jlab_ext_example", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jlab_ext_example" +} diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index 2c08b6d8..f6bf7f1c 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -25,31 +25,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jlab_ext_example/static", + "clean:labextension": "rimraf jlab_ext_example/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/coreutils": "^5.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/services": "^6.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/coreutils": "^5.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/services": "^6.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py index 7ab40eb3..88abcd2d 100644 --- a/advanced/server-extension/setup.py +++ b/advanced/server-extension/setup.py @@ -1,6 +1,7 @@ """ jlab_ext_example setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jlab_ext_example" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/server-extension" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"),("etc/jupyter/jupyter_server_config.d", + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"),("etc/jupyter/jupyter_server_config.d", "jupyter-config", "jlab_ext_example.json"), ] @@ -45,7 +48,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/basics/datagrid/install.json b/basics/datagrid/install.json new file mode 100644 index 00000000..d35e2f7a --- /dev/null +++ b/basics/datagrid/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_datagrid", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_datagrid" +} diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index 41b0325c..b74f0630 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -25,34 +25,35 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_datagrid/static", + "clean:labextension": "rimraf jupyterlab_examples_datagrid/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/translation": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/translation": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/datagrid/setup.py b/basics/datagrid/setup.py index 6b444e10..0f69870b 100644 --- a/basics/datagrid/setup.py +++ b/basics/datagrid/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_datagrid setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_datagrid" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/datagrid" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index ea946b4a..ac9cb828 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -95,7 +95,7 @@ package is declared in the file `package.json`: }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7" ``` With this basic import setup, you can move on to construct a new instance diff --git a/basics/hello-world/install.json b/basics/hello-world/install.json new file mode 100644 index 00000000..c867999e --- /dev/null +++ b/basics/hello-world/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_hello_world", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_hello_world" +} diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index 04c013cf..63c786fd 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -25,28 +25,29 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_hello_world/static", + "clean:labextension": "rimraf jupyterlab_examples_hello_world/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/hello-world/setup.py b/basics/hello-world/setup.py index ee01a2bd..ebe26d4f 100644 --- a/basics/hello-world/setup.py +++ b/basics/hello-world/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_hello_world setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_hello_world" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/hello-world" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/basics/signals/install.json b/basics/signals/install.json new file mode 100644 index 00000000..81d834da --- /dev/null +++ b/basics/signals/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_signals", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_signals" +} diff --git a/basics/signals/package.json b/basics/signals/package.json index 5b47fecf..c00a7efd 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -25,35 +25,36 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_signals/static", + "clean:labextension": "rimraf jupyterlab_examples_signals/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/translation": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/translation": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/signals/setup.py b/basics/signals/setup.py index 0a33d3cf..80747814 100644 --- a/basics/signals/setup.py +++ b/basics/signals/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_signals setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_signals" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/signals" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/command-palette/install.json b/command-palette/install.json new file mode 100644 index 00000000..c7c38a01 --- /dev/null +++ b/command-palette/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_command_palette", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_command_palette" +} diff --git a/command-palette/package.json b/command-palette/package.json index c7f98c3e..fe78619f 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -25,28 +25,29 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_command_palette/static", + "clean:labextension": "rimraf jupyterlab_examples_command_palette/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/command-palette/setup.py b/command-palette/setup.py index b8831a51..ff21cfb1 100644 --- a/command-palette/setup.py +++ b/command-palette/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_command_palette setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_command_palette" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/command-palette" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/commands/install.json b/commands/install.json new file mode 100644 index 00000000..ea862194 --- /dev/null +++ b/commands/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_commands", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_commands" +} diff --git a/commands/package.json b/commands/package.json index d72495b2..8166c227 100644 --- a/commands/package.json +++ b/commands/package.json @@ -25,28 +25,29 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_commands/static", + "clean:labextension": "rimraf jupyterlab_examples_commands/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/commands/setup.py b/commands/setup.py index b1ffd560..826e28c4 100644 --- a/commands/setup.py +++ b/commands/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_commands setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_commands" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/commands" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/context-menu/install.json b/context-menu/install.json new file mode 100644 index 00000000..db8ba8e6 --- /dev/null +++ b/context-menu/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_context_menu", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_context_menu" +} diff --git a/context-menu/package.json b/context-menu/package.json index 4960b14e..1722325a 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -25,31 +25,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_context_menu/static", + "clean:labextension": "rimraf jupyterlab_examples_context_menu/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/apputils": "^3.0.0-rc.2", - "@jupyterlab/filebrowser": "^3.0.0-rc.2", - "@jupyterlab/ui-components": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/apputils": "^3.0.0-rc.7", + "@jupyterlab/filebrowser": "^3.0.0-rc.7", + "@jupyterlab/ui-components": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/context-menu/setup.py b/context-menu/setup.py index 21e5b00c..f7420e5e 100644 --- a/context-menu/setup.py +++ b/context-menu/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_context_menu setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_context_menu" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/context-menu" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/launcher/install.json b/launcher/install.json new file mode 100644 index 00000000..26ec5ef7 --- /dev/null +++ b/launcher/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_launcher", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_launcher" +} diff --git a/launcher/package.json b/launcher/package.json index a2563a78..aec22651 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -25,31 +25,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_launcher/static", + "clean:labextension": "rimraf jupyterlab_examples_launcher/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/filebrowser": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/filebrowser": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/launcher/setup.py b/launcher/setup.py index e480e930..3e645018 100644 --- a/launcher/setup.py +++ b/launcher/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_launcher setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_launcher" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/launcher" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/log-console/custom-log-console/install.json b/log-console/custom-log-console/install.json new file mode 100644 index 00000000..5e894618 --- /dev/null +++ b/log-console/custom-log-console/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_custom_log_console", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_custom_log_console" +} diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index 5b7a69f6..2bae4842 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -25,37 +25,38 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_custom_log_console/static", + "clean:labextension": "rimraf jupyterlab_examples_custom_log_console/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/apputils": "^3.0.0-rc.2", - "@jupyterlab/coreutils": "^5.0.0-rc.2", - "@jupyterlab/logconsole": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/nbformat": "^3.0.0-rc.2", - "@jupyterlab/rendermime": "^3.0.0-rc.2", - "@jupyterlab/ui-components": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/apputils": "^3.0.0-rc.7", + "@jupyterlab/coreutils": "^5.0.0-rc.7", + "@jupyterlab/logconsole": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/nbformat": "^3.0.0-rc.7", + "@jupyterlab/rendermime": "^3.0.0-rc.7", + "@jupyterlab/ui-components": "^3.0.0-rc.7", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/custom-log-console/setup.py b/log-console/custom-log-console/setup.py index aaccffd6..d496aad8 100644 --- a/log-console/custom-log-console/setup.py +++ b/log-console/custom-log-console/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_custom_log_console setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_custom_log_console" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/custom-log-console" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/log-console/log-messages/install.json b/log-console/log-messages/install.json new file mode 100644 index 00000000..be850e33 --- /dev/null +++ b/log-console/log-messages/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_log_messages", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_log_messages" +} diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index 733ae095..2eeace5e 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -25,38 +25,39 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_log_messages/static", + "clean:labextension": "rimraf jupyterlab_examples_log_messages/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/apputils": "^3.0.0-rc.2", - "@jupyterlab/coreutils": "^5.0.0-rc.2", - "@jupyterlab/logconsole": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/nbformat": "^3.0.0-rc.2", - "@jupyterlab/notebook": "^3.0.0-rc.2", - "@jupyterlab/rendermime": "^3.0.0-rc.2", - "@jupyterlab/ui-components": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/apputils": "^3.0.0-rc.7", + "@jupyterlab/coreutils": "^5.0.0-rc.7", + "@jupyterlab/logconsole": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/nbformat": "^3.0.0-rc.7", + "@jupyterlab/notebook": "^3.0.0-rc.7", + "@jupyterlab/rendermime": "^3.0.0-rc.7", + "@jupyterlab/ui-components": "^3.0.0-rc.7", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/log-messages/setup.py b/log-console/log-messages/setup.py index c3126dc0..2fecb102 100644 --- a/log-console/log-messages/setup.py +++ b/log-console/log-messages/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_log_messages setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_log_messages" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/log-messages" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/main-menu/README.md b/main-menu/README.md index 3c765702..b5e2e881 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -89,8 +89,8 @@ After the execution of that command, `package.json` should list them in the }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", "@lumino/widgets": "^1.14.0" ``` diff --git a/main-menu/install.json b/main-menu/install.json new file mode 100644 index 00000000..0749265a --- /dev/null +++ b/main-menu/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_main_menu", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_main_menu" +} diff --git a/main-menu/package.json b/main-menu/package.json index ddd1d4aa..a7b810ec 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -25,30 +25,31 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_main_menu/static", + "clean:labextension": "rimraf jupyterlab_examples_main_menu/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/main-menu/setup.py b/main-menu/setup.py index c05e19b0..17fc7229 100644 --- a/main-menu/setup.py +++ b/main-menu/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_main_menu setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_main_menu" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/main-menu" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/react/react-widget/install.json b/react/react-widget/install.json new file mode 100644 index 00000000..add866c4 --- /dev/null +++ b/react/react-widget/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_react_widget", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_react_widget" +} diff --git a/react/react-widget/package.json b/react/react-widget/package.json index f173083e..080060be 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -25,30 +25,31 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_react_widget/static", + "clean:labextension": "rimraf jupyterlab_examples_react_widget/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/ui-components": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/ui-components": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/react/react-widget/setup.py b/react/react-widget/setup.py index 773bf515..be65051f 100644 --- a/react/react-widget/setup.py +++ b/react/react-widget/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_react_widget setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_react_widget" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/react-widget" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/settings/install.json b/settings/install.json new file mode 100644 index 00000000..2e20e5d1 --- /dev/null +++ b/settings/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_settings", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_settings" +} diff --git a/settings/package.json b/settings/package.json index fff20af3..9dba12cd 100644 --- a/settings/package.json +++ b/settings/package.json @@ -26,31 +26,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_settings/static", + "clean:labextension": "rimraf jupyterlab_examples_settings/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/settingregistry": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/settingregistry": "^3.0.0-rc.7", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/settings/setup.py b/settings/setup.py index 089c8447..9e9a2d91 100644 --- a/settings/setup.py +++ b/settings/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_settings setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_settings" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/settings" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/state/install.json b/state/install.json new file mode 100644 index 00000000..e61b1e70 --- /dev/null +++ b/state/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_state", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_state" +} diff --git a/state/package.json b/state/package.json index 13d14ec8..fab4ac53 100644 --- a/state/package.json +++ b/state/package.json @@ -25,31 +25,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_state/static", + "clean:labextension": "rimraf jupyterlab_examples_state/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/apputils": "^3.0.0-rc.2", - "@jupyterlab/statedb": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/apputils": "^3.0.0-rc.7", + "@jupyterlab/statedb": "^3.0.0-rc.7", "@lumino/coreutils": "^1.5.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/state/setup.py b/state/setup.py index 281ed5bd..6d9c10ed 100644 --- a/state/setup.py +++ b/state/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_state setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_state" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/state" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/widget-tracker/widgets/install.json b/widget-tracker/widgets/install.json new file mode 100644 index 00000000..947119e8 --- /dev/null +++ b/widget-tracker/widgets/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_widgets", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_widgets" +} diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index 913884df..c9f9c963 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -25,32 +25,33 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_widgets/static", + "clean:labextension": "rimraf jupyterlab_examples_widgets/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/widget-tracker/widgets/setup.py b/widget-tracker/widgets/setup.py index e28251d0..440090ee 100644 --- a/widget-tracker/widgets/setup.py +++ b/widget-tracker/widgets/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_widgets setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_widgets" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/widgets" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), )