Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump dependencies #37

Merged
merged 34 commits into from Nov 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
14feeaf
chore(deps): bump @babel/core from 7.6.4 to 7.7.0
dependabot-preview[bot] Nov 5, 2019
82f45c8
chore(deps-dev): bump @semantic-release/npm from 5.3.2 to 5.3.4
dependabot-preview[bot] Nov 5, 2019
e3377b5
chore(deps): bump node-sass from 4.12.0 to 4.13.0
dependabot-preview[bot] Nov 5, 2019
759b14b
Merge pull request #23 from HorusGoul/dependabot/npm_and_yarn/babel/c…
dependabot-preview[bot] Nov 5, 2019
767f24f
Merge pull request #36 from HorusGoul/dependabot/npm_and_yarn/develop…
dependabot-preview[bot] Nov 5, 2019
3e64161
Merge pull request #34 from HorusGoul/dependabot/npm_and_yarn/develop…
dependabot-preview[bot] Nov 5, 2019
bc4b868
chore(deps-dev): bump semantic-release from 15.13.28 to 15.13.30
dependabot-preview[bot] Nov 5, 2019
82376b9
Merge pull request #24 from HorusGoul/dependabot/npm_and_yarn/semanti…
dependabot-preview[bot] Nov 5, 2019
ff3e027
chore(deps): bump @babel/preset-typescript from 7.6.0 to 7.7.0
dependabot-preview[bot] Nov 5, 2019
fac277a
chore(deps): bump @babel/preset-react from 7.6.3 to 7.7.0
dependabot-preview[bot] Nov 5, 2019
b0aa7dc
chore(deps): bump @typescript-eslint/parser from 2.6.0 to 2.6.1
dependabot-preview[bot] Nov 5, 2019
cdc755e
chore(deps): bump @babel/register from 7.6.2 to 7.7.0
dependabot-preview[bot] Nov 5, 2019
6ae2e0e
chore(deps): bump @typescript-eslint/eslint-plugin from 2.6.0 to 2.6.1
dependabot-preview[bot] Nov 5, 2019
c539aa9
chore(deps): bump eslint-config-prettier from 6.4.0 to 6.5.0
dependabot-preview[bot] Nov 5, 2019
21b9a74
chore(deps): bump typescript from 3.6.4 to 3.7.2
dependabot-preview[bot] Nov 5, 2019
0b06a10
chore(deps): bump @types/webpack from 4.39.4 to 4.39.8
dependabot-preview[bot] Nov 5, 2019
f9b7eed
chore(deps): bump @testing-library/react from 9.3.1 to 9.3.2
dependabot-preview[bot] Nov 5, 2019
a99a020
chore(deps): bump @babel/preset-env from 7.6.3 to 7.7.1
dependabot-preview[bot] Nov 5, 2019
fde4deb
chore(deps): bump @types/jest from 24.0.21 to 24.0.22
dependabot-preview[bot] Nov 5, 2019
c8d24fe
chore(deps): bump copy-webpack-plugin from 5.0.4 to 5.0.5
dependabot-preview[bot] Nov 6, 2019
0ed7d80
chore(deps): bump @types/react-dom from 16.9.3 to 16.9.4
dependabot-preview[bot] Nov 6, 2019
7e7a5a2
chore(deps): bump core-js from 3.3.6 to 3.4.0
dependabot-preview[bot] Nov 6, 2019
458ee3c
chore(deps): bump react-hot-loader from 4.12.15 to 4.12.16
dependabot-preview[bot] Nov 6, 2019
61b3492
chore(deps): bump @hot-loader/react-dom from 16.10.2 to 16.11.0
dependabot-preview[bot] Nov 6, 2019
ed3e7ed
chore(deps): bump @babel/preset-typescript from 7.7.0 to 7.7.2
dependabot-preview[bot] Nov 6, 2019
faddb21
chore(deps): bump @babel/core from 7.7.0 to 7.7.2
dependabot-preview[bot] Nov 6, 2019
273be7e
chore(deps-dev): bump @semantic-release/commit-analyzer
dependabot-preview[bot] Nov 7, 2019
eb5af6c
chore(deps): bump fork-ts-checker-webpack-plugin from 3.0.1 to 3.1.0
dependabot-preview[bot] Nov 8, 2019
a0f7ef3
chore(deps): bump prettier from 1.18.2 to 1.19.0
dependabot-preview[bot] Nov 9, 2019
9039de0
feat(addons): add storybook addon and docs
HorusGoul Nov 9, 2019
501d44c
Merge branch 'development' of github.com:HorusGoul/horus-react-script…
HorusGoul Nov 9, 2019
13a002c
chore(deps): bumps package.json versions
HorusGoul Nov 9, 2019
8a409e2
chore(deps): yarn.lock update
HorusGoul Nov 9, 2019
28848a8
docs(readme.md): change link to storybook addon to its folder
HorusGoul Nov 9, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
Expand Up @@ -7,3 +7,12 @@ Run CRA like this:
```
create-react-app --scripts-version horus-react-scripts AppName
```

## Addons

Addons are helpers that allow other tools to use HRS configuration. Currently, this is the list of addons
directly supported:

- [Storybook](./addons/storybook)

If you need support for a tool that isn't listed here or you found some issues using any of the existing addons, please submit an issue or create a PR.
22 changes: 22 additions & 0 deletions addons/storybook/README.md
@@ -0,0 +1,22 @@
# Storybook

You can connect Storybook's Webpack Configuration to ours just by creating a `.storybook/webpack.config.js` file in your project and putting this inside:

```js
module.exports = require('horus-react-scripts/addons/storybook/webpack.config');
```

Alternatively, you can do the same by copy-pasting the code located in [`webpack.config.js`](./webpack.config.js) inside your project's `.storybook/webpack.config.js`, and after that, changing the path that points to the HRS' Webpack Configuration to `horus-react-scripts/config/webpack.config.entry`.

Remember to also follow the [Storybook for React Guide](https://storybook.js.org/docs/guides/guide-react/#manual-setup) to complete your setup.

**You don't need to add react, react-dom @babel/core or babel-loader as these are already handled by `horus-react-scripts`**

## After ejecting

If you decide to eject, you'll need to do two things:

1. First, copy-paste the configuration from this folder as we explained earlier
2. Then replace the path to your project's webpack config from `horus-react-scripts/config/webpack.config.entry` to something like `../config/webpack.config.entry` (may vary depeding on your project's folder structure)

Now everything should continue working just like before ejecting 🎉
23 changes: 23 additions & 0 deletions addons/storybook/webpack.config.js
@@ -0,0 +1,23 @@
const createWebpackConfig = require('../../config/webpack.config.entry')
.default;

module.exports = async ({ config, mode }) => {
const projectConfig = createWebpackConfig(
mode === 'PRODUCTION' ? 'production' : 'dev',
);

const excludedPlugins = config.plugins.map(plugin => plugin.constructor.name);

return {
...config,
context: projectConfig.context,
resolve: projectConfig.resolve,
module: projectConfig.module,
plugins: [
...config.plugins,
...projectConfig.plugins.filter(plugin => {
return !excludedPlugins.includes(plugin.constructor.name);
}),
],
};
};
69 changes: 35 additions & 34 deletions package.json
Expand Up @@ -15,7 +15,8 @@
"bin",
"config",
"scripts",
"templates"
"templates",
"addons"
],
"bugs": {
"url": "https://github.com/HorusGoul/horus-react-scripts/issues"
Expand All @@ -27,42 +28,42 @@
"semantic-release": "semantic-release"
},
"dependencies": {
"@babel/core": "^7.6.4",
"@babel/preset-env": "^7.6.3",
"@babel/preset-react": "^7.6.3",
"@babel/preset-typescript": "^7.6.0",
"@babel/register": "^7.6.2",
"@hot-loader/react-dom": "^16.10.2",
"@babel/core": "^7.7.2",
"@babel/preset-env": "^7.7.1",
"@babel/preset-react": "^7.7.0",
"@babel/preset-typescript": "^7.7.2",
"@babel/register": "^7.7.0",
"@hot-loader/react-dom": "^16.11.0",
"@nice-labs/typed-css-modules": "^1.2.1",
"@svgr/webpack": "^4.3.3",
"@testing-library/react": "^9.3.0",
"@types/jest": "^24.0.19",
"@types/react": "^16.9.6",
"@types/react-dom": "^16.9.2",
"@types/webpack": "^4.39.3",
"@testing-library/react": "^9.3.2",
"@types/jest": "^24.0.22",
"@types/react": "^16.9.11",
"@types/react-dom": "^16.9.4",
"@types/webpack": "^4.39.8",
"@types/workbox-sw": "^4.2.1",
"@typescript-eslint/eslint-plugin": "^2.4.0",
"@typescript-eslint/parser": "^2.4.0",
"autoprefixer": "^9.6.5",
"@typescript-eslint/eslint-plugin": "^2.6.1",
"@typescript-eslint/parser": "^2.6.1",
"autoprefixer": "^9.7.1",
"babel-jest": "^24.9.0",
"babel-loader": "^8.0.6",
"camelcase": "^5.3.1",
"command-exists": "^1.2.8",
"copy-dir": "^1.2.0",
"copy-template-dir": "^1.4.0",
"copy-webpack-plugin": "^5.0.4",
"core-js": "^3.3.2",
"copy-webpack-plugin": "^5.0.5",
"core-js": "^3.4.0",
"cross-env": "^6.0.3",
"cross-spawn": "^7.0.1",
"css-loader": "^3.2.0",
"dotenv": "^8.2.0",
"eslint": "^6.5.1",
"eslint-config-prettier": "^6.4.0",
"eslint": "^6.6.0",
"eslint-config-prettier": "^6.5.0",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-react": "^7.16.0",
"eslint-plugin-react-hooks": "^2.1.2",
"eslint-plugin-react-hooks": "^2.2.0",
"file-loader": "^4.2.0",
"fork-ts-checker-webpack-plugin": "^3.0.1",
"fork-ts-checker-webpack-plugin": "^3.1.0",
"html-webpack-plugin": "^3.2.0",
"husky": "^3.0.9",
"identity-obj-proxy": "^3.0.0",
Expand All @@ -73,24 +74,24 @@
"lint-staged": "^9.4.2",
"mini-css-extract-plugin": "^0.8.0",
"minireset.css": "^0.0.6",
"node-sass": "^4.12.0",
"node-sass": "^4.13.0",
"postcss-loader": "^3.0.0",
"postcss-pxtorem": "^4.0.1",
"prettier": "^1.18.2",
"react-hot-loader": "^4.12.15",
"prettier": "^1.19.0",
"react-hot-loader": "^4.12.16",
"regenerator-runtime": "^0.13.3",
"sass-loader": "^8.0.0",
"sass-mq": "^5.0.1",
"style-loader": "^1.0.0",
"terser-webpack-plugin": "^2.1.3",
"ts-loader": "^6.2.0",
"typescript": "^3.6.4",
"webpack": "^4.41.1",
"webpack-bundle-analyzer": "^3.5.2",
"terser-webpack-plugin": "^2.2.1",
"ts-loader": "^6.2.1",
"typescript": "^3.7.2",
"webpack": "^4.41.2",
"webpack-bundle-analyzer": "^3.6.0",
"webpack-chunk-hash": "^0.6.0",
"webpack-cleanup-plugin": "^0.5.1",
"webpack-cli": "^3.3.9",
"webpack-dev-server": "^3.8.2",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.9.0",
"webpack-merge": "^4.2.2",
"workbox-webpack-plugin": "^5.0.0-rc.0"
},
Expand All @@ -100,14 +101,14 @@
},
"devDependencies": {
"@semantic-release/changelog": "^3.0.5",
"@semantic-release/commit-analyzer": "^6.3.2",
"@semantic-release/commit-analyzer": "^6.3.3",
"@semantic-release/github": "^5.5.5",
"@semantic-release/npm": "^5.3.2",
"@semantic-release/npm": "^5.3.4",
"@semantic-release/release-notes-generator": "^7.3.2",
"commitizen": "^4.0.3",
"create-react-app": "^3.2.0",
"cz-conventional-changelog": "3.0.2",
"semantic-release": "^15.13.27"
"semantic-release": "^15.13.30"
},
"config": {
"commitizen": {
Expand Down