fix(theme): replicate the same folder structure for local / prod (#1532)

Co-authored-by: Pierre-Étienne Lord <[email protected]>
infra-geo-ouverte · Dec 12, 2023 · dd74269 · dd74269
1 parent 499a8a0
commit dd74269
Show file tree

Hide file tree

Showing 38 changed files with 267 additions and 49 deletions.
diff --git a/angular.json b/angular.json
@@ -51,6 +51,11 @@
                 "input": "./dist/core/locale/",
                 "output": "./locale/libs_locale",
                 "ignore": ["**/*.core.json"]
+              },
+              {
+                "glob": "**/*",
+                "input": "./dist/core/theming/prebuilt-themes",
+                "output": "./assets/igo2/core/theming/prebuilt-themes"
               }
             ],
             "styles": ["projects/demo/src/styles.scss"],

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/common/ng-package.json b/packages/common/ng-package.json
@@ -7,6 +7,7 @@
   },
   "allowedNonPeerDependencies": ["ts-cacheable"],
   "assets": [
+    { "input": "src", "glob": "*.scss", "output": "src" },
     { "input": "src", "glob": "**/*.them*.scss", "output": "src" },
     { "input": "src/style", "glob": "**/*.scss", "output": "src/style" },
     { "input": "src/assets", "glob": "**/*", "output": "assets" },

diff --git a/packages/common/ng-package.prod.json b/packages/common/ng-package.prod.json
@@ -6,6 +6,7 @@
   },
   "allowedNonPeerDependencies": ["ts-cacheable"],
   "assets": [
+    { "input": "src", "glob": "*.scss", "output": "src" },
     { "input": "src", "glob": "**/*.them*.scss", "output": "src" },
     { "input": "src/style", "glob": "**/*.scss", "output": "src/style" },
     { "input": "src/assets", "glob": "**/*", "output": "assets" },

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -30,7 +30,7 @@
       "style": "./style/style.css"
     },
     "./theming": {
-      "sass": "./common-theme.scss"
+      "sass": "./src/common-theme.scss"
     },
     "./partial/*": {
       "sass": "./src/style/partial/*.scss"

diff --git a/packages/context/ng-package.json b/packages/context/ng-package.json
@@ -7,6 +7,7 @@
   },
   "allowedNonPeerDependencies": ["ts-md5"],
   "assets": [
+    { "input": "src", "glob": "*.scss", "output": "src" },
     { "input": "src", "glob": "**/*.them*.scss", "output": "src" },
     { "input": "src/style", "glob": "**/*.scss", "output": "src/style" },
     { "input": "src/assets", "glob": "**/*", "output": "assets" },

diff --git a/packages/context/ng-package.prod.json b/packages/context/ng-package.prod.json
@@ -6,6 +6,7 @@
   },
   "allowedNonPeerDependencies": ["ts-md5"],
   "assets": [
+    { "input": "src", "glob": "*.scss", "output": "src" },
     { "input": "src", "glob": "**/*.them*.scss", "output": "src" },
     { "input": "src/style", "glob": "**/*.scss", "output": "src/style" },
     { "input": "src/assets", "glob": "**/*", "output": "assets" },

diff --git a/packages/context/package.json b/packages/context/package.json
@@ -24,6 +24,9 @@
   "exports": {
     ".": {
       "import": "./src/public_api.ts"
+    },
+    "./theming": {
+      "sass": "./src/context-theme.scss"
     }
   },
   "peerDependencies": {

diff --git a/packages/core/ng-package.json b/packages/core/ng-package.json
@@ -10,7 +10,7 @@
     {
       "input": "src",
       "glob": "*.scss",
-      "output": "",
+      "output": "src",
       "ignore": ["*.import.scss"]
     },
     { "input": "src", "glob": "**/*.them*.scss", "output": "src" },

diff --git a/packages/core/ng-package.prod.json b/packages/core/ng-package.prod.json
@@ -9,7 +9,7 @@
     {
       "input": "src",
       "glob": "*.scss",
-      "output": "",
+      "output": "src",
       "ignore": ["*.import.scss"]
     },
     { "input": "src", "glob": "**/*.them*.scss", "output": "src" },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -16,7 +16,7 @@
     "url": "https://github.com/infra-geo-ouverte/igo2-lib/issues"
   },
   "scripts": {
-    "prestart": "ts-node ../../scripts/src/core/prestart-core.ts",
+    "prestart": "npm run postbuild",
     "build": "ng build core --configuration production",
     "format": "prettier --write ./src/**/*.{ts,js,html,scss,css,json}",
     "postbuild": "ts-node ../../scripts/src/core/postbuild-core.ts",
@@ -39,7 +39,7 @@
       "sass": "./src/style/partial/*.scss"
     },
     "./theming": {
-      "sass": "./core-theme.scss"
+      "sass": "./src/core-theme.scss"
     },
     "./prebuilt-themes/*": {
       "style": "./theming/prebuilt-themes/*.css"

diff --git a/packages/core/src/index.scss b/packages/core/src/index.scss
@@ -1,6 +1,4 @@
 // Theme bundles
-@forward './theming/all-theme' show all-component-themes;
-
 @forward './theming/typography';
 
 // Workaround to allow styles sharing in production where the folder structure is different. We replace the file in a postbuild operation

diff --git a/packages/core/src/theming/prebuilt-themes/blue-theme.scss b/packages/core/src/theming/prebuilt-themes/blue-theme.scss
@@ -1,11 +1,12 @@
 @use 'sass:map';
 @use '@angular/material' as mat;
-@use '../../index' as igo;
+@use '../all-theme';
+@use '../typography';
 
 $primary: mat.define-palette(mat.$blue-palette, 700, 400, 900);
 $accent: mat.define-palette(mat.$blue-palette, 200);
 $warn: mat.define-palette(mat.$red-palette);
-$typography: igo.$igo-typography;
+$typography: typography.$igo-typography;
 
 $theme: mat.define-light-theme(
   (
@@ -23,4 +24,4 @@ $theme: mat.define-light-theme(
 @include mat.typography-hierarchy($typography);
 @include mat.all-component-themes($theme);
 
-@include igo.all-component-themes($theme);
+@include all-theme.all-component-themes($theme);
diff --git a/packages/core/src/theming/prebuilt-themes/bluedark-theme.scss b/packages/core/src/theming/prebuilt-themes/bluedark-theme.scss
@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '@angular/material' as mat;
-@use '../../index' as igo;
+@use '../all-theme';
+@use '../typography';
 
 $bluedark-palette: (
   50: #e3eaec,
@@ -38,7 +39,7 @@ $bluedark-palette: (
 $primary: mat.define-palette($bluedark-palette, 500);
 $accent: mat.define-palette($bluedark-palette, 200);
 $warn: mat.define-palette(mat.$red-palette);
-$typography: igo.$igo-typography;
+$typography: typography.$igo-typography;
 
 $theme: mat.define-light-theme(
   (
@@ -56,4 +57,4 @@ $theme: mat.define-light-theme(
 @include mat.typography-hierarchy($typography);
 @include mat.all-component-themes($theme);
 
-@include igo.all-component-themes($theme);
+@include all-theme.all-component-themes($theme);
diff --git a/packages/core/src/theming/prebuilt-themes/bluedq-theme.scss b/packages/core/src/theming/prebuilt-themes/bluedq-theme.scss
@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '@angular/material' as mat;
-@use '../../index' as igo;
+@use '../all-theme';
+@use '../typography';
 
 $dq-palette: (
   50: #e1f5fd,
@@ -38,7 +39,7 @@ $dq-palette: (
 $primary: mat.define-palette($dq-palette, 900);
 $accent: mat.define-palette($dq-palette, 500);
 $warn: mat.define-palette(mat.$red-palette);
-$typography: igo.$igo-typography;
+$typography: typography.$igo-typography;
 
 $theme: mat.define-light-theme(
   (
@@ -56,4 +57,4 @@ $theme: mat.define-light-theme(
 @include mat.typography-hierarchy($typography);
 @include mat.all-component-themes($theme);
 
-@include igo.all-component-themes($theme);
+@include all-theme.all-component-themes($theme);
diff --git a/packages/core/src/theming/prebuilt-themes/bluegrey-theme.scss b/packages/core/src/theming/prebuilt-themes/bluegrey-theme.scss
@@ -1,10 +1,11 @@
 @use '@angular/material' as mat;
-@use '../../index' as igo;
+@use '../all-theme';
+@use '../typography';
 
 $primary: mat.define-palette(mat.$blue-grey-palette);
 $accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
 $warn: mat.define-palette(mat.$deep-orange-palette);
-$typography: igo.$igo-typography;
+$typography: typography.$igo-typography;
 
 $theme: mat.define-light-theme(
   (
@@ -22,4 +23,4 @@ $theme: mat.define-light-theme(
 @include mat.typography-hierarchy($typography);
 @include mat.all-component-themes($theme);
 
-@include igo.all-component-themes($theme);
+@include all-theme.all-component-themes($theme);
diff --git a/packages/core/src/theming/prebuilt-themes/dark-theme.scss b/packages/core/src/theming/prebuilt-themes/dark-theme.scss
@@ -1,10 +1,11 @@
 @use '@angular/material' as mat;
-@use '../../index' as igo;
+@use '../all-theme';
+@use '../typography';
 
 $primary: mat.define-palette(mat.$blue-grey-palette);
 $accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
 $warn: mat.define-palette(mat.$deep-orange-palette);
-$typography: igo.$igo-typography;
+$typography: typography.$igo-typography;
 
 $theme: mat.define-dark-theme(
   (
@@ -22,4 +23,4 @@ $theme: mat.define-dark-theme(
 @include mat.typography-hierarchy($typography);
 @include mat.all-component-themes($theme);
 
-@include igo.all-component-themes($theme);
+@include all-theme.all-component-themes($theme);
diff --git a/packages/core/src/theming/prebuilt-themes/deeppurple-theme.scss b/packages/core/src/theming/prebuilt-themes/deeppurple-theme.scss
@@ -1,10 +1,11 @@
 @use '@angular/material' as mat;
-@use '../../index' as igo;
+@use '../all-theme';
+@use '../typography';
 
 $primary: mat.define-palette(mat.$deep-purple-palette);
 $accent: mat.define-palette(mat.$amber-palette, A200, A100, A400);
 $warn: mat.define-palette(mat.$red-palette);
-$typography: igo.$igo-typography;
+$typography: typography.$igo-typography;
 
 $theme: mat.define-light-theme(
   (
@@ -22,4 +23,4 @@ $theme: mat.define-light-theme(
 @include mat.typography-hierarchy($typography);
 @include mat.all-component-themes($theme);
 
-@include igo.all-component-themes($theme);
+@include all-theme.all-component-themes($theme);
diff --git a/packages/core/src/theming/prebuilt-themes/indigo-theme.scss b/packages/core/src/theming/prebuilt-themes/indigo-theme.scss
@@ -1,10 +1,11 @@
 @use '@angular/material' as mat;
-@use '../../index' as igo;
+@use '../all-theme';
+@use '../typography';
 
 $primary: mat.define-palette(mat.$indigo-palette);
 $accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
 $warn: mat.define-palette(mat.$red-palette);
-$typography: igo.$igo-typography;
+$typography: typography.$igo-typography;
 
 $theme: mat.define-light-theme(
   (
@@ -22,4 +23,4 @@ $theme: mat.define-light-theme(
 @include mat.typography-hierarchy($typography);
 @include mat.all-component-themes($theme);
 
-@include igo.all-component-themes($theme);
+@include all-theme.all-component-themes($theme);
diff --git a/packages/core/src/theming/prebuilt-themes/orange-theme.scss b/packages/core/src/theming/prebuilt-themes/orange-theme.scss
@@ -1,10 +1,11 @@
 @use '@angular/material' as mat;
-@use '../../index' as igo;
+@use '../all-theme';
+@use '../typography';
 
 $primary: mat.define-palette(mat.$orange-palette, 800);
 $accent: mat.define-palette(mat.$light-blue-palette, 600, 100, 800);
 $warn: mat.define-palette(mat.$red-palette, 600);
-$typography: igo.$igo-typography;
+$typography: typography.$igo-typography;
 
 $theme: mat.define-light-theme(
   (
@@ -22,4 +23,4 @@ $theme: mat.define-light-theme(
 @include mat.typography-hierarchy($typography);
 @include mat.all-component-themes($theme);
 
-@include igo.all-component-themes($theme);
+@include all-theme.all-component-themes($theme);
diff --git a/packages/core/src/theming/prebuilt-themes/qcca-theme.scss b/packages/core/src/theming/prebuilt-themes/qcca-theme.scss
@@ -1,6 +1,8 @@
 @use 'sass:map';
 @use '@angular/material' as mat;
+@use '../all-theme';
 @use '../../' as igo;
+
 @use './qcca';
 
 // https://design.quebec.ca/a-propos-systeme-design
@@ -37,7 +39,7 @@ $theme: map.merge(
 @include mat.typography-hierarchy(qcca.$typo-typography);
 @include mat.all-component-themes($theme);
 
-@include igo.all-component-themes($theme);
+@include all-theme.all-component-themes($theme);
 @include qcca.all-component-themes($theme);
 
 @media (max-width: 1200px) {