Merge pull request #7650 from blink1073/remove-vega4

Remove vega4-extension
jupyterlab · Dec 18, 2019 · 828cb7c · 828cb7c
2 parents ffb05cc + 4e5be32
commit 828cb7c
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 7,051 deletions.
diff --git a/buildutils/src/ensure-repo.ts b/buildutils/src/ensure-repo.ts
@@ -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']
 };
 
@@ -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']
 };

diff --git a/dev_mode/package.json b/dev_mode/package.json
@@ -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": {
@@ -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",
@@ -230,7 +228,6 @@
       "@jupyterlab/javascript-extension": "",
       "@jupyterlab/json-extension": "",
       "@jupyterlab/pdf-extension": "",
-      "@jupyterlab/vega4-extension": "",
       "@jupyterlab/vega5-extension": ""
     },
     "buildDir": "./static",
@@ -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",

diff --git a/package.json b/package.json
@@ -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",

diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json
@@ -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": {

diff --git a/packages/metapackage/src/index.ts b/packages/metapackage/src/index.ts
@@ -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';
diff --git a/packages/metapackage/tsconfig.json b/packages/metapackage/tsconfig.json
@@ -234,9 +234,6 @@
     {
       "path": "../vdom-extension"
     },
-    {
-      "path": "../vega4-extension"
-    },
     {
       "path": "../vega5-extension"
     }

diff --git a/packages/vega4-extension/README.md b/packages/vega4-extension/README.md
diff --git a/packages/vega4-extension/package.json b/packages/vega4-extension/package.json
diff --git a/packages/vega4-extension/src/built-vega-embed.d.ts b/packages/vega4-extension/src/built-vega-embed.d.ts