Bumped carbon version in Core

packages/apps/esm-devtools-app/package.json

@@ -53,7 +53,7 @@
     "webpack": "^5.88.0"
   },
   "dependencies": {
-    "@carbon/react": "1.37.0",
+    "@carbon/react": "^1.71.0",
     "fuzzy": "^0.1.3"
   }
 }

packages/apps/esm-devtools-app/src/devtools/devtools-popup.styles.scss

@@ -1,4 +1,4 @@
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .popup {
   position: fixed;

packages/apps/esm-devtools-app/src/devtools/import-map-list/list.scss

@@ -1,9 +1,9 @@
-@use '@carbon/styles/scss/colors';
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
+@use '@carbon/colors';
+@use '@carbon/layout';
+@use '@carbon/type';
 
 .imoListContainer {
-  margin: 0 spacing.$spacing-04 0 spacing.$spacing-04;
+  margin: 0 layout.$spacing-04 0 layout.$spacing-04;
   height: 50vh;
 }
 
@@ -13,28 +13,28 @@
   justify-content: left;
 
   > * + * {
-    margin: 0 spacing.$spacing-03;
+    margin: 0 layout.$spacing-03;
   }
 }
 
 .imoSearchBox {
   width: auto;
   min-width: 12rem;
-  margin-right: spacing.$spacing-03;
+  margin-right: layout.$spacing-03;
 }
 
 .imoTable {
   // 50vh is the container size - size of the header
-  max-height: calc(50vh - spacing.$spacing-09 - 12px);
+  max-height: calc(50vh - layout.$spacing-09 - 12px);
 }
 
 .imoStatus {
-  height: spacing.$spacing-04;
-  width: spacing.$spacing-04;
-  border-radius: spacing.$spacing-03;
+  height: layout.$spacing-04;
+  width: layout.$spacing-04;
+  border-radius: layout.$spacing-03;
   border: 1px solid colors.$gray-100;
-  margin-top: spacing.$spacing-02;
-  margin-right: spacing.$spacing-03;
+  margin-top: layout.$spacing-02;
+  margin-right: layout.$spacing-03;
 }
 
 .imoNextOverride {

packages/apps/esm-help-menu-app/package.json

@@ -53,7 +53,7 @@
     "webpack": "^5.88.0"
   },
   "dependencies": {
-    "@carbon/react": "1.37.0",
+    "@carbon/react": "^1.71.0",
     "fuzzy": "^0.1.3"
   }
 }

packages/apps/esm-help-menu-app/src/help-menu/components/styles.scss

@@ -1,6 +1,6 @@
 @use '@carbon/layout';
 @use '@carbon/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .helpButton {
   display: flex;

packages/apps/esm-help-menu-app/src/help-menu/help-popup.styles.scss

@@ -1,6 +1,6 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .popup {
   position: fixed;
@@ -10,9 +10,9 @@
   width: 11rem;
   z-index: 8000;
   background-color: $ui-02;
-  gap: spacing.$spacing-05;
-  padding: spacing.$spacing-02;
-  margin: spacing.$spacing-02;
+  gap: layout.$spacing-05;
+  padding: layout.$spacing-02;
+  margin: layout.$spacing-02;
   box-shadow: 0 12px 24px 0 $ui-03;
 }
 
@@ -21,11 +21,11 @@
 }
 
 .helpextension {
-  margin: spacing.$spacing-04;
-  padding: spacing.$spacing-01;
+  margin: layout.$spacing-04;
+  padding: layout.$spacing-01;
   cursor: pointer;
   text-align: left;
   display: flex;
   flex-direction: column;
-  gap: spacing.$spacing-05;
+  gap: layout.$spacing-05;
 }

packages/apps/esm-implementer-tools-app/package.json

@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "lodash-es": "^4.17.21"
   },
   "peerDependencies": {

packages/apps/esm-implementer-tools-app/src/backend-dependencies/backend-dependencies.styles.scss

@@ -1,4 +1,4 @@
-@use '@carbon/styles/scss/type';
+@use '@carbon/type';
 
 .container {
   height: 50vh;

packages/apps/esm-implementer-tools-app/src/configuration/configuration.styles.scss

@@ -1,8 +1,49 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@carbon/react/scss/themes';
 @use '@carbon/react/scss/theme';
-@import '~@openmrs/esm-styleguide/src/vars';
-@import '../implementer-tools.styles.scss';
+@use '@openmrs/esm-styleguide/src/vars' as *;
+
+.productiveHeading01 {
+  @include type.type-style('heading-compact-01');
+}
+
+.productiveHeading02 {
+  @include type.type-style('heading-compact-02');
+}
+
+.bodyShort01 {
+  @include type.type-style('body-compact-01');
+}
+
+.toolStyles {
+  background-color: transparent;
+}
+
+// Chevron button - implementer-tools component
+.chevronImplementerToolsButton {
+  position: fixed;
+  bottom: 0;
+  left: calc(50vw - layout.$spacing-05);
+  z-index: 9999;
+
+  div {
+    background-color: $ui-02;
+    width: layout.$spacing-07;
+    display: flex;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.1s ease-in-out;
+  }
+
+  div:hover {
+    padding: layout.$spacing-03 0;
+  }
+}
+
+.darkTheme {
+  @include theme.theme(themes.$g90);
+}
 
 .tools {
   width: 100%;

packages/apps/esm-implementer-tools-app/src/configuration/interactive-editor/description.styles.scss

@@ -1,26 +1,68 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-@import '../../implementer-tools.styles.scss';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@carbon/react/scss/themes';
+@use '@carbon/react/scss/theme';
+@use '@openmrs/esm-styleguide/src/vars' as *;
+
+.productiveHeading01 {
+  @include type.type-style('heading-compact-01');
+}
+
+.productiveHeading02 {
+  @include type.type-style('heading-compact-02');
+}
+
+.bodyShort01 {
+  @include type.type-style('body-compact-01');
+}
+
+.toolStyles {
+  background-color: transparent;
+}
+
+// Chevron button - implementer-tools component
+.chevronImplementerToolsButton {
+  position: fixed;
+  bottom: 0;
+  left: calc(50vw - layout.$spacing-05);
+  z-index: 9999;
+
+  div {
+    background-color: $ui-02;
+    width: layout.$spacing-07;
+    display: flex;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.1s ease-in-out;
+  }
+
+  div:hover {
+    padding: layout.$spacing-03 0;
+  }
+}
+
+.darkTheme {
+  @include theme.theme(themes.$g90);
+}
 
 .path {
   @include type.type-style('heading-02');
-  margin-bottom: spacing.$spacing-03;
+  margin-bottom: layout.$spacing-03;
 }
 
 .description {
   @include type.type-style('body-compact-01');
-  margin-bottom: spacing.$spacing-05;
+  margin-bottom: layout.$spacing-05;
 }
 
 .source {
   @include type.type-style('body-compact-01');
   font-style: italic;
-  margin-bottom: spacing.$spacing-03;
+  margin-bottom: layout.$spacing-03;
 }
 
 .value {
   font-family: monospace;
-  margin-top: spacing.$spacing-03;
-  margin-left: spacing.$spacing-03;
+  margin-top: layout.$spacing-03;
+  margin-left: layout.$spacing-03;
 }

packages/apps/esm-implementer-tools-app/src/configuration/interactive-editor/display-value.scss

@@ -1,6 +1,50 @@
-@use '@carbon/styles/scss/spacing';
-@import '../../implementer-tools.styles.scss';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@carbon/react/scss/themes';
+@use '@carbon/react/scss/theme';
+@use '@openmrs/esm-styleguide/src/vars' as *;
+
+.productiveHeading01 {
+  @include type.type-style('heading-compact-01');
+}
+
+.productiveHeading02 {
+  @include type.type-style('heading-compact-02');
+}
+
+.bodyShort01 {
+  @include type.type-style('body-compact-01');
+}
+
+.toolStyles {
+  background-color: transparent;
+}
+
+// Chevron button - implementer-tools component
+.chevronImplementerToolsButton {
+  position: fixed;
+  bottom: 0;
+  left: calc(50vw - layout.$spacing-05);
+  z-index: 9999;
+
+  div {
+    background-color: $ui-02;
+    width: layout.$spacing-07;
+    display: flex;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.1s ease-in-out;
+  }
+
+  div:hover {
+    padding: layout.$spacing-03 0;
+  }
+}
+
+.darkTheme {
+  @include theme.theme(themes.$g90);
+}
 
 .smallListCell {
-  padding: spacing.$spacing-03;
+  padding: layout.$spacing-03;
 }

packages/apps/esm-implementer-tools-app/src/configuration/interactive-editor/editable-value.styles.scss

@@ -1,5 +1,49 @@
-@use '@carbon/styles/scss/spacing';
-@import '../../implementer-tools.styles.scss';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@carbon/react/scss/themes';
+@use '@carbon/react/scss/theme';
+@use '@openmrs/esm-styleguide/src/vars' as *;
+
+.productiveHeading01 {
+  @include type.type-style('heading-compact-01');
+}
+
+.productiveHeading02 {
+  @include type.type-style('heading-compact-02');
+}
+
+.bodyShort01 {
+  @include type.type-style('body-compact-01');
+}
+
+.toolStyles {
+  background-color: transparent;
+}
+
+// Chevron button - implementer-tools component
+.chevronImplementerToolsButton {
+  position: fixed;
+  bottom: 0;
+  left: calc(50vw - layout.$spacing-05);
+  z-index: 9999;
+
+  div {
+    background-color: $ui-02;
+    width: layout.$spacing-07;
+    display: flex;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.1s ease-in-out;
+  }
+
+  div:hover {
+    padding: layout.$spacing-03 0;
+  }
+}
+
+.darkTheme {
+  @include theme.theme(themes.$g90);
+}
 
 .secretButton {
   background: none;
@@ -25,5 +69,5 @@
 }
 
 .editValueButton {
-  margin-left: spacing.$spacing-05;
+  margin-left: layout.$spacing-05;
 }