mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Use babel and hot loader only in yarn start
* moved babel rules for hot reloading into TS loader * toggling use of babel via HOT variable (true with `yarn start`) * overriding webpack output when HOT to fix asset paths in dashboard urls like http://localhost:3333/d/...
This commit is contained in:
parent
ca25a25386
commit
dd66cbc847
@ -31,11 +31,24 @@ const entries = HOT ? {
|
|||||||
vendor: require('./dependencies'),
|
vendor: require('./dependencies'),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const output = HOT ? {
|
||||||
|
path: path.resolve(__dirname, '../../public/build'),
|
||||||
|
filename: '[name].[hash].js',
|
||||||
|
publicPath: "/public/build/",
|
||||||
|
} : {
|
||||||
|
path: path.resolve(__dirname, '../../public/build'),
|
||||||
|
filename: '[name].[hash].js',
|
||||||
|
// Keep publicPath relative for host.com/grafana/ deployments
|
||||||
|
publicPath: "public/build/",
|
||||||
|
};
|
||||||
|
|
||||||
module.exports = merge(common, {
|
module.exports = merge(common, {
|
||||||
devtool: "cheap-module-source-map",
|
devtool: "cheap-module-source-map",
|
||||||
|
|
||||||
entry: entries,
|
entry: entries,
|
||||||
|
|
||||||
|
output: output,
|
||||||
|
|
||||||
resolve: {
|
resolve: {
|
||||||
extensions: ['.scss', '.ts', '.tsx', '.es6', '.js', '.json', '.svg', '.woff2', '.png'],
|
extensions: ['.scss', '.ts', '.tsx', '.es6', '.js', '.json', '.svg', '.woff2', '.png'],
|
||||||
},
|
},
|
||||||
@ -66,23 +79,20 @@ module.exports = merge(common, {
|
|||||||
{
|
{
|
||||||
test: /\.tsx?$/,
|
test: /\.tsx?$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
use: [
|
use: {
|
||||||
{
|
loader: 'awesome-typescript-loader',
|
||||||
loader: 'babel-loader',
|
options: {
|
||||||
options: {
|
useCache: true,
|
||||||
|
useBabel: HOT,
|
||||||
|
babelOptions: {
|
||||||
|
babelrc: false,
|
||||||
plugins: [
|
plugins: [
|
||||||
'syntax-dynamic-import',
|
'syntax-dynamic-import',
|
||||||
'react-hot-loader/babel',
|
'react-hot-loader/babel'
|
||||||
],
|
]
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
{
|
}
|
||||||
loader: 'awesome-typescript-loader',
|
|
||||||
options: {
|
|
||||||
useCache: true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
require('./sass.rule.js')({
|
require('./sass.rule.js')({
|
||||||
sourceMap: true, minimize: false, preserveUrl: HOT
|
sourceMap: true, minimize: false, preserveUrl: HOT
|
||||||
|
Loading…
Reference in New Issue
Block a user