Cleanup dependencies

packages/build/configs/package.config.js

@@ -68,11 +68,6 @@ module.exports = {
         // Note: If there is a package (of our own, or 3rd party) that is a dependency of one of our packages AND one of
         // our apps, then it should be in the list of externals.
         '@atlaskit/tree',
-        '@fortawesome/fontawesome-free',
-        '@fortawesome/fontawesome-svg-core',
-        '@fortawesome/free-regular-svg-icons',
-        '@fortawesome/free-solid-svg-icons',
-        '@fortawesome/react-fontawesome',
         '@hello-pangea/dnd',
         '@labkey/api',
         '@labkey/components',
@@ -82,14 +77,10 @@ module.exports = {
         '@testing-library/jest-dom',
         '@testing-library/react',
         '@testing-library/user-event',
-        'boostrap-sass',
         'classnames',
         'date-fns',
         'date-fns/format',
         'date-fns-tz',
-        'enzyme',
-        'enzyme-adapter-react-16',
-        'enzyme-to-json',
         'execa',
         'font-awesome',
         'formsy-react',
@@ -106,20 +97,17 @@ module.exports = {
         'numeral',
         'prosemirror',
         'react',
-        'react-bootstrap',
-        'react-bootstrap-toggle',
         'react-color',
         'react-datepicker',
         'react-dom',
         'react-dom/test-utils',
         'react-redux',
         'react-router',
-        'react-router-dom',
+        'react-router/dom',
         'react-select',
         'react-select/async',
         'react-select/async-creatable',
         'react-select/creatable',
-        'react-sticky',
         'react-test-renderer',
         'react-treebeard',
         'redux',

packages/build/configs/watch.config.js

@@ -6,7 +6,7 @@ const { TsCheckerRspackPlugin } = require('ts-checker-rspack-plugin');
 const { ReactRefreshRspackPlugin } = require('@rspack/plugin-react-refresh');
 const constants = require('./constants');
 const path = require('path');
-// relative to the <lk_module>/node_modules/@labkey/build/webpack dir
+// relative to the <lk_module>/node_modules/@labkey/build/configs dir
 const entryPoints = require('../../../../src/client/entryPoints');
 
 const devServer = {

packages/build/justfile

@@ -7,7 +7,10 @@ default:
     just --list
 
 currentBranch := `git branch --show-current`
-branchAsTag := replace(currentBranch, '_', '-')
+# The release prefix (e.g. 26.8_) must be stripped: its '.' becomes a prerelease separator, so `npm version prerelease`
+# can't match the preid against the existing identifiers and keeps regenerating '.0' instead of bumping.
+branchAsPreId := replace(replace_regex(currentBranch, '^\d{2}\.\d{1,2}_', ''), '_', '-')
+branchAsTag := replace(replace(currentBranch, '.', '-'), '_', '-')
 packageName := '@labkey/build'
 
 # We trim the trailing / from our environment variables so we can treat them consistently with our other paths
@@ -53,8 +56,8 @@ copy:
 
 # Bumps version to a prerelease version based on the current branch name
 preVersion:
-    @echo {{ GREEN }}Bumping prerelease version with preid='{{CYAN}}'{{ branchAsTag }}{{ NORMAL }}
-    npm version prerelease --preid {{ branchAsTag }} --no-git-tag-version
+    @echo {{ GREEN }}Bumping prerelease version with preid='{{CYAN}}'{{ branchAsPreId }}{{ NORMAL }}
+    @npm version prerelease --preid {{ branchAsPreId }} --no-git-tag-version
 
 # Publishes the current version with the current branch name as a tag
 publishPreVersion:

packages/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/build",
-  "version": "10.1.1",
+  "version": "10.1.2",
   "description": "LabKey client-side build assets",
   "files": [
     "configs/"

packages/components/justfile

@@ -7,7 +7,10 @@ default:
     @just --list
 
 currentBranch := `git branch --show-current`
-branchAsTag := replace(currentBranch, '_', '-')
+# The release prefix (e.g. 26.8_) must be stripped: its '.' becomes a prerelease separator, so `npm version prerelease`
+# can't match the preid against the existing identifiers and keeps regenerating '.0' instead of bumping.
+branchAsPreId := replace(replace_regex(currentBranch, '^\d{2}\.\d{1,2}_', ''), '_', '-')
+branchAsTag := replace(replace(currentBranch, '.', '-'), '_', '-')
 packageName := '@labkey/components'
 
 # We trim the trailing / from our environment variables so we can treat them consistently with our other paths
@@ -33,8 +36,8 @@ puppeteer := lims / 'puppeteer'
 # Note: these are not all of the locations that we use @labkey/components, however they are the most common places that
 # we want to keep up to date.
 platformModules := core + ' ' + experiment + ' ' + assay + ' ' + pipeline
-appModules := premium + ' ' + biologics + ' ' + inventory + ' ' + sampleManagement
-modulesToBump := appModules + ' ' + labbook + ' ' + ' ' + puppeteer + ' ' + platformModules
+appModules := premium + ' ' + biologics + ' ' + inventory + ' ' + sampleManagement + ' ' + labbook
+modulesToBump := appModules + ' ' + puppeteer + ' ' + platformModules
 
 # Note: this is just a common subset of locations where we would want to copy a locally built package, in order to test
 # before we publish a version. You may want to add more locations (e.g. core, assay)
@@ -58,8 +61,8 @@ bc: build copy
 
 # Bumps version to a prerelease version based on the current branch name
 preVersion:
-    @echo {{ GREEN }}Bumping prerelease version with preid='{{CYAN}}'{{ branchAsTag }}{{ NORMAL }}
-    npm version prerelease --preid {{ branchAsTag }} --no-git-tag-version
+    @echo {{ GREEN }}Bumping prerelease version with preid='{{CYAN}}'{{ branchAsPreId }}{{ NORMAL }}
+    @npm version prerelease --preid {{ branchAsPreId }} --no-git-tag-version
 
 # Publishes the current version with the current branch name as a tag
 publishPreVersion:

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.58.0",
+  "version": "7.58.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
@@ -53,13 +53,12 @@
     "@testing-library/jest-dom": "~7.0.1",
     "@testing-library/react": "~16.3.2",
     "@testing-library/user-event": "~14.6.1",
-    "bootstrap": "~3.4.1",
     "classnames": "~2.5.1",
     "date-fns": "~3.6.0",
     "date-fns-tz": "~3.2.0",
     "font-awesome": "~4.7.0",
     "immer": "~11.1.15",
-    "immutable": "~3.8.3",
+    "immutable": "~3.8.4",
     "normalizr": "~3.6.2",
     "numeral": "~2.0.6",
     "papaparse": "5.5.4",
@@ -74,7 +73,7 @@
     "vis-network": "~10.1.0"
   },
   "devDependencies": {
-    "@labkey/build": "10.1.1",
+    "@labkey/build": "10.1.2",
     "@labkey/eslint-config": "1.2.3",
     "@types/history": "4.7.11",
     "@types/jest": "30.0.0",