Merge d0b3a7d into b5074c8

TAMULib · Aug 30, 2021 · 225ae55 · 225ae55
2 parents b5074c8 + d0b3a7d
commit 225ae55
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/.wvr-ud/config.json b/.wvr-ud/config.json
@@ -11,6 +11,7 @@
     "dist/bundle/weaver-components.js"
   ],
   "additionalAssets": [
-    "src/assets/**/*"
+    "src/assets/**/*",
+    "dist/bundle/styles.css"
   ]
 }
diff --git a/angular.json b/angular.json
@@ -56,9 +56,17 @@
                 }
               ],
               "buildOptimizer": true,
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "fonts": {
+                  "inline": true
+                },
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                }
+              },
               "sourceMap": false,
-              "extractCss": false,
               "extractLicenses": true,
               "commonChunk": false,
               "namedChunks": false,

diff --git a/scripts/build-wvr-components.js b/scripts/build-wvr-components.js
@@ -19,7 +19,6 @@ cp.fork(__dirname + '/build-wvr-config-template.js');
 
   const files = [
     `${componentsPath}/polyfills-${esv}.js`,
-    `${componentsPath}/styles-${esv}.js`,
     `${componentsPath}/main-${esv}.js`
   ];
 
@@ -30,7 +29,8 @@ cp.fork(__dirname + '/build-wvr-config-template.js');
   await concat(files, `${bundlePath}/weaver-components.js`);
 
   fs.copy(`${componentsPath}/assets`, `${usagePath}/assets`);
-  fs.copy(`${componentsPath}/assets`, `${bundlePath}/assets`);
+  fs.copy(`${componentsPath}/assets`, `${bundlePath}/assets`)
+  fs.copy(`${componentsPath}/styles.css`, `${bundlePath}/styles.css`);
 
   fs.copy('projects/wvr-elements/src/lib/shared/styles', `${elementsPath}/styles`);
   fs.copy('scripts', `${elementsPath}/scripts`);

diff --git a/src/index-docs.html b/src/index-docs.html
@@ -27,6 +27,7 @@
       border-bottom: 1px solid grey;
     }
   </style>
+  <link rel="stylesheet" type="text/css" href="/weaver-components/docs/usage/assets/styles.css"></link>
 </head>
 
 <body class="wvr-components-loading">

diff --git a/src/index-reports.html b/src/index-reports.html
@@ -27,6 +27,7 @@
       border-bottom: 1px solid grey;
     }
   </style>
+  <link rel="stylesheet" type="text/css" href="/weaver-components/docs/usage/assets/styles.css"></link>
 </head>
 
 <body class="wvr-components-loading">

diff --git a/src/index-static.html b/src/index-static.html
@@ -27,6 +27,7 @@
       border-bottom: 1px solid grey;
     }
   </style>
+  <link rel="stylesheet" type="text/css" href="/weaver-components/docs/usage/assets/styles.css"></link>
 </head>
 
 <body class="wvr-components-loading">

diff --git a/src/index.html b/src/index.html
@@ -31,7 +31,7 @@
       border-bottom: 1px solid grey;
     }
   </style>
-
+  <link rel="stylesheet" type="text/css" href="styles.css">
 </head>
 
 <body class="wvr-components-loading">