@caweb/framework 1.8.7 → 1.9.0

package/lib/entry/santabarbara.js

@@ -3,17 +3,15 @@
  *  DO NOT MODIFY
  */
  
-import path from 'path';
-const currentPath = process.cwd();
-
 export default {
     entry: {
         santabarbara: [
-            path.join(currentPath, '/src/styles/colorschemes/santabarbara.scss'),
-			path.join(currentPath, 'node_modules/@caweb/icon-library/build/font-only.css'),
-			path.join(currentPath, '/src/scripts/index.js'),
-            
+            'C:/Development/CAWebPublishing/framework/src/styles/colorschemes/santabarbara.scss',
+			'C:/Development/CAWebPublishing/framework/src/scripts/index.js'
         ]
+    },
+    output: {
+        clean: false
     }
 };
     

package/lib/entry/santacruz.js

@@ -3,17 +3,15 @@
  *  DO NOT MODIFY
  */
  
-import path from 'path';
-const currentPath = process.cwd();
-
 export default {
     entry: {
         santacruz: [
-            path.join(currentPath, '/src/styles/colorschemes/santacruz.scss'),
-			path.join(currentPath, 'node_modules/@caweb/icon-library/build/font-only.css'),
-			path.join(currentPath, '/src/scripts/index.js'),
-            
+            'C:/Development/CAWebPublishing/framework/src/styles/colorschemes/santacruz.scss',
+			'C:/Development/CAWebPublishing/framework/src/scripts/index.js'
         ]
+    },
+    output: {
+        clean: false
     }
 };
     

package/lib/entry/shasta.js

@@ -3,17 +3,15 @@
  *  DO NOT MODIFY
  */
  
-import path from 'path';
-const currentPath = process.cwd();
-
 export default {
     entry: {
         shasta: [
-            path.join(currentPath, '/src/styles/colorschemes/shasta.scss'),
-			path.join(currentPath, 'node_modules/@caweb/icon-library/build/font-only.css'),
-			path.join(currentPath, '/src/scripts/index.js'),
-            
+            'C:/Development/CAWebPublishing/framework/src/styles/colorschemes/shasta.scss',
+			'C:/Development/CAWebPublishing/framework/src/scripts/index.js'
         ]
+    },
+    output: {
+        clean: false
     }
 };
     

package/lib/entry/sierra.js

@@ -3,17 +3,15 @@
  *  DO NOT MODIFY
  */
  
-import path from 'path';
-const currentPath = process.cwd();
-
 export default {
     entry: {
         sierra: [
-            path.join(currentPath, '/src/styles/colorschemes/sierra.scss'),
-			path.join(currentPath, 'node_modules/@caweb/icon-library/build/font-only.css'),
-			path.join(currentPath, '/src/scripts/index.js'),
-            
+            'C:/Development/CAWebPublishing/framework/src/styles/colorschemes/sierra.scss',
+			'C:/Development/CAWebPublishing/framework/src/scripts/index.js'
         ]
+    },
+    output: {
+        clean: false
     }
 };
     

package/lib/entry/trinity.js

@@ -3,17 +3,15 @@
  *  DO NOT MODIFY
  */
  
-import path from 'path';
-const currentPath = process.cwd();
-
 export default {
     entry: {
         trinity: [
-            path.join(currentPath, '/src/styles/colorschemes/trinity.scss'),
-			path.join(currentPath, 'node_modules/@caweb/icon-library/build/font-only.css'),
-			path.join(currentPath, '/src/scripts/index.js'),
-            
+            'C:/Development/CAWebPublishing/framework/src/styles/colorschemes/trinity.scss',
+			'C:/Development/CAWebPublishing/framework/src/scripts/index.js'
         ]
+    },
+    output: {
+        clean: false
     }
 };
     

package/lib/scripts/create-entrypoints.js

@@ -20,33 +20,32 @@ let heading = `/**
 // iterate over all colorschemes
 fs.readdirSync(path.join(currentPath, 'src', 'styles', 'colorschemes')).forEach((c) => {
     let scheme = c.substring(0, c.indexOf('.')).replace(' ', '');
-    let files = [
+
+    // add entries for each colorscheme 
+    entry[scheme] = [
         path.join(currentPath, 'src', 'styles', 'colorschemes', c),
         path.join(currentPath, 'src', 'scripts', 'index.js')
-      ]
-    // add entries for each colorscheme 
-    entry[scheme] = files;
+      ];
 
-    let correctFiles = files.map(f => `'${f.replace(process.cwd(), '').replaceAll('\\', '/')}'`)
+    // correct file paths for output
+    // since the entrypoint only generates one colorscheme
+    // we don't want to clean the output path folder
+    // case there are other colorschemes built there.
     let output = `
-import path from 'path';
-const currentPath = process.cwd();
-
 export default {
     entry: {
         ${scheme}: [
-            path.join(currentPath, ${
-                correctFiles.join('),\n' + 
-                `\t`.repeat(3) + `path.join(currentPath, 'node_modules/@caweb/icon-library/build/font-only.css'),\n` + 
-                `\t`.repeat(3) + 'path.join(currentPath, ')
-            }),
-            
+            ${ entry[scheme]
+                .map(f => `'${f.replaceAll('\\', '/')}'`)
+                .join(',\n' + `\t`.repeat(3) ) }
         ]
+    },
+    output: {
+        clean: false
     }
 };
     `;
 
-
     // write and entrypoint 
     // this allows for serving of a specific entry.
     fs.writeFileSync(
@@ -56,5 +55,4 @@ export default {
 
 })
 
-
 export default {entry};

package/lib/scripts/update-scripts.js

@@ -10,7 +10,7 @@ import { fileURLToPath } from 'url';
 const pkg = JSON.parse( fs.readFileSync(path.resolve('package.json')) );
 
 let scripts = {
-    "webpack": "webpack",
+    "caweb": "caweb",
     "postbuild": "npm run create-entrypoint",
     "create-entrypoint": "node ./lib/scripts/create-entrypoints.js",
     "update-scripts": "node ./lib/scripts/update-scripts.js",
@@ -18,8 +18,8 @@ let scripts = {
     "remove-scheme": "node ./lib/scripts/schemes.js -r",
     "test": "echo \"Error: run tests from root\" && exit 0",
     "build": "npm run build:prod && npm run build:dev",
-    "build:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/scripts/create-entrypoints.js --merge --mode production",
-    "build:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/scripts/create-entrypoints.js --merge --mode development"
+    "build:prod": "caweb build --config ./lib/scripts/create-entrypoints.js --mode production",
+    "build:dev": "caweb build --config ./lib/scripts/create-entrypoints.js --mode development"
 };
 
 // iterate over all colorschemes
@@ -28,12 +28,12 @@ fs.readdirSync(path.resolve('src', 'styles', 'colorschemes')).forEach((c) => {
 
     // add build scripts for each colorscheme 
     scripts[`build:${scheme}`] = `npm run build:${scheme}:prod && npm run build:${scheme}:dev`;
-    scripts[`build:${scheme}:prod`] = `webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/${scheme}.js --merge --mode production`;
-    scripts[`build:${scheme}:dev`] = `webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/${scheme}.js --merge --mode development`;
+    scripts[`build:${scheme}:prod`] = `caweb build --config ./lib/entry/${scheme}.js --mode production`;
+    scripts[`build:${scheme}:dev`] = `caweb build --config ./lib/entry/${scheme}.js --mode development`;
     
     // add serve scripts for each colorscheme 
-    scripts[`serve:${scheme}`] = `set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/${scheme}.js ./lib/scripts/webpack.test.js --merge`;
-    scripts[`serve:${scheme}:quick`] = `set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/${scheme}.js ./lib/scripts/webpack.test.js --merge`;
+    scripts[`serve:${scheme}`] = `caweb serve --config ./lib/entry/${scheme}.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y`;
+    scripts[`serve:${scheme}:audit`] = `caweb serve --config ./lib/entry/${scheme}.js ./lib/scripts/webpack.test.js --scheme false`;
 
 })
 

package/lib/scripts/webpack.test.js

@@ -12,30 +12,31 @@ import CAWebHTMLPlugin from '@caweb/html-webpack-plugin';
 const componentDir = path.join(process.cwd(), 'content', 'components');
 
 let plugins = [];
-
-fs.readdirSync(componentDir).forEach((c) => {
-    let p = fs.readFileSync( path.join(componentDir, c) ).toString();
-    let t = c.replace(/\.*/, '').replace('-', ' ');
-
-    plugins.push(
-      new CAWebHTMLPlugin({
-        filename: `components/${c}`,
-        title: t.charAt(0).toUpperCase() + t.substring(1),
-        templateParameters: {
-          scheme: false, // we use the entrypoints for testing
-          bodyHtmlSnippet: p,
-        },
-        skipAssets: [
-          /.*-rtl.css/, // we skip the Right-to-Left Styles
-          /css-audit.*/, // we skip the CSSAudit Files
-          /a11y.*/, // we skip the A11y Files
-          /jshint.*/, // we skip the JSHint Files
-          /font-only.*/, // we skip the font-only Files
-        ]
-      })
-    )
-})
-
 export default {
-  plugins
+    entry: {
+        icon: '@caweb/icon-library/build/font-only.css'
+    }
 };
+// fs.readdirSync(componentDir).forEach((c) => {
+//     let p = fs.readFileSync( path.join(componentDir, c) ).toString();
+//     let t = c.replace(/\.*/, '').replace('-', ' ');
+
+//     plugins.push(
+//       new CAWebHTMLPlugin({
+//         filename: `components/${c}`,
+//         title: t.charAt(0).toUpperCase() + t.substring(1),
+//         templateParameters: {
+//           scheme: false, // we use the entrypoints for testing
+//           bodyHtmlSnippet: p,
+//         },
+//         skipAssets: [
+//           /.*-rtl.css/, // we skip the Right-to-Left Styles
+//           /css-audit.*/, // we skip the CSSAudit Files
+//           /a11y.*/, // we skip the A11y Files
+//           /jshint.*/, // we skip the JSHint Files
+//           /font-only.*/, // we skip the font-only Files
+//         ]
+//       })
+//     )
+// })
+

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@caweb/framework",
-    "version": "1.8.7",
+    "version": "1.9.0",
     "description": "Official CAWebPublishing Framework frontend toolkit",
     "author": "CAWebPublishing",
     "homepage": "https://github.com/CAWebPublishing/framework#readme",
@@ -27,21 +27,20 @@
         "src",
         "README.md"
     ],
-    "dependencies": {
-        "@caweb/webpack": "^1.5.10"
-    },
     "devDependencies": {
-        "@caweb/icon-library": "^1.1.3",
-        "@inquirer/prompts": "^7.10.0",
+        "@caweb/cli": "^1.15.9",
+        "@caweb/icon-library": "^1.1.4",
+        "@inquirer/prompts": "^8.2.0",
         "animate.css": "^4.1.1",
         "bootstrap": "^5.3.8",
         "bootstrap-forced-colors-css": "^1.0.7",
         "chalk": "^5.6.2",
         "cross-spawn": "^7.0.6",
-        "fast-xml-parser": "^5.3.1"
+        "fast-xml-parser": "^5.3.3",
+        "jquery": "^3.7.1"
     },
     "scripts": {
-        "webpack": "webpack",
+        "caweb": "caweb",
         "postbuild": "npm run create-entrypoint",
         "create-entrypoint": "node ./lib/scripts/create-entrypoints.js",
         "update-scripts": "node ./lib/scripts/update-scripts.js",
@@ -49,67 +48,67 @@
         "remove-scheme": "node ./lib/scripts/schemes.js -r",
         "test": "echo \"Error: run tests from root\" && exit 0",
         "build": "npm run build:prod && npm run build:dev",
-        "build:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/scripts/create-entrypoints.js --merge --mode production",
-        "build:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/scripts/create-entrypoints.js --merge --mode development",
+        "build:prod": "caweb build --config ./lib/scripts/create-entrypoints.js --mode production",
+        "build:dev": "caweb build --config ./lib/scripts/create-entrypoints.js --mode development",
         "build:delta": "npm run build:delta:prod && npm run build:delta:dev",
-        "build:delta:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/delta.js --merge --mode production",
-        "build:delta:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/delta.js --merge --mode development",
-        "serve:delta": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/delta.js ./lib/scripts/webpack.test.js --merge",
-        "serve:delta:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/delta.js ./lib/scripts/webpack.test.js --merge",
+        "build:delta:prod": "caweb build --config ./lib/entry/delta.js --mode production",
+        "build:delta:dev": "caweb build --config ./lib/entry/delta.js --mode development",
+        "serve:delta": "caweb serve --config ./lib/entry/delta.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:delta:audit": "caweb serve --config ./lib/entry/delta.js ./lib/scripts/webpack.test.js --scheme false",
         "build:eureka": "npm run build:eureka:prod && npm run build:eureka:dev",
-        "build:eureka:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/eureka.js --merge --mode production",
-        "build:eureka:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/eureka.js --merge --mode development",
-        "serve:eureka": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/eureka.js ./lib/scripts/webpack.test.js --merge",
-        "serve:eureka:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/eureka.js ./lib/scripts/webpack.test.js --merge",
+        "build:eureka:prod": "caweb build --config ./lib/entry/eureka.js --mode production",
+        "build:eureka:dev": "caweb build --config ./lib/entry/eureka.js --mode development",
+        "serve:eureka": "caweb serve --config ./lib/entry/eureka.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:eureka:audit": "caweb serve --config ./lib/entry/eureka.js ./lib/scripts/webpack.test.js --scheme false",
         "build:mono": "npm run build:mono:prod && npm run build:mono:dev",
-        "build:mono:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/mono.js --merge --mode production",
-        "build:mono:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/mono.js --merge --mode development",
-        "serve:mono": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/mono.js ./lib/scripts/webpack.test.js --merge",
-        "serve:mono:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/mono.js ./lib/scripts/webpack.test.js --merge",
+        "build:mono:prod": "caweb build --config ./lib/entry/mono.js --mode production",
+        "build:mono:dev": "caweb build --config ./lib/entry/mono.js --mode development",
+        "serve:mono": "caweb serve --config ./lib/entry/mono.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:mono:audit": "caweb serve --config ./lib/entry/mono.js ./lib/scripts/webpack.test.js --scheme false",
         "build:oceanside": "npm run build:oceanside:prod && npm run build:oceanside:dev",
-        "build:oceanside:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/oceanside.js --merge --mode production",
-        "build:oceanside:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/oceanside.js --merge --mode development",
-        "serve:oceanside": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/oceanside.js ./lib/scripts/webpack.test.js --merge",
-        "serve:oceanside:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/oceanside.js ./lib/scripts/webpack.test.js --merge",
+        "build:oceanside:prod": "caweb build --config ./lib/entry/oceanside.js --mode production",
+        "build:oceanside:dev": "caweb build --config ./lib/entry/oceanside.js --mode development",
+        "serve:oceanside": "caweb serve --config ./lib/entry/oceanside.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:oceanside:audit": "caweb serve --config ./lib/entry/oceanside.js ./lib/scripts/webpack.test.js --scheme false",
         "build:orangecounty": "npm run build:orangecounty:prod && npm run build:orangecounty:dev",
-        "build:orangecounty:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/orangecounty.js --merge --mode production",
-        "build:orangecounty:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/orangecounty.js --merge --mode development",
-        "serve:orangecounty": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/orangecounty.js ./lib/scripts/webpack.test.js --merge",
-        "serve:orangecounty:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/orangecounty.js ./lib/scripts/webpack.test.js --merge",
+        "build:orangecounty:prod": "caweb build --config ./lib/entry/orangecounty.js --mode production",
+        "build:orangecounty:dev": "caweb build --config ./lib/entry/orangecounty.js --mode development",
+        "serve:orangecounty": "caweb serve --config ./lib/entry/orangecounty.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:orangecounty:audit": "caweb serve --config ./lib/entry/orangecounty.js ./lib/scripts/webpack.test.js --scheme false",
         "build:pasorobles": "npm run build:pasorobles:prod && npm run build:pasorobles:dev",
-        "build:pasorobles:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/pasorobles.js --merge --mode production",
-        "build:pasorobles:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/pasorobles.js --merge --mode development",
-        "serve:pasorobles": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/pasorobles.js ./lib/scripts/webpack.test.js --merge",
-        "serve:pasorobles:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/pasorobles.js ./lib/scripts/webpack.test.js --merge",
+        "build:pasorobles:prod": "caweb build --config ./lib/entry/pasorobles.js --mode production",
+        "build:pasorobles:dev": "caweb build --config ./lib/entry/pasorobles.js --mode development",
+        "serve:pasorobles": "caweb serve --config ./lib/entry/pasorobles.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:pasorobles:audit": "caweb serve --config ./lib/entry/pasorobles.js ./lib/scripts/webpack.test.js --scheme false",
         "build:sacramento": "npm run build:sacramento:prod && npm run build:sacramento:dev",
-        "build:sacramento:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/sacramento.js --merge --mode production",
-        "build:sacramento:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/sacramento.js --merge --mode development",
-        "serve:sacramento": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/sacramento.js ./lib/scripts/webpack.test.js --merge",
-        "serve:sacramento:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/sacramento.js ./lib/scripts/webpack.test.js --merge",
+        "build:sacramento:prod": "caweb build --config ./lib/entry/sacramento.js --mode production",
+        "build:sacramento:dev": "caweb build --config ./lib/entry/sacramento.js --mode development",
+        "serve:sacramento": "caweb serve --config ./lib/entry/sacramento.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:sacramento:audit": "caweb serve --config ./lib/entry/sacramento.js ./lib/scripts/webpack.test.js --scheme false",
         "build:santabarbara": "npm run build:santabarbara:prod && npm run build:santabarbara:dev",
-        "build:santabarbara:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/santabarbara.js --merge --mode production",
-        "build:santabarbara:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/santabarbara.js --merge --mode development",
-        "serve:santabarbara": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/santabarbara.js ./lib/scripts/webpack.test.js --merge",
-        "serve:santabarbara:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/santabarbara.js ./lib/scripts/webpack.test.js --merge",
+        "build:santabarbara:prod": "caweb build --config ./lib/entry/santabarbara.js --mode production",
+        "build:santabarbara:dev": "caweb build --config ./lib/entry/santabarbara.js --mode development",
+        "serve:santabarbara": "caweb serve --config ./lib/entry/santabarbara.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:santabarbara:audit": "caweb serve --config ./lib/entry/santabarbara.js ./lib/scripts/webpack.test.js --scheme false",
         "build:santacruz": "npm run build:santacruz:prod && npm run build:santacruz:dev",
-        "build:santacruz:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/santacruz.js --merge --mode production",
-        "build:santacruz:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/santacruz.js --merge --mode development",
-        "serve:santacruz": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/santacruz.js ./lib/scripts/webpack.test.js --merge",
-        "serve:santacruz:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/santacruz.js ./lib/scripts/webpack.test.js --merge",
+        "build:santacruz:prod": "caweb build --config ./lib/entry/santacruz.js --mode production",
+        "build:santacruz:dev": "caweb build --config ./lib/entry/santacruz.js --mode development",
+        "serve:santacruz": "caweb serve --config ./lib/entry/santacruz.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:santacruz:audit": "caweb serve --config ./lib/entry/santacruz.js ./lib/scripts/webpack.test.js --scheme false",
         "build:shasta": "npm run build:shasta:prod && npm run build:shasta:dev",
-        "build:shasta:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/shasta.js --merge --mode production",
-        "build:shasta:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/shasta.js --merge --mode development",
-        "serve:shasta": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/shasta.js ./lib/scripts/webpack.test.js --merge",
-        "serve:shasta:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/shasta.js ./lib/scripts/webpack.test.js --merge",
+        "build:shasta:prod": "caweb build --config ./lib/entry/shasta.js --mode production",
+        "build:shasta:dev": "caweb build --config ./lib/entry/shasta.js --mode development",
+        "serve:shasta": "caweb serve --config ./lib/entry/shasta.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:shasta:audit": "caweb serve --config ./lib/entry/shasta.js ./lib/scripts/webpack.test.js --scheme false",
         "build:sierra": "npm run build:sierra:prod && npm run build:sierra:dev",
-        "build:sierra:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/sierra.js --merge --mode production",
-        "build:sierra:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/sierra.js --merge --mode development",
-        "serve:sierra": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/sierra.js ./lib/scripts/webpack.test.js --merge",
-        "serve:sierra:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/sierra.js ./lib/scripts/webpack.test.js --merge",
+        "build:sierra:prod": "caweb build --config ./lib/entry/sierra.js --mode production",
+        "build:sierra:dev": "caweb build --config ./lib/entry/sierra.js --mode development",
+        "serve:sierra": "caweb serve --config ./lib/entry/sierra.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:sierra:audit": "caweb serve --config ./lib/entry/sierra.js ./lib/scripts/webpack.test.js --scheme false",
         "build:trinity": "npm run build:trinity:prod && npm run build:trinity:dev",
-        "build:trinity:prod": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/trinity.js --merge --mode production",
-        "build:trinity:dev": "webpack build --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/trinity.js --merge --mode development",
-        "serve:trinity": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/trinity.js ./lib/scripts/webpack.test.js --merge",
-        "serve:trinity:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./node_modules/@caweb/webpack/webpack.config.js ./lib/entry/trinity.js ./lib/scripts/webpack.test.js --merge"
+        "build:trinity:prod": "caweb build --config ./lib/entry/trinity.js --mode production",
+        "build:trinity:dev": "caweb build --config ./lib/entry/trinity.js --mode development",
+        "serve:trinity": "caweb serve --config ./lib/entry/trinity.js ./lib/scripts/webpack.test.js --scheme false --no-jshint --no-audit --no-a11y",
+        "serve:trinity:audit": "caweb serve --config ./lib/entry/trinity.js ./lib/scripts/webpack.test.js --scheme false"
     }
-}
+}

package/src/scripts/components/header.js

@@ -56,17 +56,9 @@ window.addEventListener('DOMContentLoaded', () => {
       // move the header up to the scroll height, minus any elements above the header
       header.style.top = `-${(scrollHeights - miscElementHeights)}px`;
 
-      // we add the header height + misc element heights to the page container as margin-top, minus the scroll heights since those get hidden
-      if( pageContainer ){
-        pageContainer.style.marginTop =  `${(header.clientHeight + miscElementHeights - scrollHeights)}px`;
-      }
     } else {
       // reset header to initial position
       header.style.top = `${miscElementHeights}px`; 
-
-      if( pageContainer ){
-        pageContainer.style.marginTop =  `${(header.clientHeight + miscElementHeights)}px`;
-      }
     }
 
     // for each element with an id we add the scroll-margin-top

package/src/styles/components/content/_alerts.scss

@@ -12,6 +12,10 @@ header{
         margin-bottom: 0;
         padding: .5rem 0;
         
+        * {
+            font-size: 14px;
+        }
+        
         .alert-link{
             margin-left: auto;
 

package/src/styles/components/structural/_header.scss

@@ -3,10 +3,9 @@
    /src/styles/components/header.scss
 ----------------------------------------- */
 header.global-header{
-  position: fixed;
+  position: sticky;
   background-color: var(--bs-white, $white);
   z-index: 15;
-  top: 0;
   transition: all 0.3s ease;
   width: 100%;
 

package/build/delta.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '669f15672815d314f160');

package/build/delta.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => 'ffdbe731d118a92764ce');

package/build/eureka.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '2f222d1ad0ea70e2cc97');

package/build/eureka.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '3a6327856b97c15772c2');

package/build/mono.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '29bad7d4664ed64b8645');

package/build/mono.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '3d24819486f393c36922');

package/build/oceanside.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '7209b9e68c79d2ad3f83');

package/build/oceanside.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '68b0661418cdd472a21f');

package/build/orangecounty.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => 'dd5e06b56a7cd7facfd4');

package/build/orangecounty.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '9516e649d0cafadcc4b1');

package/build/pasorobles.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => 'cd713ea316438658971d');

package/build/pasorobles.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '6e222ed57a0db1056410');

package/build/sacramento.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '2ceeff47028d87216607');

package/build/sacramento.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '480a2c7fecb323dc59ef');

package/build/santabarbara.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '39728445ba39609c4b8a');

package/build/santabarbara.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => 'd82d6537c19f50edbb44');

package/build/santacruz.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '27a8da102f5d0d90e68e');

package/build/santacruz.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '923eaeb9cbf0fb54daa1');

package/build/shasta.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '8ace24ab264719604f1c');

package/build/shasta.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => 'dcdd82c4454e855278b6');

package/build/sierra.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '00893b05655ddfd53dd6');

package/build/sierra.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '3b36e044458224123fdb');

package/build/trinity.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '37a3c20c49704f862b37');

package/build/trinity.min.asset.php

@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => 'c94a9522868ee03b2568');