Browse Source

clean up logic about what should be included

Steven Silvester 6 years ago
parent
commit
3db4f3cfd4
42 changed files with 30 additions and 42 deletions
  1. 17 2
      buildutils/src/ensure-repo.ts
  2. 0 1
      packages/application-extension/package.json
  3. 3 3
      packages/application/package.json
  4. 0 1
      packages/apputils-extension/package.json
  5. 3 0
      packages/attachments/package.json
  6. 3 0
      packages/cells/package.json
  7. 3 0
      packages/codeeditor/package.json
  8. 0 1
      packages/codemirror-extension/package.json
  9. 0 1
      packages/completer-extension/package.json
  10. 0 1
      packages/console-extension/package.json
  11. 1 1
      packages/coreutils/package.json
  12. 0 1
      packages/csvviewer-extension/package.json
  13. 0 1
      packages/docmanager-extension/package.json
  14. 0 1
      packages/documentsearch-extension/package.json
  15. 0 1
      packages/extensionmanager-extension/package.json
  16. 0 1
      packages/faq-extension/package.json
  17. 0 1
      packages/filebrowser-extension/package.json
  18. 0 1
      packages/fileeditor-extension/package.json
  19. 0 1
      packages/help-extension/package.json
  20. 0 1
      packages/htmlviewer-extension/package.json
  21. 0 1
      packages/imageviewer-extension/package.json
  22. 0 1
      packages/inspector-extension/package.json
  23. 0 1
      packages/javascript-extension/package.json
  24. 0 1
      packages/json-extension/package.json
  25. 0 1
      packages/launcher-extension/package.json
  26. 0 1
      packages/mainmenu-extension/package.json
  27. 0 1
      packages/markdownviewer-extension/package.json
  28. 0 1
      packages/mathjax2-extension/package.json
  29. 0 1
      packages/notebook-extension/package.json
  30. 0 1
      packages/pdf-extension/package.json
  31. 0 1
      packages/rendermime-extension/package.json
  32. 0 1
      packages/running-extension/package.json
  33. 0 1
      packages/settingeditor-extension/package.json
  34. 0 1
      packages/shortcuts-extension/package.json
  35. 0 1
      packages/statusbar-extension/package.json
  36. 0 1
      packages/tabmanager-extension/package.json
  37. 0 1
      packages/terminal-extension/package.json
  38. 0 1
      packages/theme-dark-extension/package.json
  39. 0 1
      packages/theme-light-extension/package.json
  40. 0 1
      packages/tooltip-extension/package.json
  41. 0 1
      packages/vdom-extension/package.json
  42. 0 1
      packages/vega5-extension/package.json

+ 17 - 2
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;
     }
 

+ 0 - 1
packages/application-extension/package.json

@@ -47,7 +47,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 3 - 3
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
   }
 }

+ 0 - 1
packages/apputils-extension/package.json

@@ -53,7 +53,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 3 - 0
packages/attachments/package.json

@@ -43,6 +43,9 @@
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3"
   },
+  "jupyterlab": {
+    "coreDependency": false
+  },
   "publishConfig": {
     "access": "public"
   }

+ 3 - 0
packages/cells/package.json

@@ -54,6 +54,9 @@
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3"
   },
+  "jupyterlab": {
+    "coreDependency": false
+  },
   "publishConfig": {
     "access": "public"
   }

+ 3 - 0
packages/codeeditor/package.json

@@ -45,6 +45,9 @@
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3"
   },
+  "jupyterlab": {
+    "coreDependency": false
+  },
   "publishConfig": {
     "access": "public"
   }

+ 0 - 1
packages/codemirror-extension/package.json

@@ -51,7 +51,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/completer-extension/package.json

@@ -49,7 +49,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/console-extension/package.json

@@ -55,7 +55,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 1 - 1
packages/coreutils/package.json

@@ -52,6 +52,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "include": true
+    "coreDependency": true
   }
 }

+ 0 - 1
packages/csvviewer-extension/package.json

@@ -48,7 +48,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }

+ 0 - 1
packages/docmanager-extension/package.json

@@ -52,7 +52,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/documentsearch-extension/package.json

@@ -43,7 +43,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/extensionmanager-extension/package.json

@@ -46,7 +46,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/faq-extension/package.json

@@ -47,7 +47,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }

+ 0 - 1
packages/filebrowser-extension/package.json

@@ -53,7 +53,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/fileeditor-extension/package.json

@@ -54,7 +54,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/help-extension/package.json

@@ -49,7 +49,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/htmlviewer-extension/package.json

@@ -43,7 +43,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }

+ 0 - 1
packages/imageviewer-extension/package.json

@@ -45,7 +45,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/inspector-extension/package.json

@@ -47,7 +47,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/javascript-extension/package.json

@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "mimeExtension": true
   }
 }

+ 0 - 1
packages/json-extension/package.json

@@ -54,7 +54,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "mimeExtension": true
   }
 }

+ 0 - 1
packages/launcher-extension/package.json

@@ -48,7 +48,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/mainmenu-extension/package.json

@@ -49,7 +49,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/markdownviewer-extension/package.json

@@ -46,7 +46,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/mathjax2-extension/package.json

@@ -43,7 +43,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }

+ 0 - 1
packages/notebook-extension/package.json

@@ -60,7 +60,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/pdf-extension/package.json

@@ -45,7 +45,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "mimeExtension": true
   }
 }

+ 0 - 1
packages/rendermime-extension/package.json

@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }

+ 0 - 1
packages/running-extension/package.json

@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }

+ 0 - 1
packages/settingeditor-extension/package.json

@@ -48,7 +48,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/shortcuts-extension/package.json

@@ -46,7 +46,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/statusbar-extension/package.json

@@ -55,7 +55,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/tabmanager-extension/package.json

@@ -44,7 +44,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }

+ 0 - 1
packages/terminal-extension/package.json

@@ -49,7 +49,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/theme-dark-extension/package.json

@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "themePath": "style/index.css"
   }

+ 0 - 1
packages/theme-light-extension/package.json

@@ -42,7 +42,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "themePath": "style/index.css"
   }

+ 0 - 1
packages/tooltip-extension/package.json

@@ -53,7 +53,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true,
     "schemaDir": "schema"
   }

+ 0 - 1
packages/vdom-extension/package.json

@@ -46,7 +46,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "extension": true
   }
 }

+ 0 - 1
packages/vega5-extension/package.json

@@ -47,7 +47,6 @@
     "access": "public"
   },
   "jupyterlab": {
-    "core": true,
     "mimeExtension": true
   }
 }