Merge pull request #205 from emulsify-ds/develop

Release:

Author: callinmullaney

config/webpack/loaders.js

@@ -37,6 +37,25 @@ const postcssConfigPath = fs.existsSync(
   ? path.resolve('config/emulsify-core/webpack/postcss.config.cjs')
   : require.resolve('@emulsify/core/config/postcss.config.js');
 
+/**
+ * Resolve the directory of this file (without fileURLToPath).
+ * @type {string}
+ */
+let _filename = decodeURIComponent(new URL(import.meta.url).pathname);
+if (process.platform === 'win32' && _filename.startsWith('/')) {
+  _filename = _filename.slice(1);
+}
+const _dirname = path.dirname(_filename);
+
+/**
+ * Root of the project (three levels up from this file).
+ * @type {string}
+ */
+const projectDir = path.resolve(_dirname, '../../../../..');
+
+/** Absolute path to the folder that contains sprite source icons. */
+const ICONS_DIR = path.resolve(projectDir, 'assets/icons');
+
 /**
  * @type {import('webpack').RuleSetRule}
  * JavaScript loader: transpile with Babel.
@@ -111,22 +130,17 @@ const ImageLoader = {
 
 /**
  * @type {import('webpack').RuleSetRule}
- * SVG sprite loader: collects all /icons/*.svg into one sprite.
+ * General SVG loader for non-sprite SVGs (logos, illustrations, etc.).
+ * IMPORTANT: Excludes `assets/icons/` so `svg-spritemap-webpack-plugin`
+ * can consume those files without being intercepted by this rule.
  */
-const SVGSpriteLoader = {
+const SVGLoader = {
   test: /icons\/.*\.svg$/,
-  use: [
-    {
-      loader: 'svg-sprite-loader',
-      options: {
-        extract: true,
-        esModule: true,
-        runtimeCompat: true,
-        outputPath: 'dist/',
-        spriteFilename: './icons.svg',
-      },
-    },
-  ],
+  type: 'asset/resource',
+  generator: {
+    filename: 'icons.svg',
+  },
+  exclude: [ICONS_DIR],
 };
 
 /**
@@ -148,6 +162,6 @@ export default {
   JSLoader,
   CSSLoader,
   ImageLoader,
-  SVGSpriteLoader,
+  SVGLoader,
   TwigLoader,
 };

config/webpack/plugins.js

@@ -1,8 +1,9 @@
-import { resolve, dirname } from 'path';
+import { resolve, dirname, relative } from 'path';
 import webpack from 'webpack';
 import { CleanWebpackPlugin } from 'clean-webpack-plugin';
+import RemoveEmptyScriptsPlugin from 'webpack-remove-empty-scripts';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import SpriteLoaderPlugin from 'svg-sprite-loader/plugin.js';
+import SVGSpritemapPlugin from 'svg-spritemap-webpack-plugin';
 import CopyPlugin from 'copy-webpack-plugin';
 import { sync as globSync } from 'glob';
 import fs from 'fs-extra';
@@ -19,32 +20,56 @@ if (process.platform === 'win32' && _filename.startsWith('/')) {
 const _dirname = dirname(_filename);
 
 /**
- * Root of the project (three levels up from this file).
+ * Project root (five levels up).
  * @type {string}
  */
 const projectDir = resolve(_dirname, '../../../../..');
 
 /**
- * Where your source files live (if you have a `/src` folder).
- * Falls back to `components/` if `src/` does not exist.
+ * Where source files live.
+ * Prefer `<project>/src`; fall back to `<project>/components` (legacy layout).
  * @type {string}
  */
 const srcPath = resolve(projectDir, 'src');
 const isSrcExists = fs.pathExistsSync(srcPath);
 const srcDir = isSrcExists ? srcPath : resolve(projectDir, 'components');
 
 /**
- * Where your built assets should live.
- * Mirrors the `srcDir` logic: prefer `dist/` if you have `src/`, else `components/`.
+ * Where built assets live.
+ * If `src/` exists, use `<project>/dist`; else write into `<project>/components`.
  * @type {string}
  */
 const distPath = isSrcExists
   ? resolve(projectDir, 'dist')
   : resolve(projectDir, 'components');
 
 /**
- * Glob pattern for all Twig & component files in your source.
- * We copy these through CopyPlugin so your PHP/Drupal theme sees them.
+ * Platform switch (affects component output roots).
+ * @type {boolean}
+ */
+const isDrupal = emulsifyConfig?.project?.platform === 'drupal';
+
+/**
+ * Component source root:
+ *  - with src/: `<project>/src/components`
+ *  - without src/: `<project>/components`
+ * @type {string}
+ */
+const componentsSrcRoot = isSrcExists ? resolve(srcDir, 'components') : srcDir;
+
+/**
+ * Component output root (where compiled component assets go):
+ *  - Drupal + src/: `components/…`
+ *  - Otherwise:     `dist/components/…`
+ * (Relative to `projectDir`; used by CopyPlugins `to:` path.)
+ * @type {string}
+ */
+const componentsOutRoot =
+  isDrupal && isSrcExists ? 'components' : 'dist/components';
+
+/**
+ * Glob pattern for Twig & component meta files. These are copied as-is so
+ * Drupal/WordPress themes can consume them alongside compiled assets.
  * @type {string}
  */
 const componentFilesPattern = resolve(
@@ -53,84 +78,206 @@ const componentFilesPattern = resolve(
 );
 
 /**
- * Turn a globbed source list into copy patterns.
+ * Build CopyPlugin patterns from a glob matcher, preserving source structure.
  *
- * @param {string} filesMatcher Glob pattern.
- * @returns {Array<{from:string,to:string}>}
+ * @param {string} filesMatcher - Glob for files to mirror.
+ * @returns {Array<{from:string,to:string}>} Copy patterns for CopyPlugin.
  */
 function getPatterns(filesMatcher) {
   return globSync(filesMatcher).map((file) => {
-    const projectPath = file.split('/src/')[0];
+    const projectPath = file.split('/src/')[0]; // base path before /src/
     const srcStructure = file.split(`${srcDir}/`)[1];
     const parentDir = srcStructure.split('/')[0];
-    // Consolidate foundation/layout under components for Drupal.
+
+    // Consolidate foundation/layout under "components" for Drupal.
     const consolidateDirs =
       parentDir === 'layout' || parentDir === 'foundation'
         ? '/components/'
         : '/';
+
     const filePath = file.split(/(foundation\/|components\/|layout\/)/)[2];
-    const destDir =
-      emulsifyConfig.project.platform === 'drupal'
-        ? `${projectPath}${consolidateDirs}${parentDir}/${filePath}`
-        : `${projectPath}/dist/${parentDir}/${filePath}`;
-    return { from: file, to: destDir };
+
+    const to = isDrupal
+      ? `${projectPath}${consolidateDirs}${parentDir}/${filePath}`
+      : `${projectPath}/dist/${parentDir}/${filePath}`;
+
+    return { from: file, to };
   });
 }
 
 /**
- * Only include CopyPlugin if we actually have a `src/` folder.
+ * CopyPlugin instance (only when `src/` exists):
+ * copies Twig and component meta files 1:1 into their expected destinations.
  * @type {CopyPlugin|false}
  */
 const CopyTwigPlugin = isSrcExists
   ? new CopyPlugin({ patterns: getPatterns(componentFilesPattern) })
   : false;
 
+/* -------------------------------------------------------------------------- */
+/*                          COMPONENT & GLOBAL ASSETS                          */
+/* -------------------------------------------------------------------------- */
+
+/**
+ * Asset allow-list (extensions we consider "static assets" to mirror).
+ * Extend to suit your project (e.g., add `pdf`, `txt`, `xml`, etc.).
+ * NOTE: We purposefully exclude code-like files via the filter below.
+ * @type {RegExp}
+ */
+const ASSET_EXT_RE =
+  /\.(?:png|jpe?g|gif|svg|webp|avif|ico|bmp|heic|heif|mp4|webm|mp3|ogg|wav|aac|woff2?|ttf|otf|eot|json|webmanifest|manifest|pdf)$/i;
+
+/**
+ * Exclude code & tooling files (don’t mirror these).
+ * @type {RegExp}
+ */
+const EXCLUDE_CODE_RE =
+  /\.(?:jsx?|tsx?|mjs|cjs|vue|svelte|scss|sass|less|styl|css|map|twig|php|yml|yaml|md|markdown|story(?:book)?\.[jt]sx?|stories\.[jt]sx?|test\.[jt]sx?)$/i;
+
+/**
+ * Shared filter for CopyPlugin patterns.
+ * Decides whether a file should be copied as a "static asset".
+ *
+ * @param {string} resourcePath - Absolute file path on disk.
+ * @param {string} base - The context directory for the pattern.
+ * @returns {boolean} True if we should copy the file.
+ */
+const assetFilter = (resourcePath, base) => {
+  const rel = relative(base, resourcePath);
+  // Guard: stay inside context
+  if (rel.startsWith('..')) return false;
+  // Exclude typical code/tooling files
+  if (EXCLUDE_CODE_RE.test(rel)) return false;
+  // Include known asset extensions
+  return ASSET_EXT_RE.test(rel);
+};
+
+/**
+ * Copy **all static assets inside components**, regardless of folder labels.
+ *
+ * Examples (all preserved under the component’s output root):
+ *   src/components/accordion/assets/dropdown-icon.svg
+ *   src/components/accordion/images/icons/chevron.svg
+ *   src/components/accordion/icon.svg                 (root-level asset)
+ *
+ * @type {CopyPlugin}
+ */
+const CopyComponentAssetsPlugin = new CopyPlugin({
+  patterns: [
+    {
+      // Start at the components root and evaluate every file
+      from: '**/*',
+      context: componentsSrcRoot,
+      to: resolve(projectDir, componentsOutRoot, '[path][name][ext]'),
+      noErrorOnMissing: true,
+      globOptions: {
+        dot: false,
+        ignore: [
+          '**/.DS_Store',
+          '**/Thumbs.db',
+          '**/node_modules/**',
+          '**/dist/**',
+        ],
+      },
+      // Only copy files that match our asset allow-list and are not code
+      filter: (resourcePath) => assetFilter(resourcePath, componentsSrcRoot),
+    },
+  ],
+});
+
+/**
+ * OPTIONAL: Copy **global (non-component) assets** that live under `src/`
+ * but outside `src/components/` (e.g. layout/site assets).
+ *
+ * Mirrors them under `dist/global/…`.
+ * Disabled when there is no `src/` directory.
+ *
+ * @type {CopyPlugin|false}
+ */
+const CopyGlobalAssetsPlugin = isSrcExists
+  ? new CopyPlugin({
+      patterns: [
+        {
+          from: '!(components|util)/**/*',
+          context: srcDir,
+          to: resolve(projectDir, 'dist', 'global', '[path][name][ext]'),
+          noErrorOnMissing: true,
+          globOptions: {
+            dot: false,
+            ignore: [
+              '**/.DS_Store',
+              '**/Thumbs.db',
+              '**/node_modules/**',
+              '**/dist/**',
+            ],
+          },
+          filter: (resourcePath) => assetFilter(resourcePath, srcDir),
+        },
+      ],
+    })
+  : false;
+
+/* -------------------------------------------------------------------------- */
+/*                                 OTHER PLUGINS                               */
+/* -------------------------------------------------------------------------- */
+
 /**
  * CleanWebpackPlugin configuration.
- * Wipes out everything in `distPath` before a build,
- * except image files (we whitelist common image extensions).
+ * Wipes out compiled CSS/JS in `distPath` before a build; keeps images.
  */
 const CleanPlugin = new CleanWebpackPlugin({
   protectWebpackAssets: false,
   cleanOnceBeforeBuildPatterns: [
-    // wipe all compiled assets
     `${distPath}/**/*.css`,
     `${distPath}/**/*.js`,
-    // but keep any images
     `!${distPath}/**/*.png`,
     `!${distPath}/**/*.jpg`,
     `!${distPath}/**/*.gif`,
     `!${distPath}/**/*.svg`,
   ],
 });
 
+/** Removes empty JS files generated for style-only entries. */
+const RemoveEmptyJS = new RemoveEmptyScriptsPlugin();
+
 /**
- * MiniCssExtractPlugin instance: writes `[name].css` into your dist.
+ * MiniCssExtractPlugin: emit CSS next to the entry key path (no hard-coded dist/).
  */
 const CssExtractPlugin = new MiniCssExtractPlugin({
-  filename: '[name].css',
-  chunkFilename: '[id].css',
+  filename: ({ chunk }) => `${chunk.name}.css`,
+  chunkFilename: ({ chunk }) => `${chunk.name}.css`,
 });
 
 /**
- * svg-sprite-loader plugin: bundles all /icons/*.svg.
+ * Generate a single SVG spritemap at `dist/icons.svg`.
  */
-const SpritePlugin = new SpriteLoaderPlugin({
-  plainSprite: true,
-});
+const SpritePlugin = new SVGSpritemapPlugin(
+  resolve(projectDir, 'assets/icons/**/*.svg'),
+  {
+    output: {
+      filename: 'dist/icons.svg',
+      chunk: { keep: true },
+    },
+    sprite: {
+      prefix: '',
+      generate: { title: false },
+    },
+  },
+);
 
-/**
- * webpack.ProgressPlugin for nice build progress output.
- */
+/** Build progress output. */
 const ProgressPlugin = new webpack.ProgressPlugin();
 
 /**
- * Export all plugins keyed for easy inclusion in your final Webpack config.
+ * Export plugin instances keyed for easy inclusion in your Webpack config.
  */
 export default {
   ProgressPlugin,
   CleanWebpackPlugin: CleanPlugin,
+  RemoveEmptyJS,
   MiniCssExtractPlugin: CssExtractPlugin,
-  SpriteLoaderPlugin: SpritePlugin,
+  SpritePlugin,
   CopyTwigPlugin,
+  CopyComponentAssetsPlugin,
+  CopyGlobalAssetsPlugin,
 };