fix: scss bundles proper export

shlomiassaf · May 24, 2021 · c86b9b5 · c86b9b5
1 parent 03bef46
commit c86b9b5
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 8 deletions.
diff --git a/angular.json b/angular.json
@@ -418,6 +418,11 @@
                       "glob": "**/*.scss",
                       "input": "libs/ngrid/theming",
                       "output": "dist/@pebula/ngrid/theming"
+                    },
+                    {
+                      "glob": "*/theming/**/*.scss",
+                      "input": "libs/ngrid",
+                      "output": "dist/@pebula/ngrid"
                     }
                   ]
                 },
@@ -528,6 +533,11 @@
                       "glob": "**/*.scss",
                       "input": "libs/ngrid-material/theming",
                       "output": "dist/@pebula/ngrid-material/theming"
+                    },
+                    {
+                      "glob": "*/theming/**/*.scss",
+                      "input": "libs/ngrid-material",
+                      "output": "dist/@pebula/ngrid-material"
                     }
                   ]
                 },
@@ -686,6 +696,11 @@
                       "glob": "**/*.scss",
                       "input": "libs/ngrid-bootstrap/theming",
                       "output": "dist/@pebula/ngrid-bootstrap/theming"
+                    },
+                    {
+                      "glob": "*/theming/**/*.scss",
+                      "input": "libs/ngrid-bootstrap",
+                      "output": "dist/@pebula/ngrid-bootstrap"
                     }
                   ]
                 },

diff --git a/apps/ngrid-dev-app/src/theme.scss b/apps/ngrid-dev-app/src/theme.scss
@@ -12,7 +12,7 @@ $ngrid-material-starter-theme: ngrid.define-light-theme($ngrid-material-starter-
 @include mat.core($typography-config);
 @include ngrid.ngrid-typography($typography-config);
 @include mat.all-component-themes($ngrid-material-starter-theme);
-@include ngrid.ngrid-theme($ngrid-material-starter-theme);
+@include ngrid-material.all-ngrid-material-theme($ngrid-material-starter-theme);
 
 html, body { height: 100%; }
 body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }

diff --git a/apps/ngrid-docs-app/src/styles/main.scss b/apps/ngrid-docs-app/src/styles/main.scss
@@ -19,7 +19,7 @@ $pbl-shell-theme: default-theme.shell-light-theme(mat.$blue-palette, mat.$light-
 @include shell.render-shell-app-theme($pbl-shell-theme, $typography-config);
 
 // @include ngrid.ngrid-theme($pbl-shell-theme);
-@include ngrid-material.ngrid-material-theme($pbl-shell-theme);
+@include ngrid-material.all-ngrid-material-theme($pbl-shell-theme);
 
 @include ngrid.predefined-spacing($pbl-shell-theme);
 

diff --git a/libs/ngrid-material/_index.scss b/libs/ngrid-material/_index.scss
@@ -1 +1,2 @@
-@forward './theming/ngrid-material' show ngrid-material-theme;
+@forward './theming/ngrid-material' show ngrid-material-theme, all-ngrid-material-theme;
+@forward './context-menu/theming' show ngrid-material-context-menu-theme;
diff --git a/...rid-material/context-menu/src/_theme.scss → ...material/context-menu/theming/_index.scss b/...rid-material/context-menu/src/_theme.scss → ...material/context-menu/theming/_index.scss
diff --git a/libs/ngrid-material/theming/_ngrid-material.scss b/libs/ngrid-material/theming/_ngrid-material.scss
@@ -1,7 +1,11 @@
 @use '../../ngrid' as ngrid;
-@use '../context-menu/src/theme' as context-menu;
+@use '../context-menu/theming' as context-menu;
 
 @mixin ngrid-material-theme($theme) {
   @include ngrid.ngrid-theme($theme);
+}
+
+@mixin all-ngrid-material-theme($theme) {
+  @include ngrid.all-ngrid-theme($theme);
   @include context-menu.ngrid-material-context-menu-theme($theme);
 }
diff --git a/libs/ngrid/_index.scss b/libs/ngrid/_index.scss
@@ -1,4 +1,8 @@
+@forward './theming/typography/typography' show define-typography-level, define-typography-config;
 @forward './theming/palette' show $blue-palette, $grey-palette, $light-theme-palette, $dark-theme-palette, $spacing-theme-defaults;
 @forward './theming/theming' show define-palette, get-color-from-palette, define-light-theme, define-dark-theme;
-@forward './theming/style/render/ngrid' show ngrid-theme, ngrid-typography;
+
+@forward './theming/style/render/ngrid' show all-ngrid-theme, ngrid-theme, ngrid-typography;
 @forward './theming/style/render/ngrid-spacing.scss' show spacing-theme, predefined-spacing;
+
+@forward './drag/theming' show ngrid-drag-plugin-theme;
diff --git a/...d/theming/style/plugins/_drag.plugin.scss → libs/ngrid/drag/theming/_index.scss b/...d/theming/style/plugins/_drag.plugin.scss → libs/ngrid/drag/theming/_index.scss
@@ -1,7 +1,7 @@
 @use 'sass:map';
 @use 'sass:color';
 
-@mixin drag-plugin-theme($theme) {
+@mixin ngrid-drag-plugin-theme($theme) {
   $primary: map.get($theme, primary);
   $accent: map.get($theme, accent);
   $warn: map.get($theme, warn);

diff --git a/libs/ngrid/theming/style/render/ngrid.scss b/libs/ngrid/theming/style/render/ngrid.scss
@@ -1,12 +1,13 @@
 @use 'sass:map';
 @use 'sass:color';
+
+@use '../../../drag/theming' as drag;
 @use '../base';
 @use '../../typography/typography' as typography;
 @use '../../typography/typography-utils' as typography-utils;
 @use './cdk-table';
 @use './ngrid-spacing';
 
-@use '../plugins//drag.plugin' as drag;
 
 @mixin ngrid-theme($theme) {
   @include cdk-table.cdk-table-theme($theme);
@@ -87,7 +88,11 @@
     }
   }
 
-  @include drag.drag-plugin-theme($theme);
+}
+
+@mixin all-ngrid-theme($theme) {
+  @include ngrid-theme($theme);
+  @include drag.ngrid-drag-plugin-theme($theme);
 }
 
 @mixin ngrid-typography($config: null) {