Skip to content

Commit

Permalink
Revert "cleanup"
Browse files Browse the repository at this point in the history
This reverts commit c061fc0.
  • Loading branch information
jtpio committed Jul 26, 2023
1 parent f66f0bd commit 7893f9f
Show file tree
Hide file tree
Showing 7 changed files with 132 additions and 18 deletions.
17 changes: 17 additions & 0 deletions app/webpack.config.watch.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const base = require('./webpack.config');
const ExtraWatchWebpackPlugin = require('extra-watch-webpack-plugin');

module.exports = [
{
...base[0],
bail: false,
watch: true,
plugins: [
...base[0].plugins,
new ExtraWatchWebpackPlugin({
files: ['../packages/_metapackage/tsconfig.tsbuildinfo'],
}),
],
},
...base.slice(1),
];
5 changes: 4 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "build:prod", "build:lib"]
}
}
},
"namedInputs": {
"default": ["{projectRoot}/**/*"]
"default": [
"{projectRoot}/**/*"
]
},
"targetDefaults": {
"build": {
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"test": "lerna run test",
"update:dependency": "node ./node_modules/@jupyterlab/buildutils/lib/update-dependency.js --lerna",
"watch": "run-p watch:lib watch:app",
"watch:app": "lerna exec --stream --scope \"@jupyter-notebook/app\" jlpm watch"
"watch:app": "lerna exec --stream --scope \"@jupyter-notebook/app\" jlpm watch",
"watch:lib": "lerna exec --stream --scope @jupyter-notebook/metapackage jlpm watch"
},
"devDependencies": {
"@jupyterlab/buildutils": "^4.0.3",
Expand Down
39 changes: 39 additions & 0 deletions packages/_metapackage/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "@jupyter-notebook/metapackage",
"version": "7.0.0",
"private": true,
"description": "Jupyter Notebook - Metapackage",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
"build": "tsc -b",
"watch": "tsc -b -w --preserveWatchOutput"
},
"dependencies": {
"@jupyter-notebook/application": "^7.0.0",
"@jupyter-notebook/application-extension": "^7.0.0",
"@jupyter-notebook/console-extension": "^7.0.0",
"@jupyter-notebook/docmanager-extension": "^7.0.0",
"@jupyter-notebook/documentsearch-extension": "^7.0.0",
"@jupyter-notebook/help-extension": "^7.0.0",
"@jupyter-notebook/lab-extension": "^7.0.0",
"@jupyter-notebook/notebook-extension": "^7.0.0",
"@jupyter-notebook/terminal-extension": "^7.0.0",
"@jupyter-notebook/tree": "^7.0.0",
"@jupyter-notebook/tree-extension": "^7.0.0",
"@jupyter-notebook/ui-components": "^7.0.0"
},
"devDependencies": {
"typescript": "~5.0.2"
}
}
12 changes: 12 additions & 0 deletions packages/_metapackage/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import '@jupyter-notebook/application';
import '@jupyter-notebook/application-extension';
import '@jupyter-notebook/console-extension';
import '@jupyter-notebook/docmanager-extension';
import '@jupyter-notebook/documentsearch-extension';
import '@jupyter-notebook/help-extension';
import '@jupyter-notebook/lab-extension';
import '@jupyter-notebook/notebook-extension';
import '@jupyter-notebook/terminal-extension';
import '@jupyter-notebook/tree';
import '@jupyter-notebook/tree-extension';
import '@jupyter-notebook/ui-components';
22 changes: 22 additions & 0 deletions packages/_metapackage/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"extends": "../../tsconfigbase",
"compilerOptions": {
"outDir": "lib",
"rootDir": "src"
},
"include": ["src/**/*"],
"references": [
{ "path": "../application" },
{ "path": "../application-extension" },
{ "path": "../console-extension" },
{ "path": "../docmanager-extension" },
{ "path": "../documentsearch-extension" },
{ "path": "../help-extension" },
{ "path": "../lab-extension" },
{ "path": "../notebook-extension" },
{ "path": "../terminal-extension" },
{ "path": "../tree" },
{ "path": "../tree-extension" },
{ "path": "../ui-components" }
]
}
52 changes: 36 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1641,9 +1641,9 @@ __metadata:
linkType: hard

"@eslint-community/regexpp@npm:^4.4.0":
version: 4.6.1
resolution: "@eslint-community/regexpp@npm:4.6.1"
checksum: 5741f457f5cc4ec89389d185c44c511fc85ef3630c6ce033a64c779e72f7aa3a7d5bcdc45d54612989f0dc6ea958438c02d363797b3e4f87952fc6878481da0e
version: 4.6.2
resolution: "@eslint-community/regexpp@npm:4.6.2"
checksum: a3c341377b46b54fa228f455771b901d1a2717f95d47dcdf40199df30abc000ba020f747f114f08560d119e979d882a94cf46cfc51744544d54b00319c0f2724
languageName: node
linkType: hard

Expand Down Expand Up @@ -2249,7 +2249,7 @@ __metadata:
languageName: unknown
linkType: soft

"@jupyter-notebook/lab-extension@workspace:packages/lab-extension":
"@jupyter-notebook/lab-extension@^7.0.0, @jupyter-notebook/lab-extension@workspace:packages/lab-extension":
version: 0.0.0-use.local
resolution: "@jupyter-notebook/lab-extension@workspace:packages/lab-extension"
dependencies:
Expand All @@ -2269,6 +2269,26 @@ __metadata:
languageName: unknown
linkType: soft

"@jupyter-notebook/metapackage@workspace:packages/_metapackage":
version: 0.0.0-use.local
resolution: "@jupyter-notebook/metapackage@workspace:packages/_metapackage"
dependencies:
"@jupyter-notebook/application": ^7.0.0
"@jupyter-notebook/application-extension": ^7.0.0
"@jupyter-notebook/console-extension": ^7.0.0
"@jupyter-notebook/docmanager-extension": ^7.0.0
"@jupyter-notebook/documentsearch-extension": ^7.0.0
"@jupyter-notebook/help-extension": ^7.0.0
"@jupyter-notebook/lab-extension": ^7.0.0
"@jupyter-notebook/notebook-extension": ^7.0.0
"@jupyter-notebook/terminal-extension": ^7.0.0
"@jupyter-notebook/tree": ^7.0.0
"@jupyter-notebook/tree-extension": ^7.0.0
"@jupyter-notebook/ui-components": ^7.0.0
typescript: ~5.0.2
languageName: unknown
linkType: soft

"@jupyter-notebook/notebook-extension@^7.0.0, @jupyter-notebook/notebook-extension@workspace:packages/notebook-extension":
version: 0.0.0-use.local
resolution: "@jupyter-notebook/notebook-extension@workspace:packages/notebook-extension"
Expand Down Expand Up @@ -4333,12 +4353,12 @@ __metadata:
linkType: hard

"@lezer/javascript@npm:^1.0.0":
version: 1.4.4
resolution: "@lezer/javascript@npm:1.4.4"
version: 1.4.5
resolution: "@lezer/javascript@npm:1.4.5"
dependencies:
"@lezer/highlight": ^1.1.3
"@lezer/lr": ^1.3.0
checksum: 29797dbb4c0632718cc5a3d0c6baeefe4240562f8b1ef1f60c58d0481c53ac4bbbac354369aa95e4131dfe0bbc4464bc025620f58f01739bd896974bb08dbad5
checksum: 1402075c58f7344a3024f75253c8dabc7049d51b65480af194f081044be21434261c8a4db4ccf42629a2bfc838104838c8d87a58693134ee5660c122b63b4b72
languageName: node
linkType: hard

Expand Down Expand Up @@ -5451,9 +5471,9 @@ __metadata:
linkType: hard

"@types/lodash@npm:^4.14.175, @types/lodash@npm:^4.14.178, @types/lodash@npm:^4.14.191":
version: 4.14.195
resolution: "@types/lodash@npm:4.14.195"
checksum: 39b75ca635b3fa943d17d3d3aabc750babe4c8212485a4df166fe0516e39288e14b0c60afc6e21913cc0e5a84734633c71e617e2bd14eaa1cf51b8d7799c432e
version: 4.14.196
resolution: "@types/lodash@npm:4.14.196"
checksum: 201d17c3e62ae02a93c99ec78e024b2be9bd75564dd8fd8c26f6ac51a985ab280d28ce2688c3bcdfe785b0991cd9814edff19ee000234c7b45d9a697f09feb6a
languageName: node
linkType: hard

Expand All @@ -5479,9 +5499,9 @@ __metadata:
linkType: hard

"@types/node@npm:*":
version: 20.4.4
resolution: "@types/node@npm:20.4.4"
checksum: 43f3c4a8acc38ae753e15a0e79bae0447d255b3742fa87f8e065d7b9d20ecb0e03d6c5b46c00d5d26f4552160381a00255f49205595a8ee48c2423e00263c930
version: 20.4.5
resolution: "@types/node@npm:20.4.5"
checksum: 36a0304a8dc346a1b2d2edac4c4633eecf70875793d61a5274d0df052d7a7af7a8e34f29884eac4fbd094c4f0201477dcb39c0ecd3307ca141688806538d1138
languageName: node
linkType: hard

Expand Down Expand Up @@ -8589,9 +8609,9 @@ __metadata:
linkType: hard

"electron-to-chromium@npm:^1.4.431":
version: 1.4.470
resolution: "electron-to-chromium@npm:1.4.470"
checksum: 0b1749f07b5e97b9d8f805cac6950574017cf2cf19a05cbc3dc46e7397be1d51485a5ece69478e7b12766f4643f45530b6bcebefa8916096a50f6a38dca381ca
version: 1.4.471
resolution: "electron-to-chromium@npm:1.4.471"
checksum: c62ac1f2e9e0395b3095899c7d07a723611a6ca9bc754935101f9f659d7fc3f564f4e47cacb5639abdc172265db041923679942c72055fc8d6522e1b57f755df
languageName: node
linkType: hard

Expand Down

0 comments on commit 7893f9f

Please sign in to comment.