Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove vega4-extension #7650

Merged
merged 4 commits into from Dec 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions buildutils/src/ensure-repo.ts
Expand Up @@ -25,7 +25,6 @@ type Dict<T> = { [key: string]: T };
let MISSING: Dict<string[]> = {
'@jupyterlab/buildutils': ['path'],
'@jupyterlab/testutils': ['fs'],
'@jupyterlab/vega4-extension': ['vega-embed'],
'@jupyterlab/vega5-extension': ['vega-embed']
};

Expand All @@ -36,7 +35,6 @@ let UNUSED: Dict<string[]> = {
'@jupyterlab/services': ['node-fetch', 'ws'],
'@jupyterlab/testutils': ['node-fetch', 'identity-obj-proxy'],
'@jupyterlab/test-csvviewer': ['csv-spectrum'],
'@jupyterlab/vega4-extension': ['vega', 'vega-lite'],
'@jupyterlab/vega5-extension': ['vega', 'vega-lite'],
'@jupyterlab/ui-components': ['@blueprintjs/icons']
};
Expand Down
4 changes: 0 additions & 4 deletions dev_mode/package.json
Expand Up @@ -56,7 +56,6 @@
"@jupyterlab/tooltip-extension": "~2.0.0-alpha.4",
"@jupyterlab/ui-components-extension": "~2.0.0-alpha.4",
"@jupyterlab/vdom-extension": "~2.0.0-alpha.4",
"@jupyterlab/vega4-extension": "~2.0.0-alpha.4",
"@jupyterlab/vega5-extension": "~2.0.0-alpha.4"
},
"devDependencies": {
Expand Down Expand Up @@ -166,7 +165,6 @@
"@jupyterlab/ui-components-extension": "~2.0.0-alpha.4",
"@jupyterlab/vdom": "~2.0.0-alpha.4",
"@jupyterlab/vdom-extension": "~2.0.0-alpha.4",
"@jupyterlab/vega4-extension": "~2.0.0-alpha.4",
"@jupyterlab/vega5-extension": "~2.0.0-alpha.4",
"@lumino/algorithm": "^1.2.1",
"@lumino/application": "^1.7.4",
Expand Down Expand Up @@ -230,7 +228,6 @@
"@jupyterlab/javascript-extension": "",
"@jupyterlab/json-extension": "",
"@jupyterlab/pdf-extension": "",
"@jupyterlab/vega4-extension": "",
"@jupyterlab/vega5-extension": ""
},
"buildDir": "./static",
Expand Down Expand Up @@ -353,7 +350,6 @@
"@jupyterlab/ui-components-extension": "../packages/ui-components-extension",
"@jupyterlab/vdom": "../packages/vdom",
"@jupyterlab/vdom-extension": "../packages/vdom-extension",
"@jupyterlab/vega4-extension": "../packages/vega4-extension",
"@jupyterlab/vega5-extension": "../packages/vega5-extension",
"node-example": "../packages/services/examples/node",
"@jupyterlab/example-services-browser": "../packages/services/examples/browser",
Expand Down
5 changes: 1 addition & 4 deletions package.json
Expand Up @@ -24,17 +24,14 @@
"analyze:prod": "cd dev_mode && jlpm run build:prod --analyze",
"build": "jlpm run build:dev",
"build:core": "cd jupyterlab/staging && jlpm && (jlpm deduplicate || jlpm) && jlpm run build",
"build:dev": "jlpm run integrity && jlpm run build:vega && jlpm run build:packages && cd dev_mode && jlpm run build",
"build:dev": "jlpm run integrity && jlpm run build:packages && cd dev_mode && jlpm run build",
"build:dev:prod": "jlpm run integrity && jlpm run build:packages && cd dev_mode && jlpm run build:prod",
"build:examples": "lerna run build --scope \"@jupyterlab/example-*\"",
"build:packages": "cd packages/metapackage && jlpm run build",
"build:src": "lerna run build --scope \"@jupyterlab/!(test-|example-|application-top)*\" --concurrency 1",
"build:test": "lerna run build --scope \"@jupyterlab/test-*\" --concurrency 1",
"build:testutils": "cd testutils && jlpm run build",
"build:utils": "cd buildutils && jlpm run build",
"build:vega": "jlpm run build:vega:4 && jlpm run build:vega:5",
"build:vega:4": "cd prebuild/vega4 && jlpm && jlpm run build",
"build:vega:5": "cd prebuild/vega5 && jlpm && jlpm run build",
"bump:js:major": "node buildutils/lib/bump-js-major.js",
"bumpversion": "node buildutils/lib/bumpversion.js",
"clean": "jlpm run clean:dev && jlpm run clean:packages",
Expand Down
4 changes: 2 additions & 2 deletions packages/celltags-extension/package.json
Expand Up @@ -40,10 +40,10 @@
"dependencies": {
"@jupyterlab/application": "^2.0.0-alpha.4",
"@jupyterlab/celltags": "^2.0.0-alpha.4",
"@jupyterlab/notebook": "^2.0.0-alpha.4",
"@types/node": "^12.12.17"
"@jupyterlab/notebook": "^2.0.0-alpha.4"
},
"devDependencies": {
"@types/node": "^12.12.17",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blink1073 I was thinking through how to deal with this. Thanks for handling it!

I think there's an argument for getting rid of any explicit @types/node declaration, but I'll save that for another PR

"rimraf": "~3.0.0",
"typescript": "~3.7.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/celltags/package.json
Expand Up @@ -43,10 +43,10 @@
"@jupyterlab/cells": "^2.0.0-alpha.4",
"@jupyterlab/notebook": "^2.0.0-alpha.4",
"@jupyterlab/ui-components": "^2.0.0-alpha.4",
"@lumino/widgets": "^1.9.4",
"@types/node": "^12.12.17"
"@lumino/widgets": "^1.9.4"
},
"devDependencies": {
"@types/node": "^12.12.17",
"rimraf": "~3.0.0",
"typescript": "~3.7.3"
}
Expand Down
1 change: 0 additions & 1 deletion packages/filebrowser-extension/package.json
Expand Up @@ -49,7 +49,6 @@
"@lumino/algorithm": "^1.2.1",
"@lumino/commands": "^1.8.0",
"@lumino/messaging": "^1.3.1",
"@lumino/polling": "^1.0.1",
"@lumino/widgets": "^1.9.4"
},
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion packages/metapackage/package.json
Expand Up @@ -108,7 +108,6 @@
"@jupyterlab/ui-components-extension": "^2.0.0-alpha.4",
"@jupyterlab/vdom": "^2.0.0-alpha.4",
"@jupyterlab/vdom-extension": "^2.0.0-alpha.4",
"@jupyterlab/vega4-extension": "^2.0.0-alpha.4",
"@jupyterlab/vega5-extension": "^2.0.0-alpha.4"
},
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion packages/metapackage/src/index.ts
Expand Up @@ -65,5 +65,4 @@ import '@jupyterlab/tooltip';
import '@jupyterlab/tooltip-extension';
import '@jupyterlab/ui-components';
import '@jupyterlab/vdom-extension';
import '@jupyterlab/vega4-extension';
import '@jupyterlab/vega5-extension';
3 changes: 0 additions & 3 deletions packages/metapackage/tsconfig.json
Expand Up @@ -234,9 +234,6 @@
{
"path": "../vdom-extension"
},
{
"path": "../vega4-extension"
},
{
"path": "../vega5-extension"
}
Expand Down
107 changes: 0 additions & 107 deletions packages/vega4-extension/README.md

This file was deleted.

56 changes: 0 additions & 56 deletions packages/vega4-extension/package.json

This file was deleted.

1 change: 0 additions & 1 deletion packages/vega4-extension/src/built-vega-embed.d.ts

This file was deleted.