feat(mwpw-162835): i think I might be done rebasing this branch

adobecom · Jan 10, 2025 · f81d147 · f81d147
1 parent f7572ff
commit f81d147
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 4 deletions.
diff --git a/commitlint.config.js b/commitlint.config.js
@@ -5,7 +5,7 @@ module.exports = {
             rules: {
                 'jira-ticket-in-scope': ({scope}) => {
                     const pattern = /^MWPW-\d+$/;
-                    const hasValidTicket = pattern.test(scope || '');
+                    const hasValidTicket = pattern.test(scope.toUpperCase() || '');
                     return [
                         hasValidTicket,
                         'Scope must contain JIRA ticket (e.g., feat(MWPW-123): message)',

diff --git a/dist/app.css b/dist/app.css
diff --git a/dist/main.js b/dist/main.js
@@ -12,6 +12,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
  * Chimera UI Libraries - Build 0.23.28 (1/6/2025, 16:49:34)
 =======
@@ -162,6 +163,9 @@
 =======
  * Chimera UI Libraries - Build 0.23.28 (1/7/2025, 15:01:29)
 >>>>>>> 683a289 (MWPW-155425: confirming the build is up to date)
+=======
+ * Chimera UI Libraries - Build 0.23.28 (1/8/2025, 14:41:08)
+>>>>>>> bddc1de (feat(mwpw-162835): husky)
  *         
  */
 /******/ (function(modules) { // webpackBootstrap
@@ -6504,7 +6508,6 @@ var Container = function Container(props) {
     var categories = getConfig('filterPanel', 'categories');
     // eslint-disable-next-line no-use-before-define, max-len
     var authoredCategories = isCategoriesContainer ? getAuthoredCategories(authoredFilters, categories) : [];
-    // eslint-disable-next-line no-use-before-define
     var sanitizedEventFilter = eventFilter ? (0, _general.sanitizeEventFilter)(eventFilter) : [];
 
     /**

diff --git a/dist/main.min.js b/dist/main.min.js
diff --git a/dist/main.source.js b/dist/main.source.js
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "build": "webpack",
     "postbuild": "minify dist/main.js > dist/main.min.js",
     "lint": "eslint react/src/js/components/Consonant --fix",
+    "release": "HUSKY_SKIP_HOOKS=1 release-it --ci",
     "test:coverage": "jest --coverage",
     "test:unit": "jest",
     "test:e2e-local": "wdio run wdio.local.conf.js env=LOCAL",
@@ -99,6 +100,7 @@
     "eslint-plugin-react": "^7.18.3",
     "eslint-plugin-react-hooks": "^4.1.2",
     "extract-text-webpack-plugin": "^3.0.1",
+    "husky": "^4.3.8",
     "ignore-loader": "^0.1.2",
     "inject-loader": "^3.0.1",
     "jest": "^24.0.0",
@@ -127,6 +129,13 @@
     "wdio-chromedriver-service": "^8.0.1",
     "webpack": "^3.9.1"
   },
+  "husky": {
+    "hooks": {
+      "prepare-commit-msg": "exec < /dev/tty && npx cz --hook || true",
+      "pre-commit": "npm run build && git add . && enforce-branch-name '.*'",
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+    }
+  },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"

diff --git a/react/src/js/components/Consonant/Container/Container.jsx b/react/src/js/components/Consonant/Container/Container.jsx
@@ -170,7 +170,6 @@ const Container = (props) => {
     const categories = getConfig('filterPanel', 'categories');
     // eslint-disable-next-line no-use-before-define, max-len
     const authoredCategories = isCategoriesContainer ? getAuthoredCategories(authoredFilters, categories) : [];
-    // eslint-disable-next-line no-use-before-define
     const sanitizedEventFilter = eventFilter ? sanitizeEventFilter(eventFilter) : [];
 
     /**

diff --git a/wdio.local.conf.js b/wdio.local.conf.js
@@ -16,5 +16,6 @@ exports.config = {
             ],
         },
     }],
+    logLevel: 'error',
     // Other configurations...
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,5 +16,6 @@ exports.config = { @@
                 ],
             },
         }],
+        logLevel: 'error',
         // Other configurations...
     };