Przeglądaj źródła

chore(ui-devkit): Fix styles & font paths

Michael Bromley 2 lat temu
rodzic
commit
cc05af6647

+ 1 - 0
packages/admin-ui/src/lib/ng-package.json

@@ -10,6 +10,7 @@
     "./static/assets/*.*",
     "./static/assets/*.*",
     "./static/styles/**/*.scss",
     "./static/styles/**/*.scss",
     "./static/fonts/*.woff2",
     "./static/fonts/*.woff2",
+    "./static/fonts/*.css",
     "./static/i18n-messages/*.json"
     "./static/i18n-messages/*.json"
   ],
   ],
   "lib": {
   "lib": {

+ 1 - 1
packages/ui-devkit/scaffold/angular.json

@@ -46,7 +46,7 @@
               }
               }
             ],
             ],
             "styles": [
             "styles": [
-              "src/global-styles.scss"
+              "src/styles/global-styles.scss"
             ],
             ],
             "stylePreprocessorOptions": {
             "stylePreprocessorOptions": {
               "includePaths": [
               "includePaths": [

+ 0 - 1
packages/ui-devkit/scaffold/src/global-styles.scss

@@ -1 +0,0 @@
-@import "./styles/styles";

+ 1 - 0
packages/ui-devkit/scaffold/src/styles/global-styles.scss

@@ -0,0 +1 @@
+@import "./styles";

+ 10 - 8
scripts/check-angular-versions.ts

@@ -21,14 +21,16 @@ async function checkAngularVersions() {
         const devkitVersion =
         const devkitVersion =
             uiDevkitPackageJson.dependencies[pkg as keyof typeof uiDevkitPackageJson.dependencies];
             uiDevkitPackageJson.dependencies[pkg as keyof typeof uiDevkitPackageJson.dependencies];
 
 
-        if (illegalSemverPrefixes.test(uiVersion)) {
-            errors.push(`Angular compiler versions must be exact, got "${uiVersion}" in admin-ui package`);
-        }
-        if (illegalSemverPrefixes.test(devkitVersion)) {
-            errors.push(
-                `Angular compiler versions must be exact, got "${devkitVersion}" in ui-devkit package`,
-            );
-        }
+        // Removing this restriction to allow more flexibility in keeping angular versions
+        // current for end-users, and also preventing issues in monorepos.
+        // if (illegalSemverPrefixes.test(uiVersion)) {
+        //     errors.push(`Angular compiler versions must be exact, got "${uiVersion}" in admin-ui package`);
+        // }
+        // if (illegalSemverPrefixes.test(devkitVersion)) {
+        //     errors.push(
+        //         `Angular compiler versions must be exact, got "${devkitVersion}" in ui-devkit package`,
+        //     );
+        // }
 
 
         if (uiVersion !== devkitVersion) {
         if (uiVersion !== devkitVersion) {
             errors.push(
             errors.push(