Skip to content

Commit

Permalink
update project
Browse files Browse the repository at this point in the history
  • Loading branch information
narr committed Sep 20, 2020
1 parent 995fa62 commit ca1fac6
Show file tree
Hide file tree
Showing 7 changed files with 947 additions and 986 deletions.
8 changes: 7 additions & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
const webpackConfig = require('../webpack.config');

module.exports = {
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
addons: ['@storybook/addon-links', '@storybook/addon-essentials'],
webpackFinal: async baseConfig => {
return { ...baseConfig };
baseConfig.resolve.alias = {
...baseConfig.resolve.alias,
...webpackConfig.resolve.alias,
};
return baseConfig;
},
};
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
],
"turboConsoleLog.quote": "'",
"turboConsoleLog.addSemicolonInTheEnd": true,
"typescript.tsdk": "node_modules\\typescript\\lib"
"typescript.tsdk": "node_modules/typescript/lib"
}
12 changes: 11 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
const webpackConfig = require('./webpack.config');

const withBundleAnalyzer = require('@next/bundle-analyzer')({
enabled: process.env.ANALYZE === 'true',
});
module.exports = withBundleAnalyzer({});
module.exports = withBundleAnalyzer({
webpack: config => {
config.resolve.alias = {
...config.resolve.alias,
...webpackConfig.resolve.alias,
};
return config;
},
});
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,43 +31,43 @@
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"axios": "^0.20.0",
"d3": "^5.16.0",
"next": "^9.5.2",
"d3": "^6.1.1",
"next": "^9.5.3",
"react": "^16.13.1",
"react-dom": "^16.13.1"
},
"devDependencies": {
"@cypress/code-coverage": "^3.8.1",
"@cypress/webpack-preprocessor": "^5.4.4",
"@loki/create-async-callback": "^0.24.0",
"@next/bundle-analyzer": "^9.5.2",
"@storybook/addon-actions": "^6.0.16",
"@storybook/addon-essentials": "^6.0.16",
"@storybook/addon-links": "^6.0.16",
"@storybook/react": "^6.0.16",
"@cypress/webpack-preprocessor": "^5.4.5",
"@loki/create-async-callback": "^0.25.0",
"@next/bundle-analyzer": "^9.5.3",
"@storybook/addon-actions": "^6.0.21",
"@storybook/addon-essentials": "^6.0.21",
"@storybook/addon-links": "^6.0.21",
"@storybook/react": "^6.0.21",
"@types/d3": "^5.7.2",
"@types/react": "^16.9.46",
"@typescript-eslint/eslint-plugin": "^3.9.1",
"@typescript-eslint/parser": "^3.9.1",
"@types/react": "^16.9.49",
"@typescript-eslint/eslint-plugin": "^4.1.1",
"@typescript-eslint/parser": "^4.1.1",
"compression": "^1.7.4",
"cookie-parser": "^1.4.5",
"cors": "^2.8.5",
"cross-env": "^7.0.2",
"cypress": "^5.0.0",
"eslint": "^7.7.0",
"cypress": "^5.2.0",
"eslint": "^7.9.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-cypress": "^2.11.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.6",
"eslint-plugin-react-hooks": "^4.1.0",
"eslint-plugin-react-hooks": "^4.1.2",
"express": "^4.17.1",
"http-proxy-middleware": "^1.0.5",
"loki": "^0.24.0",
"loki": "^0.25.1",
"lowdb": "^1.0.0",
"morgan": "^1.10.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.0.5",
"start-server-and-test": "^1.11.3",
"typescript": "^4.0.2"
"prettier": "^2.1.2",
"start-server-and-test": "^1.11.4",
"typescript": "^4.0.3"
}
}
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"allowJs": true,
"alwaysStrict": true,
"esModuleInterop": true,
"experimentalDecorators": true,
"forceConsistentCasingInFileNames": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
5 changes: 5 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
resolve: {
alias: {},
},
};
Loading

1 comment on commit ca1fac6

@vercel
Copy link

@vercel vercel bot commented on ca1fac6 Sep 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.