100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI updates: minor fixes for package.json files and updated webpack dev server to use dir name as path
Rich Turner0ca26d9758ef
diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.jsonindex 96fe6855c..bdc7d16da 100644--- a/ui/component/or-map/package.json+++ b/ui/component/or-map/package.json@@ -1,7 +1,7 @@{"name": "@openremote/or-map","version": "1.0.0-alpha",- "description": "Displays s vector or raster mapx",+ "description": "Displays s vector or raster map","main": "dist/index.js","types": "src/index.ts","scripts": {diff --git a/ui/demo/demo-core/webpack.config.js b/ui/demo/demo-core/webpack.config.jsindex 9e59c5346..ca8e0d62c 100644--- a/ui/demo/demo-core/webpack.config.js+++ b/ui/demo/demo-core/webpack.config.js@@ -13,7 +13,8 @@ module.exports = {devtool: 'inline-source-map',devServer: {port: 9000,- contentBase: './dist'+ contentBase: './dist',+ publicPath: "/" + __dirname.split(path.sep).slice(-1)[0] + "/"},plugins: [new HtmlWebpackPlugin({diff --git a/ui/demo/demo-or-header/webpack.config.js b/ui/demo/demo-or-header/webpack.config.jsindex 57b6a2e91..c0ffbed86 100644--- a/ui/demo/demo-or-header/webpack.config.js+++ b/ui/demo/demo-or-header/webpack.config.js@@ -47,7 +47,8 @@ module.exports = {devtool: 'inline-source-map',devServer: {port: 9000,- contentBase: './dist'+ contentBase: './dist',+ publicPath: "/" + __dirname.split(path.sep).slice(-1)[0] + "/"},plugins: [new HtmlWebpackPlugin({diff --git a/ui/demo/demo-or-map/package.json b/ui/demo/demo-or-map/package.jsonindex f04bb366d..3a754dfdd 100644--- a/ui/demo/demo-or-map/package.json+++ b/ui/demo/demo-or-map/package.json@@ -11,7 +11,7 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {- "@openremote/or-map": "^1.0.0",+ "@openremote/or-map": "^1.0.0-alpha","source-map-loader": "^0.2.4"},"devDependencies": {@@ -22,11 +22,12 @@"@babel/plugin-transform-runtime": "^7.2.0","@babel/preset-env": "^7.2.0","@babel/runtime": "^7.2.0",- "babel-loader": "^8.0.4","@polymer/iron-demo-helpers": "^3.0.0-pre.19",+ "babel-loader": "^8.0.4","copy-webpack-plugin": "^4.6.0","cross-env": "^5.2.0","css-loader": "^2.0.0",+ "fast-async": "^6.3.8","file-loader": "^2.0.0","html-webpack-plugin": "^3.2.0","raw-loader": "^0.5.1",diff --git a/ui/demo/demo-or-map/tsconfig.json b/ui/demo/demo-or-map/tsconfig.jsonindex 95943bc22..c5a44fb36 100644--- a/ui/demo/demo-or-map/tsconfig.json+++ b/ui/demo/demo-or-map/tsconfig.json@@ -5,6 +5,8 @@"../../component/or-map/@types"],"references": [+ { "path": "../../component/core" },+ { "path": "../../component/rest" },{ "path": "../../component/or-map" }]}\ No newline at end of filediff --git a/ui/demo/demo-or-map/webpack.config.js b/ui/demo/demo-or-map/webpack.config.jsindex 4c55a247c..6b97b0c78 100644--- a/ui/demo/demo-or-map/webpack.config.js+++ b/ui/demo/demo-or-map/webpack.config.js@@ -15,7 +15,8 @@ module.exports = {devtool: 'inline-source-map',devServer: {port: 9000,- contentBase: './dist'+ contentBase: './dist',+ publicPath: "/" + __dirname.split(path.sep).slice(-1)[0] + "/"},plugins: [new HtmlWebpackPlugin({diff --git a/ui/demo/demo-rest/webpack.config.js b/ui/demo/demo-rest/webpack.config.jsindex 57b6a2e91..c0ffbed86 100644--- a/ui/demo/demo-rest/webpack.config.js+++ b/ui/demo/demo-rest/webpack.config.js@@ -47,7 +47,8 @@ module.exports = {devtool: 'inline-source-map',devServer: {port: 9000,- contentBase: './dist'+ contentBase: './dist',+ publicPath: "/" + __dirname.split(path.sep).slice(-1)[0] + "/"},plugins: [new HtmlWebpackPlugin({diff --git a/ui/yarn.lock b/ui/yarn.lockindex 82459365f..7aab589d4 100644--- a/ui/yarn.lock+++ b/ui/yarn.lock@@ -1318,7 +1318,12 @@ acorn-dynamic-import@^3.0.0:dependencies:acorn "^5.0.0"-acorn@^5.0.0, acorn@^5.6.2:+acorn-es7-plugin@^1.1.7:+ version "1.1.7"+ resolved "https://registry.yarnpkg.com/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz#f2ee1f3228a90eead1245f9ab1922eb2e71d336b"+ integrity sha1-8u4fMiipDurRJF+asZIusucdM2s=++"acorn@>= 2.5.2 <= 5.7.3", acorn@^5.0.0, acorn@^5.6.2:version "5.7.3"resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==@@ -2829,6 +2834,14 @@ extglob@^2.0.4:snapdragon "^0.8.1"to-regex "^3.0.1"+fast-async@^6.3.8:+ version "6.3.8"+ resolved "https://registry.yarnpkg.com/fast-async/-/fast-async-6.3.8.tgz#031b9e1d5a84608b117b3e7c999ad477ed2b08a2"+ integrity sha512-TjlooyqrYm/gOXjD2UHNwfrWkvTbzU105Nk4bvcRTeRoL+wIeK6rqbqDg3CN9z5p37cE2iXhP6SxQFz8OVIaUg==+ dependencies:+ nodent-compiler "^3.2.10"+ nodent-runtime ">=3.2.1"+fast-deep-equal@^2.0.1:version "2.0.1"resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"@@ -4394,6 +4407,26 @@ node-releases@^1.1.1:dependencies:semver "^5.3.0"+nodent-compiler@^3.2.10:+ version "3.2.11"+ resolved "https://registry.yarnpkg.com/nodent-compiler/-/nodent-compiler-3.2.11.tgz#8f4bc703d7d8d0e563f5e09ea22efdce04dbaf9b"+ integrity sha512-rfDrGWdgIJYomPUzR8nXiWNuIhJ7cVodPeZP3Ho65LEycuaX2uVNZ0ytpcfrmUKzdFeLRtye9+pHe8OynPZuPQ==+ dependencies:+ acorn ">= 2.5.2 <= 5.7.3"+ acorn-es7-plugin "^1.1.7"+ nodent-transform "^3.2.9"+ source-map "^0.5.7"++nodent-runtime@>=3.2.1:+ version "3.2.1"+ resolved "https://registry.yarnpkg.com/nodent-runtime/-/nodent-runtime-3.2.1.tgz#9e2755d85e39f764288f0d4752ebcfe3e541e00e"+ integrity sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==++nodent-transform@^3.2.9:+ version "3.2.9"+ resolved "https://registry.yarnpkg.com/nodent-transform/-/nodent-transform-3.2.9.tgz#ec11a6116b5476e60bc212371cf6b8e4c74f40b6"+ integrity sha512-4a5FH4WLi+daH/CGD5o/JWRR8W5tlCkd3nrDSkxbOzscJTyTUITltvOJeQjg3HJ1YgEuNyiPhQbvbtRjkQBByQ==+nopt@^4.0.1:version "4.0.1"resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"@@ -5585,7 +5618,7 @@ source-map-url@^0.4.0:resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=-source-map@^0.5.0, source-map@^0.5.6:+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:version "0.5.7"resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=