apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Chore: Setup live reloading (#97248)

Browse Source 
* setup live reloading

* put live-reloading behind cli flag, remove webpack.hot.js

* use env.liveReload

* fix lint

---------

Co-authored-by: joshhunt <josh@trtr.co>
pull/97253/head
Dominik Broj 8 months ago committed by GitHub
parent 219411f894
commit cfbeea4ce7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 139 additions and 105 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      package.json
  2. 12
      scripts/webpack/webpack.dev.js
  3. 91
      scripts/webpack/webpack.hot.js
  4. 139
      yarn.lock

2
package.json
Unescape View File

@ -40,6 +40,7 @@
"prettier:checkDocs": "prettier --check --list-different=false --log-level=warn \"docs/**/*.md\" \"*.md\" \"packages/**/*.{ts,tsx,scss,md,mdx,json}\"",
"prettier:write": "prettier --list-different \"**/*.{js,ts,tsx,scss,md,mdx,json}\" --write",
"start": "NODE_ENV=dev nx exec -- webpack --config scripts/webpack/webpack.dev.js --watch",
"start:liveReload": "yarn start -- --env liveReload=1",
"start:noTsCheck": "yarn start -- --env noTsCheck=1",
"start:noLint": "yarn start -- --env noTsCheck=1 --env noLint=1",
"stats": "webpack --mode production --config scripts/webpack/webpack.prod.js --profile --json > compilation-stats.json",
@ -242,6 +243,7 @@
"webpack-bundle-analyzer": "4.10.2",
"webpack-cli": "5.1.4",
"webpack-dev-server": "5.1.0",
"webpack-livereload-plugin": "3.0.2",
"webpack-manifest-plugin": "5.0.0",
"webpack-merge": "5.10.0",
"webpackbar": "^6.0.0",

12
scripts/webpack/webpack.dev.js
Unescape View File

@ -8,6 +8,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const path = require('path');
const { DefinePlugin, EnvironmentPlugin } = require('webpack');
const WebpackAssetsManifest = require('webpack-assets-manifest');
const LiveReloadPlugin = require('webpack-livereload-plugin');
const { merge } = require('webpack-merge');
const WebpackBar = require('webpackbar');
@ -105,6 +106,17 @@ module.exports = (env = {}) => {
},
plugins: [
...(parseInt(env.liveReload, 10)
? [
new LiveReloadPlugin({
appendScriptTag: true,
useSourceHash: true,
hostname: 'localhost',
protocol: 'http',
port: 35750,
}),
]
: []),
parseInt(env.noTsCheck, 10)
? new DefinePlugin({}) // bogus plugin to satisfy webpack API
: new ForkTsCheckerWebpackPlugin({

91
scripts/webpack/webpack.hot.js
Unescape View File

@ -1,91 +0,0 @@
'use strict';
const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const path = require('path');
const { DefinePlugin } = require('webpack');
const { merge } = require('webpack-merge');
const common = require('./webpack.common.js');
module.exports = merge(common, {
devtool: 'inline-source-map',
mode: 'development',
entry: {
app: ['./public/app/index.ts'],
dark: './public/sass/grafana.dark.scss',
light: './public/sass/grafana.light.scss',
},
watchOptions: {
ignored: /node_modules/,
},
devServer: {
devMiddleware: {
writeToDisk: true,
},
historyApiFallback: true,
hot: true,
open: false,
port: 3333,
proxy: [
{
context: '!/public/build',
target: 'http://localhost:3000',
},
],
static: {
publicPath: '/public/build/',
},
},
module: {
// Note: order is bottom-to-top and/or right-to-left
rules: [
{
test: /\.tsx?$/,
use: {
loader: 'babel-loader',
options: {
cacheDirectory: true,
cacheCompression: false,
},
},
exclude: /node_modules/,
include: [path.resolve(__dirname, '../../public/'), path.resolve(__dirname, '../../packages/')],
},
require('./sass.rule.js')({
sourceMap: false,
preserveUrl: false,
}),
],
},
// https://webpack.js.org/guides/build-performance/#output-without-path-info
output: {
filename: '[name].js',
pathinfo: false,
},
// https://webpack.js.org/guides/build-performance/#avoid-extra-optimization-steps
optimization: {
runtimeChunk: true,
removeAvailableModules: false,
removeEmptyChunks: false,
splitChunks: false,
},
plugins: [
new MiniCssExtractPlugin({
filename: 'grafana.[name].[contenthash].css',
}),
new ReactRefreshWebpackPlugin(),
new DefinePlugin({
'process.env': {
NODE_ENV: JSON.stringify('development'),
},
}),
],
});

139
yarn.lock
Unescape View File

@ -10837,7 +10837,7 @@ __metadata:
languageName: node
linkType: hard
"anymatch@npm:^3.0.3, anymatch@npm:^3.1.3, anymatch@npm:~3.1.2":
"anymatch@npm:^3.0.3, anymatch@npm:^3.1.1, anymatch@npm:^3.1.3, anymatch@npm:~3.1.2":
version: 3.1.3
resolution: "anymatch@npm:3.1.3"
dependencies:
@ -11587,6 +11587,18 @@ __metadata:
languageName: node
linkType: hard
"body@npm:^5.1.0":
version: 5.1.0
resolution: "body@npm:5.1.0"
dependencies:
continuable-cache: "npm:^0.3.1"
error: "npm:^7.0.0"
raw-body: "npm:~1.1.0"
safe-json-parse: "npm:~1.0.1"
checksum: 10/e11cf04a6ce4d9a9d0760b755c66d2b83aabcb7b30355373b3132c2af3bab7055ee15fe2540932b956084223d18f80fde47a289a106d4d773acb637ae82d832d
languageName: node
linkType: hard
"bonjour-service@npm:^1.2.1":
version: 1.2.1
resolution: "bonjour-service@npm:1.2.1"
@ -11784,6 +11796,13 @@ __metadata:
languageName: node
linkType: hard
"bytes@npm:1":
version: 1.0.0
resolution: "bytes@npm:1.0.0"
checksum: 10/6e475440d7e32971611d2bc592695fee484ee91ca1cd49f99c855560131f71670d3d185210f6cdd1704f12281f0cfcee5cb1c1f6788cb2f676b410464b7d6885
languageName: node
linkType: hard
"bytes@npm:3.0.0":
version: 3.0.0
resolution: "bytes@npm:3.0.0"
@ -12733,6 +12752,13 @@ __metadata:
languageName: node
linkType: hard
"continuable-cache@npm:^0.3.1":
version: 0.3.1
resolution: "continuable-cache@npm:0.3.1"
checksum: 10/b36ec13a3a641354b2b06579a8488a0e87cc016d44fffd62878bc360c99bcc7eb714abec6b9eb5c639b7ee50d0a25a504873a9b9c69088b49a13dd325dfb6d53
languageName: node
linkType: hard
"conventional-changelog-angular@npm:7.0.0":
version: 7.0.0
resolution: "conventional-changelog-angular@npm:7.0.0"
@ -14791,6 +14817,15 @@ __metadata:
languageName: node
linkType: hard
"error@npm:^7.0.0":
version: 7.2.1
resolution: "error@npm:7.2.1"
dependencies:
string-template: "npm:~0.2.1"
checksum: 10/9c790d20a386947acfeabb0d1c39173efe8e5a38cb732b5f06c11a25c23ce8ac4dafbb7aa240565e034580a49aba0703e743d0274c6228500ddf947a1b998568
languageName: node
linkType: hard
"es-abstract@npm:^1.17.5, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3":
version: 1.23.3
resolution: "es-abstract@npm:1.23.3"
@ -16084,6 +16119,15 @@ __metadata:
languageName: node
linkType: hard
"faye-websocket@npm:~0.10.0":
version: 0.10.0
resolution: "faye-websocket@npm:0.10.0"
dependencies:
websocket-driver: "npm:>=0.5.1"
checksum: 10/f913f886e5b2218ab0aa5cdb527e0a8f91eb66b4ecf989f4d2b5df39b2ad1ce9bf88e9459392d313ec6658fedb82760dda79050bdfe1c7eb3f1aa8b737f3c400
languageName: node
linkType: hard
"fb-watchman@npm:^2.0.0":
version: 2.0.1
resolution: "fb-watchman@npm:2.0.1"
@ -17452,6 +17496,7 @@ __metadata:
webpack-bundle-analyzer: "npm:4.10.2"
webpack-cli: "npm:5.1.4"
webpack-dev-server: "npm:5.1.0"
webpack-livereload-plugin: "npm:3.0.2"
webpack-manifest-plugin: "npm:5.0.0"
webpack-merge: "npm:5.10.0"
webpackbar: "npm:^6.0.0"
@ -20592,6 +20637,13 @@ __metadata:
languageName: node
linkType: hard
"livereload-js@npm:^2.3.0":
version: 2.4.0
resolution: "livereload-js@npm:2.4.0"
checksum: 10/24866a41647d922a1002756d06961099bff945c2e6f2f3af35aa8e1ebd2610149fdc7dfe2104980c481e4c758620dff02a8dec11ec0bc1ef762993729b117504
languageName: node
linkType: hard
"load-json-file@npm:6.2.0":
version: 6.2.0
resolution: "load-json-file@npm:6.2.0"
@ -23446,7 +23498,7 @@ __metadata:
languageName: node
linkType: hard
"portfinder@npm:^1.0.28":
"portfinder@npm:^1.0.17, portfinder@npm:^1.0.28":
version: 1.0.32
resolution: "portfinder@npm:1.0.32"
dependencies:
@ -24408,6 +24460,16 @@ __metadata:
languageName: node
linkType: hard
"raw-body@npm:~1.1.0":
version: 1.1.7
resolution: "raw-body@npm:1.1.7"
dependencies:
bytes: "npm:1"
string_decoder: "npm:0.10"
checksum: 10/75ab1815ac54992abccccdffb27bd9ad9f5b6f5fb66e740474ad0d1bd3c1425e407b2be5eb34e0bef3da2c66bfa6a2c2b77498596f5b9999ead2d449fff0226f
languageName: node
linkType: hard
"rbush@npm:^3.0.1":
version: 3.0.1
resolution: "rbush@npm:3.0.1"
@ -26453,6 +26515,13 @@ __metadata:
languageName: node
linkType: hard
"safe-json-parse@npm:~1.0.1":
version: 1.0.1
resolution: "safe-json-parse@npm:1.0.1"
checksum: 10/5af65161011fd06dc1c51c18d759fe0df9e075fad4f5f363bc61403f4d963c3481f12d1794bbacef72aee7def20f426126da5767c283d9fcaecead34828499ad
languageName: node
linkType: hard
"safe-regex-test@npm:^1.0.3":
version: 1.0.3
resolution: "safe-regex-test@npm:1.0.3"
@ -26532,18 +26601,7 @@ __metadata:
languageName: node
linkType: hard
"schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0, schema-utils@npm:^3.3.0":
version: 3.3.0
resolution: "schema-utils@npm:3.3.0"
dependencies:
"@types/json-schema": "npm:^7.0.8"
ajv: "npm:^6.12.5"
ajv-keywords: "npm:^3.5.2"
checksum: 10/2c7bbb1da967fdfd320e6cea538949006ec6e8c13ea560a4f94ff2c56809a8486fa5ec419e023452501a6befe1ca381e409c2798c24f4993c7c4094d97fdb258
languageName: node
linkType: hard
"schema-utils@npm:^4.0.0, schema-utils@npm:^4.2.0":
"schema-utils@npm:>1.0.0, schema-utils@npm:^4.0.0, schema-utils@npm:^4.2.0":
version: 4.2.0
resolution: "schema-utils@npm:4.2.0"
dependencies:
@ -26555,6 +26613,17 @@ __metadata:
languageName: node
linkType: hard
"schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0, schema-utils@npm:^3.3.0":
version: 3.3.0
resolution: "schema-utils@npm:3.3.0"
dependencies:
"@types/json-schema": "npm:^7.0.8"
ajv: "npm:^6.12.5"
ajv-keywords: "npm:^3.5.2"
checksum: 10/2c7bbb1da967fdfd320e6cea538949006ec6e8c13ea560a4f94ff2c56809a8486fa5ec419e023452501a6befe1ca381e409c2798c24f4993c7c4094d97fdb258
languageName: node
linkType: hard
"screenfull@npm:^5.1.0":
version: 5.1.0
resolution: "screenfull@npm:5.1.0"
@ -27726,6 +27795,13 @@ __metadata:
languageName: node
linkType: hard
"string-template@npm:~0.2.1":
version: 0.2.1
resolution: "string-template@npm:0.2.1"
checksum: 10/042cdcf4d4832378f12fbf45b42f479990f330cc409e6dc184838801efbc8352ccf9428fe169f8f8cfff2b864879d4ba1ef8b5f41d63d1d71844c48005a1683f
languageName: node
linkType: hard
"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
version: 4.2.3
resolution: "string-width@npm:4.2.3"
@ -27834,6 +27910,13 @@ __metadata:
languageName: node
linkType: hard
"string_decoder@npm:0.10":
version: 0.10.31
resolution: "string_decoder@npm:0.10.31"
checksum: 10/cc43e6b1340d4c7843da0e37d4c87a4084c2342fc99dcf6563c3ec273bb082f0cbd4ebf25d5da19b04fb16400d393885fda830be5128e1c416c73b5a6165f175
languageName: node
linkType: hard
"string_decoder@npm:1.3.0, string_decoder@npm:^1.1.1":
version: 1.3.0
resolution: "string_decoder@npm:1.3.0"
@ -28537,6 +28620,20 @@ __metadata:
languageName: node
linkType: hard
"tiny-lr@npm:^1.1.1":
version: 1.1.1
resolution: "tiny-lr@npm:1.1.1"
dependencies:
body: "npm:^5.1.0"
debug: "npm:^3.1.0"
faye-websocket: "npm:~0.10.0"
livereload-js: "npm:^2.3.0"
object-assign: "npm:^4.1.0"
qs: "npm:^6.4.0"
checksum: 10/1601382129d1ce575c2bd1fa490d2f6ca292e53d8266cb59e5e4f2a7b30e2a6cd8ce719227aa48e25549a729de93103bfe2ba51206362e96c363ea9e4374d8f2
languageName: node
linkType: hard
"tiny-warning@npm:^0.0.3":
version: 0.0.3
resolution: "tiny-warning@npm:0.0.3"
@ -29977,6 +30074,20 @@ __metadata:
languageName: node
linkType: hard
"webpack-livereload-plugin@npm:3.0.2":
version: 3.0.2
resolution: "webpack-livereload-plugin@npm:3.0.2"
dependencies:
anymatch: "npm:^3.1.1"
portfinder: "npm:^1.0.17"
schema-utils: "npm:>1.0.0"
tiny-lr: "npm:^1.1.1"
peerDependencies:
webpack: ^4.0.0 || ^5.0.0
checksum: 10/d7a01b77ae40e17d359ef3f0cb3bf7639f1449a2a7a6a13b438924d4a9cf996a652d99fe6e638b504845a1e71da7aec8e63743c6b1a7d04010bc228ef89ab1d1
languageName: node
linkType: hard
"webpack-manifest-plugin@npm:5.0.0":
version: 5.0.0
resolution: "webpack-manifest-plugin@npm:5.0.0"

Write Preview
Loading…
Cancel
Save