Skip to content

Commit

Permalink
Merge pull request #317 from emulsify-ds/fix-paths-to-core
Browse files Browse the repository at this point in the history
Fix paths to core
  • Loading branch information
callinmullaney authored Jun 10, 2024
2 parents baf0c7a + fb40fc4 commit 4326552
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 24 deletions.
22 changes: 10 additions & 12 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion whisk/config/emulsify-core/eslintrc.config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": [
"../../node_modules/emulsify-core/config/.eslintrc.config.json"
"../../node_modules/@emulsify/core/config/.eslintrc.config.json"
],
"globals": {
"Drupal": true,
Expand Down
2 changes: 1 addition & 1 deletion whisk/config/emulsify-core/stylelintrc.config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": [
"../../node_modules/emulsify-core/config/.stylelintrc.json"
"../../node_modules/@emulsify/core/config/.stylelintrc.json"
]
}
20 changes: 10 additions & 10 deletions whisk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@
"author": "Four Kitchens <[email protected]>",
"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"
}
}

0 comments on commit 4326552

Please sign in to comment.