Skip to content

Commit

Permalink
Merge pull request #329 from emulsify-ds/release-sdc-support
Browse files Browse the repository at this point in the history
feat: remove default components folder and upgrade Emulsify Core to 2.0
  • Loading branch information
callinmullaney authored Sep 3, 2024
2 parents aaba7ca + 03f60e8 commit 35b4912
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
Empty file removed whisk/components/.gitkeep
Empty file.
Empty file removed whisk/components/style.scss
Empty file.
5 changes: 2 additions & 3 deletions whisk/config/emulsify-core/storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
// Import additional scripts or stylesheets just for storybook.
// Example import:
// import '../../../dist/css/cl-style.css';
// Import project stylesheets just for Storybook.
// import '../../../dist/css/style.css';
20 changes: 13 additions & 7 deletions whisk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,30 @@
"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",
"build-dev": "webpack --config node_modules/@emulsify/core/config/webpack/webpack.dev.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",
"husky:commit-msg": "commitlint --edit $1",
"husky:pre-commit": "lint-staged",
"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 -p 6006",
"storybook-build": "npm run build && storybook build -c node_modules/@emulsify/core/.storybook -o .out",
"storybook-deploy": "storybook-to-ghpages -o .out",
"style-dictionary:build": "node ./tokens/tokensTransform.js",
"test": "jest --coverage --config ./config/jest.config.js",
"tokens:build": "npm run tokens:transform && npm run style-dictionary:build",
"tokens:transform": "token-transformer ./tokens/figma.tokens.json ./tokens/transformed.tokens.json",
"twatch": "jest --no-coverage --watch --verbose",
"webpack": "webpack --watch --config node_modules/@emulsify/core/config/webpack/webpack.dev.js"
},
"dependencies": {
"@emulsify/core": "^1.2.0"
"@emulsify/core": "^2.0.0"
}
}

0 comments on commit 35b4912

Please sign in to comment.