update libs, fix webpack

This commit is contained in:
DieMyst 2020-11-26 16:53:31 +03:00
parent d8aa521f60
commit fa84ead4a4
8 changed files with 2809 additions and 5403 deletions

View File

@ -13,7 +13,7 @@
<title>Fluence Network Dashboard</title>
</head>
<body>
<script src="bundle.js"></script>
<script src="/bundle/bundle.js"></script>
<div id="root"></div>
</body>
</html>

8094
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -23,24 +23,25 @@
"tachyons": "^4.12.0"
},
"devDependencies": {
"@babel/core": "^7.10.4",
"@babel/core": "7.12.9",
"clean-webpack-plugin": "3.0.0",
"copy-webpack-plugin": "^4.6.0",
"create-elm-app": "4.2.24",
"css-loader": "^3.5.3",
"copy-webpack-plugin": "6.3.2",
"create-elm-app": "5.18.0",
"css-loader": "5.0.1",
"elm-hot-webpack-loader": "1.1.7",
"elm-webpack-loader": "6.0.1",
"html-webpack-plugin": "^4.4.1",
"http-server": "^0.12.3",
"parcel-bundler": "^1.12.4",
"replace-in-file": "^6.0.0",
"elm-webpack-loader": "7.0.1",
"html-webpack-plugin": "4.5.0",
"http-server": "0.12.3",
"replace-in-file": "6.1.0",
"source-map-loader": "1.1.2",
"style-loader": "^0.23.1",
"ts-loader": "^8.0.3",
"typescript": "^4.0.2",
"webpack": "^4.44.2",
"webpack-cli": "3.3.11",
"style-loader": "2.0.0",
"ts-loader": "8.0.11",
"typescript": "4.1.2",
"webpack": "5.7.0",
"webpack-cli": "4.2.0",
"webpack-dev-server": "3.11.0",
"webpack-serve": "2.0.3"
"webpack-nano": "^1.1.0",
"webpack-plugin-serve": "^1.2.0",
"webpack-serve": "3.2.0"
}
}

View File

@ -11,4 +11,4 @@ type Msg
| LinkClicked UrlRequest
| AquamarineEvent Port.ReceiveEvent
| RelayChanged String
| Click
| Click String

View File

@ -38,9 +38,6 @@ routeView model route =
el =
List.head (List.drop 3 (Dict.toList model.discoveredPeers))
_ =
Debug.log "el" el
in
case Maybe.andThen up el of
Just ( peerId, service ) ->

View File

@ -23,7 +23,9 @@ import Json.Decode exposing (decodeValue, list, string)
import Json.Encode exposing (Value)
import Maybe exposing (withDefault)
import Model exposing (Model, emptyPeerData)
import Modules.Air
import Msg exposing (..)
import Nodes.Air
import Port exposing (sendAir)
import Route
import Services.Air
@ -155,10 +157,23 @@ update msg model =
in
( model, Cmd.none )
Click ->
( model
, sendAir (Services.Air.air model.peerId model.relayId (Dict.keys model.discoveredPeers))
)
Click command ->
case command of
"get_services" ->
( model
, sendAir (Services.Air.air model.peerId model.relayId (Dict.keys model.discoveredPeers))
)
"get_modules" ->
( model
, sendAir (Modules.Air.air model.peerId model.relayId (Dict.keys model.discoveredPeers))
)
"get_identify" ->
( model
, sendAir (Nodes.Air.air model.peerId model.relayId (Dict.keys model.discoveredPeers))
)
_ ->
(model, Cmd.none)
RelayChanged relayId ->
( { model | relayId = relayId }, Cmd.none )

View File

@ -52,7 +52,9 @@ body model =
List.concat
[ [ header [ classes "w-100 bt bb b--black-10" ] [ routeView model (Page "hub") ] ]
++ [ header [ classes "w-100 bt bb b--black-10" ] [ routeView model (Page "module") ] ]
++ [ header [ classes "w-100 bt bb b--black-10", onClick Click ] [ text "GET SERVICES" ] ]
++ [ header [ classes "w-100 bt bb b--black-10", onClick (Click "get_services") ] [ text "GET SERVICES" ] ]
++ [ header [ classes "w-100 bt bb b--black-10", onClick (Click "get_modules") ] [ text "GET MODULES" ] ]
++ [ header [ classes "w-100 bt bb b--black-10", onClick (Click "get_identify") ] [ text "GET IDENTIFY" ] ]
]

View File

@ -1,5 +1,7 @@
const path = require('path');
const CopyWebpackPlugin = require('copy-webpack-plugin')
const webpack = require('webpack');
const { WebpackPluginServe: Serve } = require('webpack-plugin-serve');
module.exports = {
entry: {
@ -12,53 +14,66 @@ module.exports = {
contentBase: './bundle',
hot: false,
inline: false,
historyApiFallback:{
index:'index.html'
},
historyApiFallback: {
rewrites: [
{from: /^\/$/, to: '/index.html'},
{from: /./, to: '/index.html'}
]
}
},
devtool: "eval-source-map",
module: {
rules: [
{
test: /\.html$/,
exclude: /node_modules/,
loader: "file-loader?name=[name].[ext]"
use: [{loader: "file-loader?name=[name].[ext]"}]
},
{
test: [/\.elm$/],
exclude: [/elm-stuff/, /node_modules/],
use: [
{ loader: "elm-hot-webpack-loader" },
{loader: "elm-hot-webpack-loader"},
{
loader: "elm-webpack-loader",
options:
{ debug: false, forceWatch: true }
{debug: false, forceWatch: false}
}
]
},
{ test: /\.ts$/, loader: "ts-loader" },
{test: /\.ts$/, loader: "ts-loader"},
{
test: /\.(png)$/,
loader: 'file-loader',
},
{
test: /\.css$/i,
use: ['style-loader', 'css-loader'],
},
{
test: /\.css$/i,
use: ['style-loader', 'css-loader'],
},
]
},
mode: "development",
watch: true,
output: {
filename: 'bundle.js',
path: path.resolve(__dirname, 'bundle')
path: path.resolve(__dirname, 'bundle'),
publicPath: "/"
},
plugins: [
new CopyWebpackPlugin([{
from: './*.html'
}]),
new CopyWebpackPlugin([{
from: './images/*.png'
}])
new CopyWebpackPlugin({
patterns: [
{from: './*.html'},
// {from: './images/*.png'},
]
}),
new webpack.ProvidePlugin({
process: 'process/browser.js',
Buffer: ['buffer', 'Buffer'],
}),
new Serve({
historyFallback: true,
port: 55553
})
]
};