From 83bd985e9b3b17ed1cf2f4168525548f05fdb5aa Mon Sep 17 00:00:00 2001
From: Callin Mullaney <57088-callinmullaney@users.noreply.drupalcode.org>
Date: Mon, 10 Jun 2024 08:49:10 -0500
Subject: [PATCH 1/2] fix: correct paths with new published folder structure

---
 .../config/emulsify-core/eslintrc.config.json |  2 +-
 .../emulsify-core/stylelintrc.config.json     |  2 +-
 whisk/package.json                            | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/whisk/config/emulsify-core/eslintrc.config.json b/whisk/config/emulsify-core/eslintrc.config.json
index cf7dd12..069411b 100644
--- a/whisk/config/emulsify-core/eslintrc.config.json
+++ b/whisk/config/emulsify-core/eslintrc.config.json
@@ -1,6 +1,6 @@
 {
   "extends": [
-    "../../node_modules/emulsify-core/config/.eslintrc.config.json"
+    "../../node_modules/@emulsify/core/config/.eslintrc.config.json"
   ],
   "globals": {
     "Drupal": true,
diff --git a/whisk/config/emulsify-core/stylelintrc.config.json b/whisk/config/emulsify-core/stylelintrc.config.json
index 0880a4b..f4c7901 100644
--- a/whisk/config/emulsify-core/stylelintrc.config.json
+++ b/whisk/config/emulsify-core/stylelintrc.config.json
@@ -1,5 +1,5 @@
 {
   "extends": [
-    "../../node_modules/emulsify-core/config/.stylelintrc.json"
+    "../../node_modules/@emulsify/core/config/.stylelintrc.json"
   ]
 }
diff --git a/whisk/package.json b/whisk/package.json
index 55b7442..672a600 100644
--- a/whisk/package.json
+++ b/whisk/package.json
@@ -13,26 +13,26 @@
   "author": "Four Kitchens <shout@fourkitchens.com>",
   "license": "ISC",
   "scripts": {
-    "a11y": "npm run storybook-build && node_modules/emulsify-core/scripts/a11y.js -r",
-    "build": "webpack --config node_modules/emulsify-core/config/webpack/webpack.prod.js",
+    "a11y": "npm run storybook-build && node_modules/@emulsify/core/scripts/a11y.js -r",
+    "build": "webpack --config node_modules/@emulsify/core/config/webpack/webpack.prod.js",
     "coverage": "npm run test && open-cli .coverage/lcov-report/index.html",
     "develop": "concurrently --raw \"npm run webpack\" \"npm run storybook\"",
     "format": "npm run lint-fix; npm run prettier-fix",
     "lint": "npm run lint-js; npm run lint-styles",
     "lint-fix": "npm run lint-js -- --fix; npm run lint-styles -- --fix",
-    "lint-js": "eslint --config config/emulsify-core/eslintrc.config.json --no-eslintrc --no-error-on-unmatched-pattern ./components",
+    "lint-js": "eslint --config config/@emulsify/core/eslintrc.config.json --no-eslintrc --no-error-on-unmatched-pattern ./components",
     "lint-staged": "lint-staged",
-    "lint-styles": "stylelint --config config/emulsify-core/stylelintrc.config.json './components/**/*.scss'",
-    "prettier": "prettier --config config/emulsify-core/prettierrc.config.json --ignore-path config/emulsify-core/.prettierignore --ignore-unknown \"./components/**/*.{js,yml,scss,md}\"",
-    "prettier-fix": "prettier --config config/emulsify-core/prettierrc.config.json --ignore-path config/emulsify-core/.prettierignore --write --ignore-unknown \"./components**/*.{js,yml,scss,md}\"",
-    "storybook": "storybook dev -c node_modules/emulsify-core/.storybook --ci -s ../../../dist,../../../assets/images,../../../assets/icons -p 6006",
-    "storybook-build": "storybook build -c node_modules/emulsify-core/.storybook -s ./dist,./assets/images,./assets/icons -o .out",
+    "lint-styles": "stylelint --config config/@emulsify/core/stylelintrc.config.json './components/**/*.scss'",
+    "prettier": "prettier --config config/@emulsify/core/prettierrc.config.json --ignore-path config/@emulsify/core/.prettierignore --ignore-unknown \"./components/**/*.{js,yml,scss,md}\"",
+    "prettier-fix": "prettier --config config/@emulsify/core/prettierrc.config.json --ignore-path config/@emulsify/core/.prettierignore --write --ignore-unknown \"./components**/*.{js,yml,scss,md}\"",
+    "storybook": "storybook dev -c node_modules/@emulsify/core/.storybook --ci -s ../../../../dist,../../../../assets/images,../../../../assets/icons -p 6006",
+    "storybook-build": "storybook build -c node_modules/@emulsify/core/.storybook -s ./dist,./assets/images,./assets/icons -o .out",
     "storybook-deploy": "storybook-to-ghpages -o .out",
     "test": "jest --coverage  --config ./config/jest.config.js",
     "twatch": "jest --no-coverage --watch --verbose",
-    "webpack": "webpack --watch --config node_modules/emulsify-core/config/webpack/webpack.dev.js"
+    "webpack": "webpack --watch --config node_modules/@emulsify/core/config/webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@emulsify/core": "^1.1.0",
+    "@emulsify/core": "^1.1.2"
   }
 }

From fb40fc4fa8f1466d1fe270e1eadc0fed324f754c Mon Sep 17 00:00:00 2001
From: Callin Mullaney <57088-callinmullaney@users.noreply.drupalcode.org>
Date: Mon, 10 Jun 2024 08:52:14 -0500
Subject: [PATCH 2/2] chore: consistent pr template with emulsify-core

---
 .github/PULL_REQUEST_TEMPLATE.md | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4c74f47..fc5ef3d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,16 +1,14 @@
-**What:**
+**This PR does the following:**
+- Adds functionality bullet item
+- Fixes this or that bullet item
+  
+### Related Issue(s)
+- [Title of the issue](https://github.com/emulsify-ds/emulsify-drupal/issues/1) (if applicable)
 
-_brief description of change_
+### Notes:
+- (optional) Document any intentionally unfinished parts or known issues within this PR
 
-**Why:**
+### Functional Testing:
+- [ ] Document steps that allow someone to fully test your code changes. Include screenshot and links when appropriate.
 
-_why this change improves emulsify_
 
-**How:**
-
-_more details of changes made_
-
-**To Test:**
-
-- [ ] Step 1
-- [ ] Step 2