@labkey/build: support "dependencies" in entry points (#5998)

LabKey · Oct 29, 2024 · 6287777 · 6287777
1 parent 8e761b7
commit 6287777
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 42 deletions.
diff --git a/assay/package-lock.json b/assay/package-lock.json
diff --git a/assay/package.json b/assay/package.json
@@ -12,10 +12,10 @@
     "clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen"
   },
   "dependencies": {
-    "@labkey/components": "5.17.7"
+    "@labkey/components": "5.17.8"
   },
   "devDependencies": {
-    "@labkey/build": "7.7.1",
+    "@labkey/build": "8.0.0",
     "@types/jest": "29.5.12",
     "@types/react": "16.14.60",
     "@types/react-dom": "16.9.24"

diff --git a/assay/src/org/labkey/assay/plate/PlateMetricsProvider.java b/assay/src/org/labkey/assay/plate/PlateMetricsProvider.java
@@ -28,7 +28,7 @@ public class PlateMetricsProvider implements UsageMetricsProvider
 {
     private SQLFragment plateSetPlatesSQL(TableInfo plateSetTable, TableInfo plateTable)
     {
-        return new SQLFragment("SELECT ps.name, COUNT(p.rowid) FROM ")
+        return new SQLFragment("SELECT ps.rowId, COUNT(p.rowid) AS plateCount FROM ")
                 .append(plateSetTable, "ps")
                 .append(" LEFT OUTER JOIN ").append(plateTable, "p")
                 .append(" ON ps.rowid = p.plateset")
@@ -187,7 +187,7 @@ public Map<String, Object> getUsageMetrics()
         Long standAlonePlateSetCount = new SqlSelector(schema.getSchema(), new SQLFragment("SELECT COUNT(*) FROM ").append(plateSetTable, "ps").append(" WHERE type =?").add(PlateSetType.assay).append(" AND rootplatesetid IS NULL")).getObject(Long.class);
         Long plateSetNoPlatesCount = plateSetPlatesCount(schema.getSchema(), plateSetTable, plateTable, 0);
         Long plateSetOnePlateCount = plateSetPlatesCount(schema.getSchema(), plateSetTable, plateTable, 1);
-        SQLFragment maxPlatesSql = new SQLFragment("SELECT MAX(count) FROM (").append(plateSetPlatesSQL(plateSetTable, plateTable)).append(") x");
+        SQLFragment maxPlatesSql = new SQLFragment("SELECT MAX(plateCount) FROM (").append(plateSetPlatesSQL(plateSetTable, plateTable)).append(") x");
         Long maxPlatesCount = new SqlSelector(schema.getSchema(), maxPlatesSql).getObject(Long.class);
         // too many items to use Map.of()
         Map<String, Long> plateSets = new HashMap<>();

diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -54,11 +54,11 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "5.17.7",
+    "@labkey/components": "5.17.8",
     "@labkey/themes": "1.3.3"
   },
   "devDependencies": {
-    "@labkey/build": "7.7.1",
+    "@labkey/build": "8.0.0",
     "@labkey/eslint-config-react": "0.0.15",
     "@types/jest": "29.5.12",
     "@types/react": "18.3.3",

diff --git a/experiment/package-lock.json b/experiment/package-lock.json
diff --git a/experiment/package.json b/experiment/package.json
@@ -13,10 +13,10 @@
     "test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
   },
   "dependencies": {
-    "@labkey/components": "5.17.7"
+    "@labkey/components": "5.17.8"
   },
   "devDependencies": {
-    "@labkey/build": "7.7.1",
+    "@labkey/build": "8.0.0",
     "@labkey/test": "1.6.2",
     "@types/jest": "29.5.12",
     "@types/react": "16.14.60",

diff --git a/pipeline/package-lock.json b/pipeline/package-lock.json
diff --git a/pipeline/package.json b/pipeline/package.json
@@ -14,10 +14,10 @@
     "build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile"
   },
   "dependencies": {
-    "@labkey/components": "5.17.7"
+    "@labkey/components": "5.17.8"
   },
   "devDependencies": {
-    "@labkey/build": "7.7.1",
+    "@labkey/build": "8.0.0",
     "@labkey/eslint-config-react": "0.0.15",
     "@types/jest": "29.5.12",
     "@types/react": "16.14.60",