at-builder 1.4.1 → 1.4.4

package/.claude/settings.local.json

@@ -64,7 +64,14 @@
       "Bash(npm view *)",
       "Bash(git tag *)",
       "Bash(git push *)",
-      "Bash(npm publish *)"
+      "Bash(npm publish *)",
+      "Bash(git commit -m 'feat\\(eslint\\): honor consumer .eslintrc.* via FlatCompat *)",
+      "Bash(atb build *)",
+      "Bash(ACTIVITY_FOLDER_NAME=\"UPSDDO - 7313 - AB-26.3.1 - Left Hand Navigation With Flyout - Dashboard - EWS - FWS - Tracking - Support Portal - Billing - Pickup - Claims\" atb build --prod)",
+      "Bash(grep -oE \"\\\\\\([a-z-]+\\\\\\)$\")",
+      "Bash(awk '/^ERROR in/{flag=1; next} /^WARNING in/{flag=0; next} flag')",
+      "Bash(git commit -m 'fix\\(eslint\\): honor consumer ESLint config as sole authority + 2 FlatCompat bugs *)",
+      "Bash(git commit -m 'feat\\(wrapper\\): configurable TARGET_BUILD_PREFIX + per-asset contentHash in window flag *)"
     ]
   }
 }

package/bin/constants/config.js

@@ -119,7 +119,7 @@ var setupEnv = function (basePath) { return __awaiter(void 0, void 0, void 0, fu
         envPath = path_1.default.join(basePath, '.env');
         // Check if the .env file exists
         if (!fs_1.default.existsSync(envPath)) {
-            envContent = "\nACTIVITIES_BASE_FOLDER=\"Activities\"\nACTIVITY_FOLDER_NAME=\"\"\nPUPPETEER_LANDING_PAGE=\"\"\nTARGET_URL=\"\"\nLOGIN_URL=\"\"\n\n# Dev-server selection (used by `atb dev --browser`).\n# Edit and save while puppeteer is running to hot-swap the previewed bundle.\n# PAGE is only meaningful for multi-page activities \u2014 leave empty otherwise.\nVARIATION=\"Variation-1\"\nPAGE=\"\"\n\nNODE_ENV=\"development\"\nVERBOSE=false\n\n# Adobe Target Deployment Configuration\n# ADOBE_TENANT is your AT tenant slug \u2014 find it in the AT URL after \"mc.adobe.io/\".\nADOBE_TENANT=\"\"\nADOBE_CLIENT_ID=\"\"\nADOBE_CLIENT_SECRET=\"\"\n    ";
+            envContent = "\nACTIVITIES_BASE_FOLDER=\"Activities\"\nACTIVITY_FOLDER_NAME=\"\"\nPUPPETEER_LANDING_PAGE=\"\"\nTARGET_URL=\"\"\nLOGIN_URL=\"\"\n\n# Dev-server selection (used by `atb dev --browser`).\n# Edit and save while puppeteer is running to hot-swap the previewed bundle.\n# PAGE is only meaningful for multi-page activities \u2014 leave empty otherwise.\nVARIATION=\"Variation-1\"\nPAGE=\"\"\n\nNODE_ENV=\"development\"\nVERBOSE=false\n\n# Build wrapper config.\n# TARGET_BUILD_PREFIX customizes the window flag baked into each build \u2014\n# rendered as window.${TARGET_BUILD_PREFIX}_${contentHash}_${hash}. Defaults\n# to \"TargetBuild\" when empty. Useful when multiple at-builder activities\n# end up loaded on the same page and you want each project's flag namespaced.\nTARGET_BUILD_PREFIX=\"\"\n\n# Adobe Target Deployment Configuration\n# ADOBE_TENANT is your AT tenant slug \u2014 find it in the AT URL after \"mc.adobe.io/\".\nADOBE_TENANT=\"\"\nADOBE_CLIENT_ID=\"\"\nADOBE_CLIENT_SECRET=\"\"\n    ";
             // Write the content to the .env file
             fs_1.default.writeFileSync(envPath, envContent.trim(), 'utf8');
             console.log('.env file created successfully!');

package/bin/services/doctor.js

@@ -655,7 +655,7 @@ var createEnvFile = function (projectPath) { return __awaiter(void 0, void 0, vo
     var envPath, envContent;
     return __generator(this, function (_a) {
         envPath = path_1.default.join(projectPath, '.env');
-        envContent = "ACTIVITIES_BASE_FOLDER=\"Activities\"\nACTIVITY_FOLDER_NAME=\"\"\nPUPPETEER_LANDING_PAGE=\"\"\nTARGET_URL=\"\"\nLOGIN_URL=\"\"\n\n# Dev-server selection (used by `atb dev --browser`).\n# Edit and save while puppeteer is running to hot-swap the previewed bundle.\n# PAGE is only meaningful for multi-page activities \u2014 leave empty otherwise.\nVARIATION=\"Variation-1\"\nPAGE=\"\"\n\nNODE_ENV=\"development\"\nVERBOSE=false\n\n# Adobe Target Deployment Configuration\n# ADOBE_TENANT is your AT tenant slug \u2014 find it in the AT URL after \"mc.adobe.io/\".\nADOBE_TENANT=\"\"\nADOBE_CLIENT_ID=\"\"\nADOBE_CLIENT_SECRET=\"\"";
+        envContent = "ACTIVITIES_BASE_FOLDER=\"Activities\"\nACTIVITY_FOLDER_NAME=\"\"\nPUPPETEER_LANDING_PAGE=\"\"\nTARGET_URL=\"\"\nLOGIN_URL=\"\"\n\n# Dev-server selection (used by `atb dev --browser`).\n# Edit and save while puppeteer is running to hot-swap the previewed bundle.\n# PAGE is only meaningful for multi-page activities \u2014 leave empty otherwise.\nVARIATION=\"Variation-1\"\nPAGE=\"\"\n\nNODE_ENV=\"development\"\nVERBOSE=false\n\n# Build wrapper config.\n# TARGET_BUILD_PREFIX customizes the window flag baked into each build \u2014\n# rendered as window.${TARGET_BUILD_PREFIX}_${contentHash}_${hash}. Defaults\n# to \"TargetBuild\" when empty. Useful when multiple at-builder activities\n# end up loaded on the same page and you want each project's flag namespaced.\nTARGET_BUILD_PREFIX=\"\"\n\n# Adobe Target Deployment Configuration\n# ADOBE_TENANT is your AT tenant slug \u2014 find it in the AT URL after \"mc.adobe.io/\".\nADOBE_TENANT=\"\"\nADOBE_CLIENT_ID=\"\"\nADOBE_CLIENT_SECRET=\"\"";
         try {
             fs_1.default.writeFileSync(envPath, envContent, 'utf8');
             return [2 /*return*/, true];

package/lib/CustomWrapperPlugin.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const crypto = require('crypto');
+
 /**
  * A custom Webpack plugin to wrap bundled assets with a header and footer.
  */
@@ -35,7 +37,22 @@ class CustomWrapperPlugin {
                         if (this.options.test && this.options.test.test(pathname)) {
                             const asset = compilation.getAsset(pathname);
                             const source = asset.source.source();
-                            const args = { hash: compilation.hash };
+                            // contentHash is derived from the asset's source so
+                            // it changes whenever the bundled output changes,
+                            // independent of the compilation-wide `hash`. Both
+                            // are exposed so consumers can reference either or
+                            // combine them (e.g. for a window-flag id that's
+                            // unique per-asset AND per-build).
+                            const contentHash = crypto
+                                .createHash('md5')
+                                .update(typeof source === 'string' ? source : Buffer.from(source))
+                                .digest('hex')
+                                .slice(0, 20);
+                            const args = {
+                                hash: compilation.hash,
+                                contentHash,
+                                pathname
+                            };
 
                             const wrappedSource =
                                 (typeof this.options.header === 'function'

package/lib/eslint-flat-config-plugin.js

@@ -1,13 +1,95 @@
 /* eslint-disable no-undef */
 const { ESLint } = require('eslint');
 const path = require('path');
+const fs = require('fs');
+
+// Legacy .eslintrc.* names ESLint v8 supported. ESLint v9 dropped them, but a
+// lot of existing consumer projects still ship them — auto-convert via
+// @eslint/eslintrc's FlatCompat shim so those rules are honored.
+const LEGACY_ESLINTRC_NAMES = [
+    '.eslintrc.js',
+    '.eslintrc.cjs',
+    '.eslintrc.json',
+    '.eslintrc'
+];
+
+/**
+ * Find the first .eslintrc.* file in `context`. Returns absolute path or null.
+ */
+function findLegacyEslintrc(context) {
+    for (const name of LEGACY_ESLINTRC_NAMES) {
+        const p = path.join(context, name);
+        if (fs.existsSync(p)) return p;
+    }
+    return null;
+}
+
+/**
+ * Convert a legacy ESLint config (.eslintrc.*) to the flat-config array
+ * format ESLint v9 expects. Uses FlatCompat from @eslint/eslintrc.
+ *
+ * Returns [] (and warns once) if @eslint/eslintrc isn't installed or the
+ * config can't be parsed — better to ship a partial config than to fail
+ * the build outright.
+ */
+function convertLegacyEslintrc(legacyPath, context) {
+    let FlatCompat;
+    try {
+        ({ FlatCompat } = require('@eslint/eslintrc'));
+    } catch (_e) {
+        console.warn(
+            `[at-builder] Found ${path.relative(context, legacyPath)} but @eslint/eslintrc is not installed; ` +
+            'legacy config will be ignored. Migrate to eslint.config.js or report this.'
+        );
+        return [];
+    }
+
+    let legacyConfig;
+    try {
+        if (legacyPath.endsWith('.json') || legacyPath.endsWith('.eslintrc')) {
+            legacyConfig = JSON.parse(fs.readFileSync(legacyPath, 'utf8'));
+        } else {
+            delete require.cache[require.resolve(legacyPath)];
+            legacyConfig = require(legacyPath);
+        }
+    } catch (err) {
+        console.warn(`[at-builder] Failed to read ${path.relative(context, legacyPath)}: ${err.message}`);
+        return [];
+    }
+
+    // recommendedConfig/allConfig are required when the legacy file
+    // `extends: ["eslint:recommended"]` (or "eslint:all"). Without them,
+    // FlatCompat throws "Missing parameter 'recommendedConfig'" because
+    // ESLint v9 no longer ships those built-in strings — they live in the
+    // separate @eslint/js package now.
+    let jsConfigs;
+    try {
+        jsConfigs = require('@eslint/js').configs;
+    } catch (_e) {
+        jsConfigs = {};
+    }
+
+    try {
+        const compat = new FlatCompat({
+            baseDirectory: context,
+            recommendedConfig: jsConfigs.recommended,
+            allConfig: jsConfigs.all
+        });
+        const flatArray = compat.config(legacyConfig);
+        console.log(`[at-builder] Loaded legacy ESLint config from ${path.relative(context, legacyPath)}`);
+        return flatArray;
+    } catch (err) {
+        console.warn(`[at-builder] FlatCompat could not convert ${path.relative(context, legacyPath)}: ${err.message}`);
+        return [];
+    }
+}
 
 class ESLintFlatConfigPlugin {
     constructor(options = {}) {
         this.options = {
             context: options.context || process.cwd(),
             configFile: options.configFile,
-            overrideConfigFiles: options.overrideConfigFiles || [], // Array of additional config files
+            overrideConfigFiles: options.overrideConfigFiles || [], // Array of additional flat-config file paths
             failOnError: options.failOnError !== false,
             failOnWarning: options.failOnWarning || false,
             fix: options.fix || false, // Enable auto-fix
@@ -40,33 +122,52 @@ class ESLintFlatConfigPlugin {
                 if (filesToLint.length === 0) return;
 
                 try {
-                    // Load base config
+                    // Load base config (at-builder's bundled flat config)
                     let baseConfig = [];
-                    if (this.options.configFile && require('fs').existsSync(this.options.configFile)) {
+                    if (this.options.configFile && fs.existsSync(this.options.configFile)) {
                         delete require.cache[require.resolve(this.options.configFile)];
                         baseConfig = require(this.options.configFile);
                     }
 
-                    // Load and merge override configs
+                    // Load consumer flat-config overrides (eslint.config.js etc.)
                     const overrideConfigs = [];
                     for (const configPath of this.options.overrideConfigFiles) {
                         try {
                             const resolvedPath = path.resolve(this.options.context, configPath);
-                            if (require('fs').existsSync(resolvedPath)) {
+                            if (fs.existsSync(resolvedPath)) {
                                 delete require.cache[require.resolve(resolvedPath)];
                                 const config = require(resolvedPath);
                                 overrideConfigs.push(...(Array.isArray(config) ? config : [config]));
                             }
                         } catch (err) {
-                            // Silently skip if config doesn't exist
+                            // Silently skip if config doesn't exist or can't be required
                         }
                     }
 
-                    // Merge all configs (base + overrides)
-                    const mergedConfig = [
-                        ...(Array.isArray(baseConfig) ? baseConfig : [baseConfig]),
-                        ...overrideConfigs
-                    ];
+                    // Auto-discover legacy .eslintrc.* in the consumer project and
+                    // convert it via FlatCompat. Only kicks in if no flat-config
+                    // override was found (flat config wins by convention).
+                    let legacyConfigs = [];
+                    if (overrideConfigs.length === 0) {
+                        const legacyPath = findLegacyEslintrc(this.options.context);
+                        if (legacyPath) {
+                            legacyConfigs = convertLegacyEslintrc(legacyPath, this.options.context);
+                        }
+                    }
+
+                    // When the consumer ships their own ESLint config (flat or
+                    // legacy), it becomes the sole authority — at-builder's
+                    // bundled defaults are NOT merged in. Otherwise consumers
+                    // would have to defensively `'no-console': 'off'` every
+                    // rule at-builder happens to opinionate on. at-builder's
+                    // bundle is a fallback for projects with no ESLint config
+                    // at all, not a baseline that gets merged with theirs.
+                    const consumerHasConfig =
+                        overrideConfigs.length > 0 || legacyConfigs.length > 0;
+
+                    const mergedConfig = consumerHasConfig
+                        ? [...overrideConfigs, ...legacyConfigs]
+                        : (Array.isArray(baseConfig) ? baseConfig : [baseConfig]);
 
                     // overrideConfigFile: true tells ESLint v9 to skip the
                     // cwd-based flat-config lookup entirely and treat
@@ -75,12 +176,23 @@ class ESLintFlatConfigPlugin {
                     // `eslint.config.js` (which they don't have, since at-builder
                     // ships its own) and fails the build with "Could not find
                     // config file." even though we provided everything inline.
+                    // ignore: true (default) respects the consumer's
+                    // ignorePatterns / ignores entries. We previously had
+                    // ignore:false thinking it suppressed ESLint's defaults,
+                    // but it actually disabled ALL ignore handling — including
+                    // the consumer's own patterns — so e.g. `.plop/**` in
+                    // their .eslintrc.js was silently ignored.
+                    //
+                    // warnIgnored:false suppresses ESLint's "File ignored
+                    // because of a matching ignore pattern" warnings — webpack
+                    // happens to walk into ignored files via imports, and we
+                    // don't want to surface a warning for each one.
                     const eslint = new ESLint({
                         cwd: this.options.context,
                         overrideConfigFile: true,
                         overrideConfig: mergedConfig,
-                        ignore: false,  // Don't use default ignore patterns
-                        fix: this.options.fix  // Enable auto-fix if option is set
+                        warnIgnored: false,
+                        fix: this.options.fix
                     });
 
                     const results = await eslint.lintFiles(filesToLint);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "at-builder",
-    "version": "1.4.1",
+    "version": "1.4.4",
     "main": "bin/index.js",
     "bin": {
         "atb": "bin/index.js"
@@ -24,6 +24,7 @@
         "@babel/eslint-parser": "^7.26.8",
         "@babel/plugin-transform-runtime": "^7.18.9",
         "@babel/preset-env": "^7.18.9",
+        "@eslint/eslintrc": "^3.2.0",
         "@eslint/js": "^9.20.0",
         "@types/node": "^22.13.2",
         "async": "^3.2.3",

package/src/constants/config.ts

@@ -157,6 +157,13 @@ PAGE=""
 NODE_ENV="development"
 VERBOSE=false
 
+# Build wrapper config.
+# TARGET_BUILD_PREFIX customizes the window flag baked into each build —
+# rendered as window.\${TARGET_BUILD_PREFIX}_\${contentHash}_\${hash}. Defaults
+# to "TargetBuild" when empty. Useful when multiple at-builder activities
+# end up loaded on the same page and you want each project's flag namespaced.
+TARGET_BUILD_PREFIX=""
+
 # Adobe Target Deployment Configuration
 # ADOBE_TENANT is your AT tenant slug — find it in the AT URL after "mc.adobe.io/".
 ADOBE_TENANT=""

package/src/services/doctor.ts

@@ -558,6 +558,13 @@ PAGE=""
 NODE_ENV="development"
 VERBOSE=false
 
+# Build wrapper config.
+# TARGET_BUILD_PREFIX customizes the window flag baked into each build —
+# rendered as window.\${TARGET_BUILD_PREFIX}_\${contentHash}_\${hash}. Defaults
+# to "TargetBuild" when empty. Useful when multiple at-builder activities
+# end up loaded on the same page and you want each project's flag namespaced.
+TARGET_BUILD_PREFIX=""
+
 # Adobe Target Deployment Configuration
 # ADOBE_TENANT is your AT tenant slug — find it in the AT URL after "mc.adobe.io/".
 ADOBE_TENANT=""

package/webpack.config.js

@@ -222,8 +222,17 @@ const plugins = [
     new WrapperPlugin({
         test: /\.js$/,
         header: function (_, args) {
-            //Handle target issue for reloading the styles.
-            let _uniqueTestId = `TargetBuild_${args.hash}`;
+            // The window flag has to be unique per build so a fresh injection
+            // doesn't no-op against a stale flag from the previous version.
+            // Includes both contentHash (asset-content scoped) and hash
+            // (compilation scoped) so it changes whenever either does.
+            //
+            // Prefix is configurable per project via TARGET_BUILD_PREFIX in .env
+            // (defaults to "TargetBuild") — useful when multiple at-builder
+            // activities load on the same page and you want each one's flag
+            // namespaced.
+            const prefix = (process.env.TARGET_BUILD_PREFIX || 'TargetBuild').trim() || 'TargetBuild';
+            const _uniqueTestId = `${prefix}_${args.contentHash}_${args.hash}`;
             args._uniqueTestId = _uniqueTestId;
             return `
     (function(){