Skip to content

Commit

Permalink
feat: remove drush commands and adjust whisk dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Callin Mullaney committed Feb 15, 2024
1 parent 3aaa4ba commit aac990a
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 1,034 deletions.
1 change: 0 additions & 1 deletion CNAME

This file was deleted.

11 changes: 3 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,14 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"drupal/core": "^9.5 || ^10 || ^11",
"drupal/core": "^10 || ^11",
"drupal/components": "^3.0@beta",
"drupal/emulsify_twig": "^4.0"
},
"autoload": {
"psr-4": {
"Drupal\\emulsify\\": "src/"
}
"drupal/emulsify_tools": "^1.0"
},
"extra": {
"drush": {
"services": {
"drush.services.yml": "^9.5 || ^10 || ^11"
"drush.services.yml": "^10 || ^11"
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions drush.services.yml

This file was deleted.

187 changes: 0 additions & 187 deletions emulsify.drush.inc

This file was deleted.

2 changes: 1 addition & 1 deletion emulsify.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package: emulsify

dependencies:
- 'drupal:components (^3.0)'
- 'drupal:emulsify_twig (^4.0)'
- 'drupal:emulsify_tools (^1.0)'

libraries:
- emulsify/global
Expand Down
1 change: 1 addition & 0 deletions recipes/whisk/.nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
37 changes: 37 additions & 0 deletions recipes/whisk/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"name": "whisk",
"version": "1.0.0",
"description": "Storybook development + Webpack Build",
"keywords": [
"component library",
"design system",
"drupal",
"pattern library",
"storybook",
"styleguide"
],
"author": "Four Kitchens <shout@fourkitchens.com>",
"license": "ISC",
"scripts": {
"a11y": "npm run storybook-build && ./scripts/a11y.js -r",
"build": "webpack --config ./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 --no-error-on-unmatched-pattern ./components",
"lint-staged": "lint-staged",
"lint-styles": "stylelint './components/**/*.scss'",
"prettier": "prettier --ignore-unknown \"../../components/**/*.{js,yml,scss,md}\"",
"prettier-fix": "prettier --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 -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"
},
"dependencies": {
"emulsify-core": "github:emulsify-ds/emulsify-core"
}
}
12 changes: 6 additions & 6 deletions recipes/whisk/project.emulsify.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@
"structureImplementations": [
{
"name": "base",
"directory": "./components/00-base"
"directory": "../../components/00-base"
},
{
"name": "atoms",
"directory": "./components/01-atoms"
"directory": "../../components/01-atoms"
},
{
"name": "molecules",
"directory": "./components/02-molecules"
"directory": "../../components/02-molecules"
},
{
"name": "organisms",
"directory": "./components/03-organisms"
"directory": "../../components/03-organisms"
},
{
"name": "templates",
"directory": "./components/04-templates"
"directory": "../../components/04-templates"
},
{
"name": "pages",
"directory": "./components/05-pages"
"directory": "../../components/05-pages"
}
]
}
Expand Down
8 changes: 4 additions & 4 deletions recipes/whisk/whisk.info.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
type: theme
base theme: emulsify
core_version_requirement: '^9.5 || ^10'
core_version_requirement: '^10 || ^11'

name: EMULSIFY_RECIPE_NAME
description: EMULSIFY_RECIPE_DESCRIPTION
name: whisk
description: A subtheme build upon the Emulsify Design System.
package: 'Emulsify'
screenshot: screenshot.png
version: VERSION
hidden: false

dependencies:
- 'drupal:components (^3.0)'
- 'drupal:emulsify_twig (^4.0)'
- 'drupal:emulsify_tools (^4.0)'

libraries:
- emulsify/global
Expand Down
Loading

0 comments on commit aac990a

Please sign in to comment.