Commit d150b62d by David Kaltschmidt

Stick to .tsx? for babel file test

parent 5038efe0
...@@ -4,22 +4,19 @@ const merge = require('webpack-merge'); ...@@ -4,22 +4,19 @@ const merge = require('webpack-merge');
const common = require('./webpack.common.js'); const common = require('./webpack.common.js');
const path = require('path'); const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
const HtmlWebpackPlugin = require("html-webpack-plugin"); const HtmlWebpackPlugin = require('html-webpack-plugin');
const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin'); const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin');
const CleanWebpackPlugin = require('clean-webpack-plugin'); const CleanWebpackPlugin = require('clean-webpack-plugin');
module.exports = merge(common, { module.exports = merge(common, {
entry: { entry: {
app: [ app: ['webpack-dev-server/client?http://localhost:3333', './public/app/dev.ts'],
'webpack-dev-server/client?http://localhost:3333',
'./public/app/dev.ts',
],
}, },
output: { output: {
path: path.resolve(__dirname, '../../public/build'), path: path.resolve(__dirname, '../../public/build'),
filename: '[name].[hash].js', filename: '[name].[hash].js',
publicPath: "/public/build/", publicPath: '/public/build/',
pathinfo: false, pathinfo: false,
}, },
...@@ -34,8 +31,8 @@ module.exports = merge(common, { ...@@ -34,8 +31,8 @@ module.exports = merge(common, {
hot: true, hot: true,
port: 3333, port: 3333,
proxy: { proxy: {
'!/public/build': 'http://localhost:3000' '!/public/build': 'http://localhost:3000',
} },
}, },
optimization: { optimization: {
...@@ -47,46 +44,48 @@ module.exports = merge(common, { ...@@ -47,46 +44,48 @@ module.exports = merge(common, {
module: { module: {
rules: [ rules: [
{ {
test: /\.(j|t)sx?$/, test: /\.tsx?$/,
exclude: /node_modules/, exclude: /node_modules/,
use: [{ use: [
loader: 'babel-loader', {
options: { loader: 'babel-loader',
cacheDirectory: true, options: {
babelrc: false, cacheDirectory: true,
plugins: [ babelrc: false,
[require("@rtsao/plugin-proposal-class-properties"), { loose: true }], plugins: [
'angularjs-annotate', [require('@rtsao/plugin-proposal-class-properties'), { loose: true }],
'syntax-dynamic-import', // needed for `() => import()` in routes.ts 'angularjs-annotate',
'react-hot-loader/babel' 'syntax-dynamic-import', // needed for `() => import()` in routes.ts
], 'react-hot-loader/babel',
presets: [
[
'@babel/preset-env',
{
targets: { browsers: 'last 3 versions' },
useBuiltIns: 'entry'
}
], ],
'@babel/preset-typescript', presets: [
'@babel/preset-react' [
], '@babel/preset-env',
} {
}], targets: { browsers: 'last 3 versions' },
useBuiltIns: 'entry',
},
],
'@babel/preset-typescript',
'@babel/preset-react',
],
},
},
],
}, },
{ {
test: /\.scss$/, test: /\.scss$/,
use: [ use: [
"style-loader", // creates style nodes from JS strings 'style-loader', // creates style nodes from JS strings
"css-loader", // translates CSS into CommonJS 'css-loader', // translates CSS into CommonJS
"sass-loader" // compiles Sass to CSS 'sass-loader', // compiles Sass to CSS
] ],
}, },
{ {
test: /\.(png|jpg|gif|ttf|eot|svg|woff(2)?)(\?[a-z0-9=&.]+)?$/, test: /\.(png|jpg|gif|ttf|eot|svg|woff(2)?)(\?[a-z0-9=&.]+)?$/,
loader: 'file-loader' loader: 'file-loader',
}, },
] ],
}, },
plugins: [ plugins: [
...@@ -95,16 +94,16 @@ module.exports = merge(common, { ...@@ -95,16 +94,16 @@ module.exports = merge(common, {
filename: path.resolve(__dirname, '../../public/views/index.html'), filename: path.resolve(__dirname, '../../public/views/index.html'),
template: path.resolve(__dirname, '../../public/views/index-template.html'), template: path.resolve(__dirname, '../../public/views/index-template.html'),
inject: 'body', inject: 'body',
alwaysWriteToDisk: true alwaysWriteToDisk: true,
}), }),
new HtmlWebpackHarddiskPlugin(), new HtmlWebpackHarddiskPlugin(),
new webpack.NamedModulesPlugin(), new webpack.NamedModulesPlugin(),
new webpack.HotModuleReplacementPlugin(), new webpack.HotModuleReplacementPlugin(),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'GRAFANA_THEME': JSON.stringify(process.env.GRAFANA_THEME || 'dark'), GRAFANA_THEME: JSON.stringify(process.env.GRAFANA_THEME || 'dark'),
'process.env': { 'process.env': {
'NODE_ENV': JSON.stringify('development') NODE_ENV: JSON.stringify('development'),
} },
}), }),
] ],
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment