Skip to content

Commit

Permalink
Minor fixes after v.3.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
BiosBoy committed Jun 29, 2020
1 parent 390e82f commit b6c2ff8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ src/index.html
*.cssmodule.d.ts
typings.d.ts
tsconfig.json
.eslintrc.js
6 changes: 3 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ module.exports = {
],
"semi": [
"error",
"never"
"always"
],
"prefer-const": "error",
"no-param-reassign": [
Expand Down Expand Up @@ -2285,7 +2285,7 @@ module.exports = {
"error"
],
// "@typescript-eslint/no-invalid-this": "error",
"@typescript-eslint/class-name-casing": "error",
// "@typescript-eslint/class-name-casing": "error",
"@typescript-eslint/no-unused-vars": [2, { args: 'none' }],
"@typescript-eslint/consistent-type-definitions": "off",
"@typescript-eslint/explicit-member-accessibility": [
Expand Down Expand Up @@ -2425,7 +2425,7 @@ module.exports = {
],
"@typescript-eslint/semi": [
"error",
"never"
"always"
],
"no-null/no-null": "off",
"prefer-arrow/prefer-arrow-functions": "warn",
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
"tslint-eslint-rules": "5.4.0",
"tslint-react": "5.0.0",
"tslint-react-hooks": "2.2.2",
"typescript-eslint": "^0.0.1-alpha.0",
"url-loader": "4.1.0",
"webpack-bundle-analyzer": "3.8.0"
},
Expand Down
7 changes: 2 additions & 5 deletions server/server.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
// import global vars for a whole app
const globals = require('../globals');

const path = require('path');
const browserSync = require('browser-sync');
const historyApiFallback = require('connect-history-api-fallback');
const webpack = require('webpack');
const webpackDevMiddleware = require('webpack-dev-middleware');
const webpackHotMiddleware = require('webpack-hot-middleware');

const proxyMiddleware = require('./proxy')
const proxyMiddleware = require('./proxy.ts');
const webpackConfig = require('../webpack.config.js');

const bundler = webpack(webpackConfig);
Expand All @@ -18,7 +15,7 @@ const bundler = webpack(webpackConfig);
// ========================================================
const devMiddlewareOptions = {
publicPath: webpackConfig.output.publicPath,
hot: __DEV__ ? true : false,
hot: __DEV__,
headers: { 'Access-Control-Allow-Origin': '*' }
};

Expand Down
11 changes: 6 additions & 5 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// import global vars for a whole app
require('./globals');
const globals = require('./globals');

const path = require('path');
const webpack = require('webpack');
Expand Down Expand Up @@ -64,9 +64,9 @@ const rules = [
{
loader: 'css-loader',
options: {
importLoaders: 2,
modules: true,
localIdentName: '[local]___[hash:base64:5]'
modules: {
localIdentName: '[local]___[hash:base64:5]'
}
}
},
'postcss-loader',
Expand Down Expand Up @@ -256,7 +256,8 @@ const createConfig = () => {
new webpack.DefinePlugin({
__DEV__,
__PROD__,
__TEST__
__TEST__,
...globals
}),
...stagePlugins[__NODE_ENV__]
];
Expand Down

0 comments on commit b6c2ff8

Please sign in to comment.