diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8bb6b46f795..4d6f11cfcc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -253,7 +253,7 @@ jobs: jlpm eslint:check jlpm prettier:check jlpm build:utils - jlpm integrity + jlpm integrity --force tests_check: # This job does nothing and is only used for the branch protection if: always() diff --git a/app/package.json b/app/package.json index cf8ef5cefb1..2c2b9e97214 100644 --- a/app/package.json +++ b/app/package.json @@ -177,6 +177,7 @@ "@jupyterlab/pdf-extension": "~4.7.0-alpha.1", "@jupyterlab/pluginmanager-extension": "~4.7.0-alpha.1", "@jupyterlab/running-extension": "~4.7.0-alpha.1", + "@jupyterlab/services": "~7.7.0-alpha.1", "@jupyterlab/services-extension": "~4.7.0-alpha.1", "@jupyterlab/settingeditor": "~4.7.0-alpha.1", "@jupyterlab/settingeditor-extension": "~4.7.0-alpha.1", @@ -205,6 +206,7 @@ "fs-extra": "^8.1.0", "glob": "~7.1.6", "handlebars": "^4.7.7", + "html-webpack-plugin": "^5.6.3", "rimraf": "^3.0.2", "webpack-bundle-analyzer": "^4.8.0", "webpack-merge": "^5.8.0", diff --git a/buildutils/package.json b/buildutils/package.json index 8afc2fb5b4a..8665c1a4db6 100644 --- a/buildutils/package.json +++ b/buildutils/package.json @@ -31,6 +31,7 @@ "dependencies": { "@jupyterlab/buildutils": "~4.7.0-alpha.1", "commander": "^6.2.0", + "dependency-graph": "^0.11.0", "fs-extra": "^9.1.0", "semver": "^7.6.3", "typescript": "~5.9.3" diff --git a/buildutils/src/ensure-repo.ts b/buildutils/src/ensure-repo.ts index 041dcef7fd9..b5848272dc1 100644 --- a/buildutils/src/ensure-repo.ts +++ b/buildutils/src/ensure-repo.ts @@ -1,8 +1,266 @@ +import { builtinModules } from 'module'; + import * as path from 'path'; +import { DepGraph } from 'dependency-graph'; + import * as fs from 'fs-extra'; -import { writePackageData } from '@jupyterlab/buildutils'; +import * as ts from 'typescript'; + +import { + ensurePackage, + getLernaPaths, + IEnsurePackageOptions, + readJSONFile, + run, + writePackageData, +} from '@jupyterlab/buildutils'; + +/** + * Packages whose dependencies are not checked. The app package is a bundling + * manifest: its dependencies list the extensions to include in the build. + */ +const SKIP_PACKAGES = ['@jupyter-notebook/app']; + +/** + * Node.js builtins imported without the `node:` prefix, per package. + */ +const MISSING: { [key: string]: string[] } = { + '@jupyter-notebook/buildutils': ['fs', 'module', 'path', 'process'], +}; + +/** + * Dependencies that may be declared without being imported, per package. + */ +const UNUSED: { [key: string]: string[] } = { + // pulled in for their styles only + '@jupyter-notebook/application': ['@jupyterlab/mainmenu'], + '@jupyter-notebook/tree': ['@jupyterlab/filebrowser'], +}; + +/** + * Dependencies allowed to differ from the range used elsewhere in the repo. + */ +const DIFFERENT_VERSIONS = [ + // the app package pins an older major version + 'fs-extra', +]; + +/** + * Dependencies whose styles should not be imported, per package. + * + * These styles are already loaded by the application through other packages, + * so importing them again would change the CSS cascade order in the app + * bundle (and bundle duplicate assets in the federated lab extension). + */ +const SKIP_CSS: { [key: string]: string[] } = { + '@jupyter-notebook/application': [ + '@jupyterlab/apputils', + '@jupyterlab/docregistry', + '@lumino/widgets', + ], + '@jupyter-notebook/application-extension': [ + '@jupyter-notebook/ui-components', + '@jupyterlab/application', + '@jupyterlab/apputils', + '@jupyterlab/console', + '@jupyterlab/docmanager', + '@jupyterlab/docregistry', + '@jupyterlab/mainmenu', + '@jupyterlab/rendermime', + ], + '@jupyter-notebook/console-extension': [ + '@jupyter-notebook/application', + '@jupyterlab/application', + '@jupyterlab/apputils', + '@jupyterlab/console', + '@jupyterlab/notebook', + '@jupyterlab/ui-components', + '@lumino/widgets', + ], + '@jupyter-notebook/docmanager-extension': [ + '@jupyter-notebook/application', + '@jupyterlab/application', + '@jupyterlab/docmanager', + '@jupyterlab/docregistry', + ], + '@jupyter-notebook/documentsearch-extension': [ + '@jupyter-notebook/application', + '@jupyterlab/application', + '@jupyterlab/documentsearch', + '@lumino/widgets', + ], + '@jupyter-notebook/help-extension': [ + '@jupyter-notebook/ui-components', + '@jupyterlab/application', + '@jupyterlab/apputils', + '@jupyterlab/mainmenu', + ], + // this federated extension runs in JupyterLab, which provides these styles + '@jupyter-notebook/lab-extension': [ + '@jupyter-notebook/application', + '@jupyterlab/application', + '@jupyterlab/apputils', + '@jupyterlab/notebook', + '@jupyterlab/ui-components', + '@lumino/widgets', + ], + '@jupyter-notebook/notebook-extension': [ + '@jupyter-notebook/application', + '@jupyterlab/application', + '@jupyterlab/apputils', + '@jupyterlab/cells', + '@jupyterlab/debugger', + '@jupyterlab/docmanager', + '@jupyterlab/docregistry', + '@jupyterlab/mainmenu', + '@jupyterlab/notebook', + '@jupyterlab/toc', + '@lumino/widgets', + ], + '@jupyter-notebook/terminal-extension': [ + '@jupyter-notebook/application', + '@jupyterlab/application', + '@jupyterlab/terminal', + ], + '@jupyter-notebook/tree': ['@jupyterlab/ui-components', '@lumino/widgets'], + '@jupyter-notebook/tree-extension': [ + '@jupyterlab/application', + '@jupyterlab/apputils', + '@jupyterlab/running', + '@jupyterlab/settingeditor', + '@jupyterlab/ui-components', + '@lumino/widgets', + ], + '@jupyter-notebook/ui-components': ['@jupyterlab/ui-components'], +}; + +/** + * Extract the module specifiers imported by a source file. + */ +function getImports(filePath: string): string[] { + const sourceFile = ts.createSourceFile( + filePath, + fs.readFileSync(filePath, 'utf8'), + ts.ScriptTarget.Latest, + true + ); + const specifiers: string[] = []; + const visit = (node: ts.Node): void => { + if ( + (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) && + node.moduleSpecifier && + ts.isStringLiteral(node.moduleSpecifier) + ) { + specifiers.push(node.moduleSpecifier.text); + } else if ( + ts.isCallExpression(node) && + (node.expression.kind === ts.SyntaxKind.ImportKeyword || + (ts.isIdentifier(node.expression) && + node.expression.text === 'require')) && + node.arguments.length === 1 && + ts.isStringLiteral(node.arguments[0]) + ) { + specifiers.push(node.arguments[0].text); + } + ts.forEachChild(node, visit); + }; + visit(sourceFile); + return specifiers; +} + +/** + * Resolve an import specifier to a package name. + * + * Returns null for relative imports and Node.js builtins. + */ +function getPackageName(specifier: string): string | null { + if (specifier.startsWith('.') || specifier.startsWith('node:')) { + return null; + } + const parts = specifier.split('/'); + const name = specifier.startsWith('@') + ? parts.slice(0, 2).join('/') + : parts[0]; + if (builtinModules.includes(name)) { + return null; + } + return name; +} + +/** + * Read the package.json of a dependency, resolving from the dependent package. + */ +function getDependencyData( + pkgData: { [key: string]: any }, + fromPath: string, + name: string +): any { + if (name in pkgData) { + return pkgData[name]; + } + try { + return readJSONFile( + require.resolve(`${name}/package.json`, { paths: [fromPath] }) + ); + } catch { + try { + return readJSONFile(path.resolve('node_modules', name, 'package.json')); + } catch { + return {}; + } + } +} + +/** + * Build the dependency graph of the local packages and their transitive + * dependencies, so that `dependenciesOf()` returns a proper topological + * order for CSS imports (a dependency style always precedes its dependents). + */ +function getPackageGraph( + pkgData: { [key: string]: any }, + pkgPaths: { [key: string]: string } +): DepGraph { + const graph = new DepGraph({ circular: true }); + const addDependencies = (name: string, data: any, fromPath: string): void => { + const deps: { [key: string]: string } = data.dependencies ?? {}; + Object.keys(deps).forEach((depName) => { + const seen = graph.hasNode(depName); + if (!seen) { + graph.addNode(depName, getDependencyData(pkgData, fromPath, depName)); + } + graph.addDependency(name, depName); + if (!seen) { + addDependencies(depName, graph.getNodeData(depName), fromPath); + } + }); + }; + Object.keys(pkgData).forEach((name) => { + if (!graph.hasNode(name)) { + graph.addNode(name, pkgData[name]); + } + addDependencies(name, pkgData[name], pkgPaths[name]); + }); + return graph; +} + +/** + * Ensure the root eslint config only imports declared devDependencies. + */ +function ensureRootDevDependencies(): string[] { + const messages: string[] = []; + const data = readJSONFile(path.resolve('package.json')); + for (const specifier of getImports(path.resolve('eslint.config.mjs'))) { + const name = getPackageName(specifier); + if (name && !data.devDependencies[name]) { + messages.push( + `Missing root devDependency: ${name} (imported by eslint.config.mjs)` + ); + } + } + return messages; +} /** * Ensure the application package resolutions. @@ -40,6 +298,121 @@ function ensureResolutions(): string[] { return []; } +/** + * Ensure the repo integrity. + */ +async function ensureIntegrity(): Promise { + const messages: { [key: string]: string[] } = {}; + + // Gather the package data. + const pkgData: { [key: string]: any } = {}; + const pkgPaths: { [key: string]: string } = {}; + const locals: { [key: string]: string } = {}; + for (const pkgPath of getLernaPaths().sort()) { + const data = readJSONFile(path.join(pkgPath, 'package.json')); + pkgData[data.name] = data; + pkgPaths[data.name] = pkgPath; + locals[data.name] = pkgPath; + } + + // Build up an ordered list of CSS imports for each local package. + const graph = getPackageGraph(pkgData, pkgPaths); + const cssImports: { [key: string]: string[] } = {}; + const cssModuleImports: { [key: string]: string[] } = {}; + Object.keys(locals).forEach((name) => { + const data = pkgData[name]; + const deps: { [key: string]: string } = data.dependencies ?? {}; + const skip = SKIP_CSS[name] ?? []; + const cssData: { [key: string]: string[] } = { + ...data.jupyterlab?.extraStyles, + }; + const cssModuleData: { [key: string]: string[] } = { + ...data.jupyterlab?.extraStyles, + }; + Object.keys(deps).forEach((depName) => { + if (skip.includes(depName) || depName in cssData) { + return; + } + const depData = graph.getNodeData(depName); + if (typeof depData.style === 'string') { + cssData[depName] = [depData.style]; + } + if (typeof depData.styleModule === 'string') { + cssModuleData[depName] = [depData.styleModule]; + } else if (typeof depData.style === 'string') { + cssModuleData[depName] = [depData.style]; + } + }); + // Get the CSS imports in dependency order. + cssImports[name] = []; + cssModuleImports[name] = []; + graph.dependenciesOf(name).forEach((depName) => { + if (depName in cssData) { + cssData[depName].forEach((cssPath) => { + cssImports[name].push(`${depName}/${cssPath}`); + }); + } + if (depName in cssModuleData) { + cssModuleData[depName].forEach((cssModulePath) => { + cssModuleImports[name].push(`${depName}/${cssModulePath}`); + }); + } + }); + }); + + // Validate each package. + const depCache: { [key: string]: string } = {}; + for (const name of Object.keys(locals)) { + if (SKIP_PACKAGES.includes(name)) { + continue; + } + const options: IEnsurePackageOptions = { + pkgPath: pkgPaths[name], + data: pkgData[name], + depCache, + missing: MISSING[name], + unused: UNUSED[name] ?? [], + locals, + cssImports: cssImports[name], + cssModuleImports: cssModuleImports[name], + differentVersions: DIFFERENT_VERSIONS, + }; + const pkgMessages = await ensurePackage(options); + if (pkgMessages.length > 0) { + messages[name] = pkgMessages; + } + } + + const rootMessages = ensureRootDevDependencies(); + if (rootMessages.length > 0) { + messages['root'] = rootMessages; + } + + const resolutionMessages = ensureResolutions(); + if (resolutionMessages.length > 0) { + messages['@jupyter-notebook/app'] = resolutionMessages; + } + + if (Object.keys(messages).length > 0) { + console.debug(JSON.stringify(messages, null, 2)); + if (process.argv.includes('--force')) { + console.debug( + '\n\nPlease run `jlpm integrity` locally and commit the changes' + ); + process.exit(1); + } + run('jlpm'); + console.debug('\n\nMade integrity changes; please commit the changes'); + return false; + } + + console.debug('Repo integrity verified!'); + return true; +} + if (require.main === module) { - void ensureResolutions(); + void ensureIntegrity().catch((e) => { + process.exitCode = 1; + console.error(e); + }); } diff --git a/package.json b/package.json index 1efa27177f7..b7f39c56990 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-react": "^7.37.0", "globals": "^16.0.0", - "html-webpack-plugin": "^5.6.3", + "jsonc-eslint-parser": "^2.4.0", "npm-run-all": "^4.1.5", "prettier": "^2.8.5", "rimraf": "^3.0.2", diff --git a/packages/_metapackage/package.json b/packages/_metapackage/package.json index f14755ef98e..bb4776f3fd4 100644 --- a/packages/_metapackage/package.json +++ b/packages/_metapackage/package.json @@ -15,6 +15,7 @@ "author": "Project Jupyter", "main": "lib/index.js", "types": "lib/index.d.ts", + "style": "style/index.css", "scripts": { "build": "tsc -b", "watch": "tsc -b -w --preserveWatchOutput" @@ -35,5 +36,6 @@ }, "devDependencies": { "typescript": "~5.9.3" - } + }, + "styleModule": "style/index.js" } diff --git a/packages/_metapackage/src/index.ts b/packages/_metapackage/src/index.ts index c41bc6c855c..a49049bd08b 100644 --- a/packages/_metapackage/src/index.ts +++ b/packages/_metapackage/src/index.ts @@ -1,3 +1,10 @@ +// Copyright (c) Jupyter Development Team. +// Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module metapackage + */ + import '@jupyter-notebook/application'; import '@jupyter-notebook/application-extension'; import '@jupyter-notebook/console-extension'; diff --git a/packages/_metapackage/style/index.css b/packages/_metapackage/style/index.css new file mode 100644 index 00000000000..68315bd361b --- /dev/null +++ b/packages/_metapackage/style/index.css @@ -0,0 +1,18 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ +@import url('~@jupyter-notebook/application/style/index.css'); +@import url('~@jupyter-notebook/ui-components/style/index.css'); +@import url('~@jupyter-notebook/application-extension/style/index.css'); +@import url('~@jupyter-notebook/console-extension/style/index.css'); +@import url('~@jupyter-notebook/docmanager-extension/style/index.css'); +@import url('~@jupyter-notebook/documentsearch-extension/style/index.css'); +@import url('~@jupyter-notebook/help-extension/style/index.css'); +@import url('~@jupyter-notebook/lab-extension/style/index.css'); +@import url('~@jupyter-notebook/notebook-extension/style/index.css'); +@import url('~@jupyter-notebook/terminal-extension/style/index.css'); +@import url('~@jupyter-notebook/tree/style/index.css'); +@import url('~@jupyter-notebook/tree-extension/style/index.css'); diff --git a/packages/_metapackage/style/index.js b/packages/_metapackage/style/index.js new file mode 100644 index 00000000000..8927862564d --- /dev/null +++ b/packages/_metapackage/style/index.js @@ -0,0 +1,18 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ +import '@jupyter-notebook/application/style/index.js'; +import '@jupyter-notebook/ui-components/style/index.js'; +import '@jupyter-notebook/application-extension/style/index.js'; +import '@jupyter-notebook/console-extension/style/index.js'; +import '@jupyter-notebook/docmanager-extension/style/index.js'; +import '@jupyter-notebook/documentsearch-extension/style/index.js'; +import '@jupyter-notebook/help-extension/style/index.js'; +import '@jupyter-notebook/lab-extension/style/index.js'; +import '@jupyter-notebook/notebook-extension/style/index.js'; +import '@jupyter-notebook/terminal-extension/style/index.js'; +import '@jupyter-notebook/tree/style/index.js'; +import '@jupyter-notebook/tree-extension/style/index.js'; diff --git a/packages/application-extension/package.json b/packages/application-extension/package.json index 561c9566d26..e2179ea3f80 100644 --- a/packages/application-extension/package.json +++ b/packages/application-extension/package.json @@ -28,7 +28,8 @@ "lib/*.js", "schema/*.json", "style/**/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", @@ -42,7 +43,6 @@ "@jupyter-notebook/ui-components": "^7.7.0-alpha.1", "@jupyterlab/application": "~4.7.0-alpha.1", "@jupyterlab/apputils": "~4.8.0-alpha.1", - "@jupyterlab/codeeditor": "~4.7.0-alpha.1", "@jupyterlab/console": "~4.7.0-alpha.1", "@jupyterlab/coreutils": "~6.7.0-alpha.1", "@jupyterlab/docmanager": "~4.7.0-alpha.1", diff --git a/packages/application-extension/src/index.ts b/packages/application-extension/src/index.ts index 6ba7a95bcf5..a9bbd04e4fd 100644 --- a/packages/application-extension/src/index.ts +++ b/packages/application-extension/src/index.ts @@ -1,5 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module application-extension + */ import { ILabStatus, diff --git a/packages/application-extension/style/index.css b/packages/application-extension/style/index.css index 8b3c7e55187..ee378638f5e 100644 --- a/packages/application-extension/style/index.css +++ b/packages/application-extension/style/index.css @@ -1,4 +1,9 @@ -@import url('~@jupyter-notebook/application/style/index.css'); -@import url('~@lumino/widgets/style/index.css'); +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ +@import url('~@lumino/widgets/style/index.css'); +@import url('~@jupyter-notebook/application/style/index.css'); @import url('./base.css'); diff --git a/packages/application-extension/style/index.js b/packages/application-extension/style/index.js index ccccd31e942..7105a5bccc4 100644 --- a/packages/application-extension/style/index.js +++ b/packages/application-extension/style/index.js @@ -1,4 +1,10 @@ -import '@jupyter-notebook/application/style/index.js'; +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ import '@lumino/widgets/style/index.js'; +import '@jupyter-notebook/application/style/index.js'; import './base.css'; diff --git a/packages/application/package.json b/packages/application/package.json index 9c8299ba0de..f10ebc08c04 100644 --- a/packages/application/package.json +++ b/packages/application/package.json @@ -27,7 +27,8 @@ "lib/*.js.map", "lib/*.js", "style/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", @@ -43,12 +44,16 @@ }, "dependencies": { "@jupyterlab/application": "~4.7.0-alpha.1", + "@jupyterlab/apputils": "~4.8.0-alpha.1", "@jupyterlab/coreutils": "~6.7.0-alpha.1", "@jupyterlab/docregistry": "~4.7.0-alpha.1", + "@jupyterlab/mainmenu": "~4.7.0-alpha.1", "@jupyterlab/rendermime-interfaces": "~3.15.0-alpha.1", + "@jupyterlab/translation": "~4.7.0-alpha.1", "@jupyterlab/ui-components": "~4.7.0-alpha.1", "@lumino/algorithm": "^2.0.4", "@lumino/coreutils": "^2.2.2", + "@lumino/disposable": "^2.1.5", "@lumino/messaging": "^2.0.4", "@lumino/polling": "^2.1.5", "@lumino/signaling": "^2.1.5", diff --git a/packages/application/src/index.ts b/packages/application/src/index.ts index c726fb4561d..57b8c3c25a1 100644 --- a/packages/application/src/index.ts +++ b/packages/application/src/index.ts @@ -1,5 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module application + */ export * from './app'; export * from './shell'; diff --git a/packages/application/style/base.css b/packages/application/style/base.css index eb2281e966c..a7128f55021 100644 --- a/packages/application/style/base.css +++ b/packages/application/style/base.css @@ -3,6 +3,8 @@ | Distributed under the terms of the Modified BSD License. |----------------------------------------------------------------------------*/ +@import './sidepanel.css'; + :root { --jp-private-topbar-height: 28px; /* Override the layout-2 color for the dark theme */ diff --git a/packages/application/style/index.css b/packages/application/style/index.css index 80ff9611618..687570e407c 100644 --- a/packages/application/style/index.css +++ b/packages/application/style/index.css @@ -3,9 +3,8 @@ | Distributed under the terms of the Modified BSD License. |----------------------------------------------------------------------------*/ +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ +@import url('~@jupyterlab/ui-components/style/index.css'); @import url('~@jupyterlab/application/style/index.css'); @import url('~@jupyterlab/mainmenu/style/index.css'); -@import url('~@jupyterlab/ui-components/style/index.css'); - @import url('./base.css'); -@import url('./sidepanel.css'); diff --git a/packages/application/style/index.js b/packages/application/style/index.js index a84ae1e2b50..f36fef8d02a 100644 --- a/packages/application/style/index.js +++ b/packages/application/style/index.js @@ -3,9 +3,9 @@ | Distributed under the terms of the Modified BSD License. |----------------------------------------------------------------------------*/ +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ +import '@jupyterlab/ui-components/style/index.js'; import '@jupyterlab/application/style/index.js'; import '@jupyterlab/mainmenu/style/index.js'; -import '@jupyterlab/ui-components/style/index.js'; import './base.css'; -import './sidepanel.css'; diff --git a/packages/application/tsconfig.json b/packages/application/tsconfig.json index 399b75b7ac4..11ef5c091eb 100644 --- a/packages/application/tsconfig.json +++ b/packages/application/tsconfig.json @@ -4,5 +4,6 @@ "outDir": "lib", "rootDir": "src" }, - "include": ["src/**/*"] + "include": ["src/**/*"], + "references": [] } diff --git a/packages/console-extension/package.json b/packages/console-extension/package.json index 6337bc25085..1f6be1f838e 100644 --- a/packages/console-extension/package.json +++ b/packages/console-extension/package.json @@ -28,7 +28,8 @@ "lib/*.js", "schema/*.json", "style/**/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", diff --git a/packages/console-extension/src/index.ts b/packages/console-extension/src/index.ts index be6e723b4dd..7230bf162e1 100644 --- a/packages/console-extension/src/index.ts +++ b/packages/console-extension/src/index.ts @@ -1,5 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module console-extension + */ import { IRouter, diff --git a/packages/console-extension/style/index.css b/packages/console-extension/style/index.css index f5246e6669e..3394b8db847 100644 --- a/packages/console-extension/style/index.css +++ b/packages/console-extension/style/index.css @@ -1 +1,7 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ @import url('./base.css'); diff --git a/packages/console-extension/style/index.js b/packages/console-extension/style/index.js index a028a76408b..ca06dffa5e2 100644 --- a/packages/console-extension/style/index.js +++ b/packages/console-extension/style/index.js @@ -1 +1,8 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ + import './base.css'; diff --git a/packages/docmanager-extension/package.json b/packages/docmanager-extension/package.json index 6cf430d0df8..349310a690f 100644 --- a/packages/docmanager-extension/package.json +++ b/packages/docmanager-extension/package.json @@ -28,7 +28,8 @@ "lib/*.js", "schema/*.json", "style/**/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", @@ -43,8 +44,6 @@ "@jupyterlab/coreutils": "~6.7.0-alpha.1", "@jupyterlab/docmanager": "~4.7.0-alpha.1", "@jupyterlab/docregistry": "~4.7.0-alpha.1", - "@jupyterlab/services": "~7.7.0-alpha.1", - "@lumino/algorithm": "^2.0.4", "@lumino/signaling": "^2.1.5" }, "devDependencies": { diff --git a/packages/docmanager-extension/src/index.ts b/packages/docmanager-extension/src/index.ts index bd21f625efe..6fc0326751b 100644 --- a/packages/docmanager-extension/src/index.ts +++ b/packages/docmanager-extension/src/index.ts @@ -1,5 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module docmanager-extension + */ import { JupyterFrontEnd, diff --git a/packages/docmanager-extension/style/index.css b/packages/docmanager-extension/style/index.css index f5246e6669e..3394b8db847 100644 --- a/packages/docmanager-extension/style/index.css +++ b/packages/docmanager-extension/style/index.css @@ -1 +1,7 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ @import url('./base.css'); diff --git a/packages/docmanager-extension/style/index.js b/packages/docmanager-extension/style/index.js index a028a76408b..ca06dffa5e2 100644 --- a/packages/docmanager-extension/style/index.js +++ b/packages/docmanager-extension/style/index.js @@ -1 +1,8 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ + import './base.css'; diff --git a/packages/documentsearch-extension/package.json b/packages/documentsearch-extension/package.json index 805db6c4cd1..4ff90f5bb89 100644 --- a/packages/documentsearch-extension/package.json +++ b/packages/documentsearch-extension/package.json @@ -26,9 +26,9 @@ "lib/*.d.ts", "lib/*.js.map", "lib/*.js", - "schema/*.json", "style/**/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", @@ -51,8 +51,7 @@ "access": "public" }, "jupyterlab": { - "extension": true, - "schemaDir": "schema" + "extension": true }, "styleModule": "style/index.js" } diff --git a/packages/documentsearch-extension/src/index.ts b/packages/documentsearch-extension/src/index.ts index 3ad96e1fae3..8cef793e87b 100644 --- a/packages/documentsearch-extension/src/index.ts +++ b/packages/documentsearch-extension/src/index.ts @@ -1,3 +1,10 @@ +// Copyright (c) Jupyter Development Team. +// Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module documentsearch-extension + */ + import { JupyterFrontEnd, JupyterFrontEndPlugin, diff --git a/packages/documentsearch-extension/style/index.css b/packages/documentsearch-extension/style/index.css index f5246e6669e..3394b8db847 100644 --- a/packages/documentsearch-extension/style/index.css +++ b/packages/documentsearch-extension/style/index.css @@ -1 +1,7 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ @import url('./base.css'); diff --git a/packages/documentsearch-extension/style/index.js b/packages/documentsearch-extension/style/index.js index a028a76408b..ca06dffa5e2 100644 --- a/packages/documentsearch-extension/style/index.js +++ b/packages/documentsearch-extension/style/index.js @@ -1 +1,8 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ + import './base.css'; diff --git a/packages/help-extension/package.json b/packages/help-extension/package.json index 3e6ea499932..96cde01a10a 100644 --- a/packages/help-extension/package.json +++ b/packages/help-extension/package.json @@ -28,7 +28,8 @@ "lib/*.js", "schema/*.json", "style/**/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", @@ -43,8 +44,7 @@ "@jupyterlab/apputils": "~4.8.0-alpha.1", "@jupyterlab/mainmenu": "~4.7.0-alpha.1", "@jupyterlab/translation": "~4.7.0-alpha.1", - "react": "^18.2.0", - "react-dom": "^18.2.0" + "react": "^18.2.0" }, "devDependencies": { "rimraf": "^3.0.2", diff --git a/packages/help-extension/src/index.tsx b/packages/help-extension/src/index.tsx index 28f05568915..e045dcff126 100644 --- a/packages/help-extension/src/index.tsx +++ b/packages/help-extension/src/index.tsx @@ -1,5 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module help-extension + */ import { JupyterFrontEnd, diff --git a/packages/help-extension/style/index.css b/packages/help-extension/style/index.css index f5246e6669e..3394b8db847 100644 --- a/packages/help-extension/style/index.css +++ b/packages/help-extension/style/index.css @@ -1 +1,7 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ @import url('./base.css'); diff --git a/packages/help-extension/style/index.js b/packages/help-extension/style/index.js index a028a76408b..ca06dffa5e2 100644 --- a/packages/help-extension/style/index.js +++ b/packages/help-extension/style/index.js @@ -1 +1,8 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ + import './base.css'; diff --git a/packages/lab-extension/package.json b/packages/lab-extension/package.json index 844f2462fd1..12e9b2f4baf 100644 --- a/packages/lab-extension/package.json +++ b/packages/lab-extension/package.json @@ -27,10 +27,13 @@ "lib/*.js.map", "lib/*.js", "schema/*.json", - "style/index.js" + "style/**/*.css", + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "jlpm run build:labextension:dev", + "build:all": "npm run build", "build:labextension": "jupyter-builder build .", "build:labextension:dev": "jupyter-builder build --development True .", "build:lib": "tsc -b", @@ -47,12 +50,10 @@ "@jupyterlab/application": "~4.7.0-alpha.1", "@jupyterlab/apputils": "~4.8.0-alpha.1", "@jupyterlab/coreutils": "~6.7.0-alpha.1", - "@jupyterlab/docregistry": "~4.7.0-alpha.1", "@jupyterlab/notebook": "~4.7.0-alpha.1", "@jupyterlab/translation": "~4.7.0-alpha.1", "@jupyterlab/ui-components": "~4.7.0-alpha.1", - "@lumino/commands": "^2.3.3", - "@lumino/disposable": "^2.1.5" + "@lumino/widgets": "^2.7.2" }, "devDependencies": { "@jupyter/builder": "^1.0.2", diff --git a/packages/lab-extension/src/index.ts b/packages/lab-extension/src/index.ts index 4032869b445..c3288134a4c 100644 --- a/packages/lab-extension/src/index.ts +++ b/packages/lab-extension/src/index.ts @@ -1,5 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module lab-extension + */ import { ILabShell, diff --git a/packages/lab-extension/style/index.css b/packages/lab-extension/style/index.css index f5246e6669e..3394b8db847 100644 --- a/packages/lab-extension/style/index.css +++ b/packages/lab-extension/style/index.css @@ -1 +1,7 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ @import url('./base.css'); diff --git a/packages/lab-extension/style/index.js b/packages/lab-extension/style/index.js index a028a76408b..ca06dffa5e2 100644 --- a/packages/lab-extension/style/index.js +++ b/packages/lab-extension/style/index.js @@ -1 +1,8 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ + import './base.css'; diff --git a/packages/notebook-extension/package.json b/packages/notebook-extension/package.json index 95881124db5..db8cc1c512a 100644 --- a/packages/notebook-extension/package.json +++ b/packages/notebook-extension/package.json @@ -28,7 +28,8 @@ "lib/*.js", "schema/*.json", "style/**/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", @@ -42,19 +43,21 @@ "@jupyterlab/application": "~4.7.0-alpha.1", "@jupyterlab/apputils": "~4.8.0-alpha.1", "@jupyterlab/cells": "~4.7.0-alpha.1", + "@jupyterlab/coreutils": "~6.7.0-alpha.1", "@jupyterlab/debugger": "~4.7.0-alpha.1", "@jupyterlab/docmanager": "~4.7.0-alpha.1", + "@jupyterlab/docregistry": "~4.7.0-alpha.1", + "@jupyterlab/mainmenu": "~4.7.0-alpha.1", "@jupyterlab/metadataform": "~4.7.0-alpha.1", "@jupyterlab/notebook": "~4.7.0-alpha.1", "@jupyterlab/settingregistry": "~4.7.0-alpha.1", "@jupyterlab/toc": "~6.7.0-alpha.1", "@jupyterlab/translation": "~4.7.0-alpha.1", "@jupyterlab/ui-components": "~4.7.0-alpha.1", - "@lumino/algorithm": "2.0.4", + "@lumino/algorithm": "^2.0.4", "@lumino/polling": "^2.1.5", "@lumino/widgets": "^2.7.2", - "react": "^18.2.0", - "react-dom": "^18.2.0" + "react": "^18.2.0" }, "devDependencies": { "rimraf": "^3.0.2", diff --git a/packages/notebook-extension/src/index.ts b/packages/notebook-extension/src/index.ts index ece60cc2c34..741ccbbabf4 100644 --- a/packages/notebook-extension/src/index.ts +++ b/packages/notebook-extension/src/index.ts @@ -1,5 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module notebook-extension + */ import { JupyterFrontEnd, diff --git a/packages/notebook-extension/style/index.css b/packages/notebook-extension/style/index.css index f5246e6669e..4e97ea6fee2 100644 --- a/packages/notebook-extension/style/index.css +++ b/packages/notebook-extension/style/index.css @@ -1 +1,9 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ +@import url('~@jupyterlab/ui-components/style/index.css'); +@import url('~@jupyterlab/metadataform/style/index.css'); @import url('./base.css'); diff --git a/packages/notebook-extension/style/index.js b/packages/notebook-extension/style/index.js index a028a76408b..7481648ce22 100644 --- a/packages/notebook-extension/style/index.js +++ b/packages/notebook-extension/style/index.js @@ -1 +1,10 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ +import '@jupyterlab/ui-components/style/index.js'; +import '@jupyterlab/metadataform/style/index.js'; + import './base.css'; diff --git a/packages/terminal-extension/package.json b/packages/terminal-extension/package.json index 8b1138647e5..4c17255dd8a 100644 --- a/packages/terminal-extension/package.json +++ b/packages/terminal-extension/package.json @@ -28,7 +28,8 @@ "lib/*.js", "schema/*.json", "style/**/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", diff --git a/packages/terminal-extension/src/index.ts b/packages/terminal-extension/src/index.ts index ea2feec5ef7..ff3b58955b0 100644 --- a/packages/terminal-extension/src/index.ts +++ b/packages/terminal-extension/src/index.ts @@ -1,5 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module terminal-extension + */ import { IRouter, diff --git a/packages/terminal-extension/style/index.css b/packages/terminal-extension/style/index.css index f5246e6669e..3394b8db847 100644 --- a/packages/terminal-extension/style/index.css +++ b/packages/terminal-extension/style/index.css @@ -1 +1,7 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ @import url('./base.css'); diff --git a/packages/terminal-extension/style/index.js b/packages/terminal-extension/style/index.js index a028a76408b..ca06dffa5e2 100644 --- a/packages/terminal-extension/style/index.js +++ b/packages/terminal-extension/style/index.js @@ -1 +1,8 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ + import './base.css'; diff --git a/packages/tree-extension/package.json b/packages/tree-extension/package.json index e9e7a99a351..4edef24ff3a 100644 --- a/packages/tree-extension/package.json +++ b/packages/tree-extension/package.json @@ -28,7 +28,8 @@ "lib/*.js", "schema/*.json", "style/**/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", @@ -42,18 +43,16 @@ "@jupyterlab/application": "~4.7.0-alpha.1", "@jupyterlab/apputils": "~4.8.0-alpha.1", "@jupyterlab/coreutils": "~6.7.0-alpha.1", - "@jupyterlab/docmanager": "~4.7.0-alpha.1", "@jupyterlab/filebrowser": "~4.7.0-alpha.1", - "@jupyterlab/mainmenu": "~4.7.0-alpha.1", - "@jupyterlab/services": "~7.7.0-alpha.1", + "@jupyterlab/running": "~4.7.0-alpha.1", "@jupyterlab/settingeditor": "~4.7.0-alpha.1", "@jupyterlab/settingregistry": "~4.7.0-alpha.1", - "@jupyterlab/statedb": "~4.7.0-alpha.1", "@jupyterlab/translation": "~4.7.0-alpha.1", "@jupyterlab/ui-components": "~4.7.0-alpha.1", - "@lumino/algorithm": "^2.0.4", "@lumino/commands": "^2.3.3", - "@lumino/widgets": "^2.7.2" + "@lumino/signaling": "^2.1.5", + "@lumino/widgets": "^2.7.2", + "react": "^18.2.0" }, "devDependencies": { "rimraf": "^3.0.2", diff --git a/packages/tree-extension/src/index.ts b/packages/tree-extension/src/index.ts index 6ba3a6ecc3e..899ecd97e9b 100644 --- a/packages/tree-extension/src/index.ts +++ b/packages/tree-extension/src/index.ts @@ -1,5 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module tree-extension + */ import { JupyterFrontEnd, diff --git a/packages/tree-extension/style/index.css b/packages/tree-extension/style/index.css index f989a1da692..475723a8a44 100644 --- a/packages/tree-extension/style/index.css +++ b/packages/tree-extension/style/index.css @@ -1,11 +1,9 @@ /*----------------------------------------------------------------------------- | Copyright (c) Jupyter Development Team. -| | Distributed under the terms of the Modified BSD License. |----------------------------------------------------------------------------*/ +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ @import url('~@jupyterlab/filebrowser/style/index.css'); - @import url('~@jupyter-notebook/tree/style/index.css'); - -@import './base.css'; +@import url('./base.css'); diff --git a/packages/tree-extension/style/index.js b/packages/tree-extension/style/index.js index 6983d18337e..1c5bc94e00b 100644 --- a/packages/tree-extension/style/index.js +++ b/packages/tree-extension/style/index.js @@ -1,5 +1,10 @@ -import '@jupyterlab/filebrowser/style/index.js'; +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ +import '@jupyterlab/filebrowser/style/index.js'; import '@jupyter-notebook/tree/style/index.js'; import './base.css'; diff --git a/packages/tree/package.json b/packages/tree/package.json index a3b8bd0d50b..c49d7cdfcc9 100644 --- a/packages/tree/package.json +++ b/packages/tree/package.json @@ -26,9 +26,9 @@ "lib/*.d.ts", "lib/*.js.map", "lib/*.js", - "schema/*.json", "style/**/*.css", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", @@ -38,19 +38,8 @@ "watch": "tsc -b --watch" }, "dependencies": { - "@jupyterlab/application": "~4.7.0-alpha.1", - "@jupyterlab/apputils": "~4.8.0-alpha.1", - "@jupyterlab/coreutils": "~6.7.0-alpha.1", - "@jupyterlab/docmanager": "~4.7.0-alpha.1", "@jupyterlab/filebrowser": "~4.7.0-alpha.1", - "@jupyterlab/mainmenu": "~4.7.0-alpha.1", - "@jupyterlab/services": "~7.7.0-alpha.1", - "@jupyterlab/settingregistry": "~4.7.0-alpha.1", - "@jupyterlab/statedb": "~4.7.0-alpha.1", - "@jupyterlab/translation": "~4.7.0-alpha.1", "@jupyterlab/ui-components": "~4.7.0-alpha.1", - "@lumino/algorithm": "^2.0.4", - "@lumino/commands": "^2.3.3", "@lumino/coreutils": "^2.2.2", "@lumino/widgets": "^2.7.2" }, diff --git a/packages/tree/src/index.ts b/packages/tree/src/index.ts index dd239a61873..9574f5ccb2a 100644 --- a/packages/tree/src/index.ts +++ b/packages/tree/src/index.ts @@ -1,2 +1,9 @@ +// Copyright (c) Jupyter Development Team. +// Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module tree + */ + export * from './notebook-tree'; export * from './token'; diff --git a/packages/tree/style/index.css b/packages/tree/style/index.css index c6a335ca574..6822cc0f66f 100644 --- a/packages/tree/style/index.css +++ b/packages/tree/style/index.css @@ -1,3 +1,8 @@ -@import url('~@jupyterlab/filebrowser/style/index.css'); +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ +@import url('~@jupyterlab/filebrowser/style/index.css'); @import url('./base.css'); diff --git a/packages/tree/style/index.js b/packages/tree/style/index.js index 334392b2dcb..f940bd86e7e 100644 --- a/packages/tree/style/index.js +++ b/packages/tree/style/index.js @@ -1,3 +1,9 @@ +/*----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ + +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ import '@jupyterlab/filebrowser/style/index.js'; import './base.css'; diff --git a/packages/tree/tsconfig.json b/packages/tree/tsconfig.json index 399b75b7ac4..11ef5c091eb 100644 --- a/packages/tree/tsconfig.json +++ b/packages/tree/tsconfig.json @@ -4,5 +4,6 @@ "outDir": "lib", "rootDir": "src" }, - "include": ["src/**/*"] + "include": ["src/**/*"], + "references": [] } diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json index 23e6fed7a27..7f723f4ee90 100644 --- a/packages/ui-components/package.json +++ b/packages/ui-components/package.json @@ -25,7 +25,8 @@ "files": [ "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}", "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}", - "style/index.js" + "style/index.js", + "src/**/*.{ts,tsx}" ], "scripts": { "build": "tsc -b", @@ -42,13 +43,11 @@ "watch": "tsc -b --watch" }, "dependencies": { - "@jupyterlab/ui-components": "~4.7.0-alpha.1", - "react": "^18.2.0", - "react-dom": "^18.2.0" + "@jupyterlab/ui-components": "~4.7.0-alpha.1" }, "devDependencies": { "@babel/core": "^7.29.6", - "@babel/preset-env": "^7.10.2", + "@babel/preset-env": "^7.12.1", "@jupyterlab/testutils": "~4.7.0-alpha.1", "@types/jest": "^29.2.5", "babel-loader": "^8.0.6", diff --git a/packages/ui-components/src/index.ts b/packages/ui-components/src/index.ts index e6e4ba467cb..daa4e0ac931 100644 --- a/packages/ui-components/src/index.ts +++ b/packages/ui-components/src/index.ts @@ -1,4 +1,8 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. +/** + * @packageDocumentation + * @module ui-components + */ export * from './icon'; diff --git a/packages/ui-components/style/index.css b/packages/ui-components/style/index.css index 6af4c685ca1..3394b8db847 100644 --- a/packages/ui-components/style/index.css +++ b/packages/ui-components/style/index.css @@ -3,4 +3,5 @@ | Distributed under the terms of the Modified BSD License. |----------------------------------------------------------------------------*/ +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ @import url('./base.css'); diff --git a/packages/ui-components/style/index.js b/packages/ui-components/style/index.js index 8c5a1a08f63..ca06dffa5e2 100644 --- a/packages/ui-components/style/index.js +++ b/packages/ui-components/style/index.js @@ -3,4 +3,6 @@ | Distributed under the terms of the Modified BSD License. |----------------------------------------------------------------------------*/ +/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ + import './base.css'; diff --git a/packages/ui-components/tsconfig.json b/packages/ui-components/tsconfig.json index 399b75b7ac4..11ef5c091eb 100644 --- a/packages/ui-components/tsconfig.json +++ b/packages/ui-components/tsconfig.json @@ -4,5 +4,6 @@ "outDir": "lib", "rootDir": "src" }, - "include": ["src/**/*"] + "include": ["src/**/*"], + "references": [] } diff --git a/yarn.lock b/yarn.lock index 227a1f66cb0..80f92e857c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2194,6 +2194,7 @@ __metadata: "@jupyterlab/pdf-extension": ~4.7.0-alpha.1 "@jupyterlab/pluginmanager-extension": ~4.7.0-alpha.1 "@jupyterlab/running-extension": ~4.7.0-alpha.1 + "@jupyterlab/services": ~7.7.0-alpha.1 "@jupyterlab/services-extension": ~4.7.0-alpha.1 "@jupyterlab/settingeditor": ~4.7.0-alpha.1 "@jupyterlab/settingeditor-extension": ~4.7.0-alpha.1 @@ -2216,6 +2217,7 @@ __metadata: fs-extra: ^8.1.0 glob: ~7.1.6 handlebars: ^4.7.7 + html-webpack-plugin: ^5.6.3 react: ^18.2.0 react-dom: ^18.2.0 rimraf: ^3.0.2 @@ -2234,7 +2236,6 @@ __metadata: "@jupyter-notebook/ui-components": ^7.7.0-alpha.1 "@jupyterlab/application": ~4.7.0-alpha.1 "@jupyterlab/apputils": ~4.8.0-alpha.1 - "@jupyterlab/codeeditor": ~4.7.0-alpha.1 "@jupyterlab/console": ~4.7.0-alpha.1 "@jupyterlab/coreutils": ~6.7.0-alpha.1 "@jupyterlab/docmanager": ~4.7.0-alpha.1 @@ -2258,13 +2259,17 @@ __metadata: "@babel/core": ^7.29.6 "@babel/preset-env": ^7.12.1 "@jupyterlab/application": ~4.7.0-alpha.1 + "@jupyterlab/apputils": ~4.8.0-alpha.1 "@jupyterlab/coreutils": ~6.7.0-alpha.1 "@jupyterlab/docregistry": ~4.7.0-alpha.1 + "@jupyterlab/mainmenu": ~4.7.0-alpha.1 "@jupyterlab/rendermime-interfaces": ~3.15.0-alpha.1 "@jupyterlab/testutils": ~4.7.0-alpha.1 + "@jupyterlab/translation": ~4.7.0-alpha.1 "@jupyterlab/ui-components": ~4.7.0-alpha.1 "@lumino/algorithm": ^2.0.4 "@lumino/coreutils": ^2.2.2 + "@lumino/disposable": ^2.1.5 "@lumino/messaging": ^2.0.4 "@lumino/polling": ^2.1.5 "@lumino/signaling": ^2.1.5 @@ -2286,6 +2291,7 @@ __metadata: "@types/node": ^22.13.4 "@types/semver": ^7.5.8 commander: ^6.2.0 + dependency-graph: ^0.11.0 fs-extra: ^9.1.0 rimraf: ^3.0.2 semver: ^7.6.3 @@ -2322,8 +2328,6 @@ __metadata: "@jupyterlab/coreutils": ~6.7.0-alpha.1 "@jupyterlab/docmanager": ~4.7.0-alpha.1 "@jupyterlab/docregistry": ~4.7.0-alpha.1 - "@jupyterlab/services": ~7.7.0-alpha.1 - "@lumino/algorithm": ^2.0.4 "@lumino/signaling": ^2.1.5 rimraf: ^3.0.2 typescript: ~5.9.3 @@ -2353,7 +2357,6 @@ __metadata: "@jupyterlab/mainmenu": ~4.7.0-alpha.1 "@jupyterlab/translation": ~4.7.0-alpha.1 react: ^18.2.0 - react-dom: ^18.2.0 rimraf: ^3.0.2 typescript: ~5.9.3 languageName: unknown @@ -2368,12 +2371,10 @@ __metadata: "@jupyterlab/application": ~4.7.0-alpha.1 "@jupyterlab/apputils": ~4.8.0-alpha.1 "@jupyterlab/coreutils": ~6.7.0-alpha.1 - "@jupyterlab/docregistry": ~4.7.0-alpha.1 "@jupyterlab/notebook": ~4.7.0-alpha.1 "@jupyterlab/translation": ~4.7.0-alpha.1 "@jupyterlab/ui-components": ~4.7.0-alpha.1 - "@lumino/commands": ^2.3.3 - "@lumino/disposable": ^2.1.5 + "@lumino/widgets": ^2.7.2 rimraf: ^3.0.2 typescript: ~5.9.3 languageName: unknown @@ -2407,19 +2408,21 @@ __metadata: "@jupyterlab/application": ~4.7.0-alpha.1 "@jupyterlab/apputils": ~4.8.0-alpha.1 "@jupyterlab/cells": ~4.7.0-alpha.1 + "@jupyterlab/coreutils": ~6.7.0-alpha.1 "@jupyterlab/debugger": ~4.7.0-alpha.1 "@jupyterlab/docmanager": ~4.7.0-alpha.1 + "@jupyterlab/docregistry": ~4.7.0-alpha.1 + "@jupyterlab/mainmenu": ~4.7.0-alpha.1 "@jupyterlab/metadataform": ~4.7.0-alpha.1 "@jupyterlab/notebook": ~4.7.0-alpha.1 "@jupyterlab/settingregistry": ~4.7.0-alpha.1 "@jupyterlab/toc": ~6.7.0-alpha.1 "@jupyterlab/translation": ~4.7.0-alpha.1 "@jupyterlab/ui-components": ~4.7.0-alpha.1 - "@lumino/algorithm": 2.0.4 + "@lumino/algorithm": ^2.0.4 "@lumino/polling": ^2.1.5 "@lumino/widgets": ^2.7.2 react: ^18.2.0 - react-dom: ^18.2.0 rimraf: ^3.0.2 typescript: ~5.9.3 languageName: unknown @@ -2438,7 +2441,7 @@ __metadata: eslint-plugin-prettier: ^5.0.0 eslint-plugin-react: ^7.37.0 globals: ^16.0.0 - html-webpack-plugin: ^5.6.3 + jsonc-eslint-parser: ^2.4.0 npm-run-all: ^4.1.5 prettier: ^2.8.5 rimraf: ^3.0.2 @@ -2469,18 +2472,16 @@ __metadata: "@jupyterlab/application": ~4.7.0-alpha.1 "@jupyterlab/apputils": ~4.8.0-alpha.1 "@jupyterlab/coreutils": ~6.7.0-alpha.1 - "@jupyterlab/docmanager": ~4.7.0-alpha.1 "@jupyterlab/filebrowser": ~4.7.0-alpha.1 - "@jupyterlab/mainmenu": ~4.7.0-alpha.1 - "@jupyterlab/services": ~7.7.0-alpha.1 + "@jupyterlab/running": ~4.7.0-alpha.1 "@jupyterlab/settingeditor": ~4.7.0-alpha.1 "@jupyterlab/settingregistry": ~4.7.0-alpha.1 - "@jupyterlab/statedb": ~4.7.0-alpha.1 "@jupyterlab/translation": ~4.7.0-alpha.1 "@jupyterlab/ui-components": ~4.7.0-alpha.1 - "@lumino/algorithm": ^2.0.4 "@lumino/commands": ^2.3.3 + "@lumino/signaling": ^2.1.5 "@lumino/widgets": ^2.7.2 + react: ^18.2.0 rimraf: ^3.0.2 typescript: ~5.9.3 languageName: unknown @@ -2490,19 +2491,8 @@ __metadata: version: 0.0.0-use.local resolution: "@jupyter-notebook/tree@workspace:packages/tree" dependencies: - "@jupyterlab/application": ~4.7.0-alpha.1 - "@jupyterlab/apputils": ~4.8.0-alpha.1 - "@jupyterlab/coreutils": ~6.7.0-alpha.1 - "@jupyterlab/docmanager": ~4.7.0-alpha.1 "@jupyterlab/filebrowser": ~4.7.0-alpha.1 - "@jupyterlab/mainmenu": ~4.7.0-alpha.1 - "@jupyterlab/services": ~7.7.0-alpha.1 - "@jupyterlab/settingregistry": ~4.7.0-alpha.1 - "@jupyterlab/statedb": ~4.7.0-alpha.1 - "@jupyterlab/translation": ~4.7.0-alpha.1 "@jupyterlab/ui-components": ~4.7.0-alpha.1 - "@lumino/algorithm": ^2.0.4 - "@lumino/commands": ^2.3.3 "@lumino/coreutils": ^2.2.2 "@lumino/widgets": ^2.7.2 rimraf: ^3.0.2 @@ -2515,14 +2505,12 @@ __metadata: resolution: "@jupyter-notebook/ui-components@workspace:packages/ui-components" dependencies: "@babel/core": ^7.29.6 - "@babel/preset-env": ^7.10.2 + "@babel/preset-env": ^7.12.1 "@jupyterlab/testutils": ~4.7.0-alpha.1 "@jupyterlab/ui-components": ~4.7.0-alpha.1 "@types/jest": ^29.2.5 babel-loader: ^8.0.6 jest: ^29.3.1 - react: ^18.2.0 - react-dom: ^18.2.0 rimraf: ^3.0.2 ts-jest: ^29.0.3 typescript: ~5.9.3 @@ -2860,7 +2848,7 @@ __metadata: languageName: node linkType: hard -"@jupyterlab/codeeditor@npm:^4.7.0-alpha.1, @jupyterlab/codeeditor@npm:~4.7.0-alpha.1": +"@jupyterlab/codeeditor@npm:^4.7.0-alpha.1": version: 4.7.0-alpha.1 resolution: "@jupyterlab/codeeditor@npm:4.7.0-alpha.1" dependencies: @@ -4111,7 +4099,7 @@ __metadata: languageName: node linkType: hard -"@jupyterlab/running@npm:^4.7.0-alpha.1": +"@jupyterlab/running@npm:^4.7.0-alpha.1, @jupyterlab/running@npm:~4.7.0-alpha.1": version: 4.7.0-alpha.1 resolution: "@jupyterlab/running@npm:4.7.0-alpha.1" dependencies: @@ -4258,7 +4246,7 @@ __metadata: languageName: node linkType: hard -"@jupyterlab/statedb@npm:^4.7.0-alpha.1, @jupyterlab/statedb@npm:~4.7.0-alpha.1": +"@jupyterlab/statedb@npm:^4.7.0-alpha.1": version: 4.7.0-alpha.1 resolution: "@jupyterlab/statedb@npm:4.7.0-alpha.1" dependencies: @@ -4739,13 +4727,6 @@ __metadata: languageName: node linkType: hard -"@lumino/algorithm@npm:2.0.4": - version: 2.0.4 - resolution: "@lumino/algorithm@npm:2.0.4" - checksum: ec1532fc294666fb483dd35082ec50ad979d0e9e1daf7a951ca045fd36a1ae88c7c73bf09c1aafed1ea826319f038ec2ed7058f58d214d5ed9f6a4cf61f232e8 - languageName: node - linkType: hard - "@lumino/algorithm@npm:^2.0.4, @lumino/algorithm@npm:^2.0.5": version: 2.0.5 resolution: "@lumino/algorithm@npm:2.0.5"