clean up logic about what should be included

Nelson-wedefineapps · May 21, 2019 · 3db4f3c · 3db4f3c
1 parent 4476025
commit 3db4f3c
Show file tree

Hide file tree

Showing 42 changed files with 30 additions and 42 deletions.
diff --git a/buildutils/src/ensure-repo.ts b/buildutils/src/ensure-repo.ts
@@ -120,8 +120,23 @@ function ensureJupyterlab(): string[] {
     } catch (e) {
       return;
     }
-    // Only include packages marked as core.
-    if (!data.jupyterlab || !data.jupyterlab.core) {
+    // Determine whether to include the package.
+    if (!data.jupyterlab) {
+      return;
+    }
+    // Skip if explicitly marked as not a core dep.
+    if (
+      'coreDependency' in data.jupyterlab &&
+      !data.jupyterlab.coreDependency
+    ) {
+      return;
+    }
+    // Skip if it is not makred as an extension or a core dep.
+    if (
+      !data.jupyterlab.coreDependency &&
+      !data.jupyterlab.extension &&
+      !data.jupyterlab.mimeExtension
+    ) {
       return;
     }
 

diff --git a/packages/application-extension/package.json b/packages/application-extension/package.json
@@ -47,7 +47,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/application/package.json b/packages/application/package.json
@@ -54,10 +54,10 @@
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3"
   },
+  "jupyterlab": {
+    "coreDependency": true
+  },
   "publishConfig": {
     "access": "public"
-  },
-  "jupyterlab": {
-    "core": true
   }
 }
diff --git a/packages/apputils-extension/package.json b/packages/apputils-extension/package.json
@@ -53,7 +53,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/attachments/package.json b/packages/attachments/package.json
@@ -43,6 +43,9 @@
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3"
   },
+  "jupyterlab": {
+    "coreDependency": false
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/cells/package.json b/packages/cells/package.json
@@ -54,6 +54,9 @@
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3"
   },
+  "jupyterlab": {
+    "coreDependency": false
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/codeeditor/package.json b/packages/codeeditor/package.json
@@ -45,6 +45,9 @@
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3"
   },
+  "jupyterlab": {
+    "coreDependency": false
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/codemirror-extension/package.json b/packages/codemirror-extension/package.json
@@ -51,7 +51,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/completer-extension/package.json b/packages/completer-extension/package.json
@@ -49,7 +49,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/console-extension/package.json b/packages/console-extension/package.json
@@ -55,7 +55,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/coreutils/package.json b/packages/coreutils/package.json
@@ -52,6 +52,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "include": true
+    "coreDependency": true
   }
 }
diff --git a/packages/csvviewer-extension/package.json b/packages/csvviewer-extension/package.json
@@ -48,7 +48,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }
diff --git a/packages/docmanager-extension/package.json b/packages/docmanager-extension/package.json
@@ -52,7 +52,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/documentsearch-extension/package.json b/packages/documentsearch-extension/package.json
@@ -43,7 +43,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/extensionmanager-extension/package.json b/packages/extensionmanager-extension/package.json
@@ -46,7 +46,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/faq-extension/package.json b/packages/faq-extension/package.json
@@ -47,7 +47,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }
diff --git a/packages/filebrowser-extension/package.json b/packages/filebrowser-extension/package.json
@@ -53,7 +53,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/fileeditor-extension/package.json b/packages/fileeditor-extension/package.json
@@ -54,7 +54,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/help-extension/package.json b/packages/help-extension/package.json
@@ -49,7 +49,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/htmlviewer-extension/package.json b/packages/htmlviewer-extension/package.json
@@ -43,7 +43,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }
diff --git a/packages/imageviewer-extension/package.json b/packages/imageviewer-extension/package.json
@@ -45,7 +45,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/inspector-extension/package.json b/packages/inspector-extension/package.json
@@ -47,7 +47,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/javascript-extension/package.json b/packages/javascript-extension/package.json
@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "mimeExtension": true
   }
 }
diff --git a/packages/json-extension/package.json b/packages/json-extension/package.json
@@ -54,7 +54,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "mimeExtension": true
   }
 }
diff --git a/packages/launcher-extension/package.json b/packages/launcher-extension/package.json
@@ -48,7 +48,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/mainmenu-extension/package.json b/packages/mainmenu-extension/package.json
@@ -49,7 +49,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/markdownviewer-extension/package.json b/packages/markdownviewer-extension/package.json
@@ -46,7 +46,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/mathjax2-extension/package.json b/packages/mathjax2-extension/package.json
@@ -43,7 +43,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }
diff --git a/packages/notebook-extension/package.json b/packages/notebook-extension/package.json
@@ -60,7 +60,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/pdf-extension/package.json b/packages/pdf-extension/package.json
@@ -45,7 +45,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "mimeExtension": true
   }
 }
diff --git a/packages/rendermime-extension/package.json b/packages/rendermime-extension/package.json
@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }
diff --git a/packages/running-extension/package.json b/packages/running-extension/package.json
@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }
diff --git a/packages/settingeditor-extension/package.json b/packages/settingeditor-extension/package.json
@@ -48,7 +48,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/shortcuts-extension/package.json b/packages/shortcuts-extension/package.json
@@ -46,7 +46,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/statusbar-extension/package.json b/packages/statusbar-extension/package.json
@@ -55,7 +55,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/tabmanager-extension/package.json b/packages/tabmanager-extension/package.json
@@ -44,7 +44,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }
diff --git a/packages/terminal-extension/package.json b/packages/terminal-extension/package.json
@@ -49,7 +49,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/theme-dark-extension/package.json b/packages/theme-dark-extension/package.json
@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "themePath": "style/index.css"
   }

diff --git a/packages/theme-light-extension/package.json b/packages/theme-light-extension/package.json
@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "themePath": "style/index.css"
   }

diff --git a/packages/tooltip-extension/package.json b/packages/tooltip-extension/package.json
@@ -53,7 +53,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

diff --git a/packages/vdom-extension/package.json b/packages/vdom-extension/package.json
@@ -46,7 +46,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }
diff --git a/packages/vega5-extension/package.json b/packages/vega5-extension/package.json
@@ -47,7 +47,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "mimeExtension": true
   }
 }