OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade from webpack v4 to v5 (#2267) 

Upgrade webpack and related build dependencies from v4 to v5.
Also upgrade the NodeJS and npm versions used by the Main UI build as well as babel.

The changes follow the recommendations of the webpack migration guide at https://webpack.js.org/migrate/5/ or are required changes for updated webpack plugins.
New default values causing problems have been overwritten, e.g. devServer.compress: false because compression broke the SSE event streams.
The ModuleConcatenationPlugin is not created manually in production mode anymore, as this setting broke the production build, and it is not neccassary to create that, as this plugin is automatically enabled in production mode.
See https://webpack.js.org/plugins/module-concatenation-plugin/.

---------

Also-by: Florian Hotze <florianh_dev@icloud.com>
Signed-off-by: Miguel Álvarez <miguelwork92@gmail.com>
pull/2300/head
GiviMAD 2024-01-30 15:32:56 -08:00 committed by GitHub
parent 424e646297
commit 1c03c60f84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
39 changed files with 11084 additions and 11992 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/mainui.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '12.x' node-version: '18.x'
- name: Cache node modules - name: Cache node modules
id: cache id: cache
@ -52,7 +52,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '12.x' node-version: '18.x'
- name: Cache node modules - name: Cache node modules
id: cache id: cache

9
README.md
View File

@ -56,11 +56,12 @@ You find the following repository structure:
In most cases, you **don't** need a Java development environment for UI development. In most cases, you **don't** need a Java development environment for UI development.
Instead, make sure you have NodeJS 16.14 (HABot: 12.16) or later and npm 8.6 (HABot: 6.14) or later installed. Instead, you need NodeJS and npm installed, you'll learn about the required versions later.
Then identify in the `bundles` directories where the frontend code is - for instance, for the Main UI it is `bundles/org.openhab.ui/web/`.
Then identify in the `bundles` directories where the frontend code is - for instance, for the main UI it is `bundles/org.openhab.ui/web/`. Then follow the instructions in the specific add-on's `CONTRIBUTING.md` file to get started, e.g. install the correct versions of NodeJS and npm.
Then follow the instructions in the specific add-on's `CONTRIBUTING.md` file to get started. In the main UI's case, it is located in [bundles/org.openhab.ui/CONTRIBUTING.md](https://github.com/openhab/openhab-webui/blob/master/bundles/org.openhab.ui/CONTRIBUTING.md). In many cases it will involve executing some `npm` commands to install dependencies and start a development server. For Main UI, it is located in [bundles/org.openhab.ui/CONTRIBUTING.md](https://github.com/openhab/openhab-webui/blob/master/bundles/org.openhab.ui/CONTRIBUTING.md).
In many cases it will involve executing some `npm` commands to install dependencies and start a development server.
However, if you want to compile the final `.jar` add-ons, we have assembled some step-by-step guides for different IDEs on our developer documentation website: However, if you want to compile the final `.jar` add-ons, we have assembled some step-by-step guides for different IDEs on our developer documentation website:

6
bundles/org.openhab.ui.basic/CONTRIBUTING.md
View File

@ -1,6 +1,10 @@
## Contributing ## Contributing
Javascript linting, compressing and LESS compilation is handled through Gulp. Therefore, please run `gulp` instead of changing compressed CSS/JS manually. Default Gulp task will also check the code using ESLint. You need NodeJS 18.17.0 or later and npm 9.8.1 or later installed.
Javascript linting, compressing and LESS compilation is handled through Gulp.
Therefore, please run `gulp` instead of changing compressed CSS/JS manually.
Default Gulp task will also check the code using ESLint.
Installing build dependencies: Installing build dependencies:

3
bundles/org.openhab.ui.habot/CONTRIBUTING.md Normal file
View File

@ -0,0 +1,3 @@
# Contributing to HABot
You need NodeJS 12.16 or later and npm 6.14 or later installed.

6
bundles/org.openhab.ui.habpanel/CONTRIBUTING.md
View File

@ -14,8 +14,10 @@ redirect you, if necessary.
## Build Environment ## Build Environment
It is assumed you have ```npm```, ```bower``` and ```gulp``` available; if not, You need NodeJS 16.14 or later and npm 8.6 or later installed.
check their respective docs.
It is assumed you have `npm`, `bower` and `gulp` available;
if not, check their respective docs.
To build the Javascript part of HABPanel, navigate to the ```web/``` subfolder, then: To build the Javascript part of HABPanel, navigate to the ```web/``` subfolder, then:
1. Run ```npm install``` 1. Run ```npm install```

4
bundles/org.openhab.ui/CONTRIBUTING.md
View File

@ -8,7 +8,9 @@ The repository for web user interfaces, including this project, is located at <h
This project is built using [Vue.js](https://vuejs.org/), [webpack](https://webpack.js.org/) and [Framework7](https://framework7.io). This project is built using [Vue.js](https://vuejs.org/), [webpack](https://webpack.js.org/) and [Framework7](https://framework7.io).
You need Node 16.14.0 or later and npm 8.6.0. Change to the `web` directory, gather the necessary dependencies with `npm install` then the scripts below will be available. You need Node 18.18.0 or later and npm 9.8.1 or later installed.
Change to the `web` directory, gather the necessary dependencies with `npm install` then the scripts below will be available.
## NPM Scripts ## NPM Scripts

4
bundles/org.openhab.ui/pom.xml
View File

@ -37,8 +37,8 @@
<artifactId>frontend-maven-plugin</artifactId> <artifactId>frontend-maven-plugin</artifactId>
<configuration> <configuration>
<nodeVersion>v16.14.2</nodeVersion> <nodeVersion>v18.18.0</nodeVersion>
<npmVersion>8.6.0</npmVersion> <npmVersion>9.8.1</npmVersion>
<workingDirectory>web</workingDirectory> <workingDirectory>web</workingDirectory>
</configuration> </configuration>

2
bundles/org.openhab.ui/web/babel.config.js
View File

@ -24,7 +24,7 @@ module.exports = {
test: { test: {
plugins: [ plugins: [
'@babel/plugin-transform-modules-commonjs', '@babel/plugin-transform-modules-commonjs',
'babel-plugin-dynamic-import-node-babel-7' 'babel-plugin-dynamic-import-node'
], ],
presets: [ presets: [
[ [

145
bundles/org.openhab.ui/web/build/webpack.config.js
View File

@ -1,9 +1,9 @@
const webpack = require('webpack') const webpack = require('webpack')
const CopyWebpackPlugin = require('copy-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin')
const VueLoaderPlugin = require('vue-loader/lib/plugin') const { VueLoaderPlugin } = require('vue-loader')
const MiniCssExtractPlugin = require('mini-css-extract-plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
const TerserPlugin = require('terser-webpack-plugin') const TerserPlugin = require('terser-webpack-plugin')
const WorkboxPlugin = require('workbox-webpack-plugin') const WorkboxPlugin = require('workbox-webpack-plugin')
const WebpackAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin const WebpackAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
@ -12,7 +12,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const path = require('path') const path = require('path')
function resolvePath (dir) { function resolvePath(dir) {
return path.join(__dirname, '..', dir) return path.join(__dirname, '..', dir)
} }
@ -23,6 +23,9 @@ const isCordova = target === 'cordova'
const apiBaseUrl = process.env.OH_APIBASE || 'http://localhost:8080' const apiBaseUrl = process.env.OH_APIBASE || 'http://localhost:8080'
/**
* @type {import('webpack').Configuration}
*/
module.exports = { module.exports = {
mode: env, mode: env,
entry: [ entry: [
@ -30,29 +33,32 @@ module.exports = {
], ],
output: { output: {
path: resolvePath(isCordova ? 'cordova/www' : 'www'), path: resolvePath(isCordova ? 'cordova/www' : 'www'),
filename: 'js/app.[hash].js', filename: 'js/app.[contenthash].js',
publicPath: '/', publicPath: '/',
hotUpdateChunkFilename: 'hot/hot-update.js', hotUpdateChunkFilename: 'hot/[id].[fullhash].hot-update.js',
hotUpdateMainFilename: 'hot/hot-update.json' hotUpdateMainFilename: 'hot/[runtime].hot-update.json'
}, },
resolve: { resolve: {
fallback: {
"crypto": require.resolve("crypto-browserify"),
"stream": require.resolve("stream-browserify"),
"path": require.resolve("path-browserify"),
},
extensions: ['.mjs', '.js', '.vue', '.json'], extensions: ['.mjs', '.js', '.vue', '.json'],
alias: { alias: {
vue$: 'vue/dist/vue.esm.js', vue$: 'vue/dist/vue.esm.js',
'@': resolvePath('src') '@': resolvePath('src')
} }
}, },
devtool: env === 'production' ? (buildSourceMaps) ? 'source-map' : 'none' : 'eval-source-map', devtool: env === 'production' ? (buildSourceMaps ? 'source-map' : false) : 'eval-source-map',
devServer: { devServer: {
hot: true, hot: true,
// open: true, compress: false, // disable compression as this seems to break the SSE event stream
// compress: true, static: [
contentBase: '/www/', path.resolve(__dirname, 'www'),
disableHostCheck: true, ],
allowedHosts: "all",
historyApiFallback: true, historyApiFallback: true,
// watchOptions: {
// poll: 1000,
// },
proxy: [{ proxy: [{
context: ['/auth', '/rest', '/chart', '/proxy', '/icon', '/static', '/changePassword', '/createApiToken', '/audio'], context: ['/auth', '/rest', '/chart', '/proxy', '/icon', '/static', '/changePassword', '/createApiToken', '/audio'],
target: apiBaseUrl target: apiBaseUrl
@ -63,9 +69,22 @@ module.exports = {
maxEntrypointSize: 2500000 maxEntrypointSize: 2500000
}, },
optimization: { optimization: {
minimizer: [new TerserPlugin({ moduleIds: env === 'production' ? undefined : 'named',
sourceMap: true minimizer: [
})] new TerserPlugin({
terserOptions: {
sourceMap: true
}
}),
new CssMinimizerPlugin({
minimizerOptions: {
processorOptions: {
safe: true,
map: { inline: false, annotation: env !== 'production' }
},
},
}),
]
}, },
module: { module: {
rules: [ rules: [
@ -87,11 +106,6 @@ module.exports = {
resolvePath('node_modules/ssr-window') resolvePath('node_modules/ssr-window')
] ]
}, },
{
test: /(blockly\/.*\.js)$/,
enforce: "pre",
use: (buildSourceMaps) ? ["source-map-loader"] : [],
},
{ {
test: /\.vue$/, test: /\.vue$/,
use: 'vue-loader' use: 'vue-loader'
@ -153,26 +167,38 @@ module.exports = {
}, },
{ {
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
loader: 'url-loader', type: 'asset',
options: { parser: {
limit: 10000, dataUrlCondition: {
name: 'images/[name].[ext]' maxSize: 10000
}
},
generator: {
filename: 'images/[name].[ext]'
} }
}, },
{ {
test: /\.(mp4|webm|ogg|mp3|wav|flac|aac|m4a)(\?.*)?$/, test: /\.(mp4|webm|ogg|mp3|wav|flac|aac|m4a)(\?.*)?$/,
loader: 'url-loader', type: 'asset',
options: { parser: {
limit: 10000, dataUrlCondition: {
name: 'media/[name].[ext]' maxSize: 10000
}
},
generator: {
filename: 'media/[name].[ext]'
} }
}, },
{ {
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
loader: 'url-loader', type: 'asset',
options: { parser: {
limit: 10000, dataUrlCondition: {
name: 'fonts/[name].[ext]' maxSize: 10000
}
},
generator: {
filename: 'fonts/[name].[ext]'
} }
}, },
{ {
@ -185,6 +211,9 @@ module.exports = {
] ]
}, },
plugins: [ plugins: [
new webpack.ProvidePlugin({
process: 'process/browser.js',
}),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify(env), 'process.env.NODE_ENV': JSON.stringify(env),
'process.env.TARGET': JSON.stringify(target) 'process.env.TARGET': JSON.stringify(target)
@ -193,18 +222,9 @@ module.exports = {
...(env === 'production' ? [ ...(env === 'production' ? [
new ESLintPlugin({ new ESLintPlugin({
extensions: ['js', 'vue'] extensions: ['js', 'vue']
}), })
new OptimizeCSSPlugin({
cssProcessorOptions: {
safe: true,
map: { inline: false }
}
}),
new webpack.optimize.ModuleConcatenationPlugin()
] : [ ] : [
// Development only plugins // Development only plugins
new webpack.HotModuleReplacementPlugin(),
new webpack.NamedModulesPlugin()
]), ]),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
filename: './index.html', filename: './index.html',
@ -220,25 +240,28 @@ module.exports = {
} : false } : false
}), }),
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
filename: 'css/app.[hash].css' filename: 'css/app.[contenthash].css'
}), }),
new CopyWebpackPlugin([ new CopyWebpackPlugin({
{ patterns: [
from: resolvePath('src/res'), {
to: resolvePath(isCordova ? 'cordova/www/res' : 'www/res') from: resolvePath('src/res'),
}, to: resolvePath(isCordova ? 'cordova/www/res' : 'www/res')
{ },
from: resolvePath('src/manifest.json'), {
to: resolvePath('www/manifest.json') from: resolvePath('src/manifest.json'),
}, to: resolvePath('www/manifest.json')
{ },
from: resolvePath('src/robots.txt'), {
to: resolvePath('www/robots.txt') from: resolvePath('src/robots.txt'),
} to: resolvePath('www/robots.txt')
]), }
...(!isCordova ? [ ]
}),
...(!isCordova && env === 'production' ? [
new WorkboxPlugin.InjectManifest({ new WorkboxPlugin.InjectManifest({
swSrc: resolvePath('src/service-worker.js') swSrc: resolvePath('src/service-worker.js'),
maximumFileSizeToCacheInBytes: 100000000,
}) })
] : []), ] : []),
...(env === 'production' ? [ ...(env === 'production' ? [

22698
bundles/org.openhab.ui/web/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

66
bundles/org.openhab.ui/web/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "openhab", "name": "openhab",
"version": "4.0.0", "version": "4.2.0",
"description": "openHAB", "description": "openHAB",
"repository": "https://github.com/openhab/openhab-webui", "repository": "https://github.com/openhab/openhab-webui",
"license": "EPL-2.0", "license": "EPL-2.0",
@ -74,6 +74,7 @@
"@jsep-plugin/template": "^1.0.2", "@jsep-plugin/template": "^1.0.2",
"blockly": "^9.2.0", "blockly": "^9.2.0",
"cronstrue": "^1.100.0", "cronstrue": "^1.100.0",
"crypto-browserify": "^3.12.0",
"dayjs": "^1.9.6", "dayjs": "^1.9.6",
"dom7": "^2.1.5", "dom7": "^2.1.5",
"echarts": "^5.1.2", "echarts": "^5.1.2",
@ -89,10 +90,12 @@
"lodash": "^4.17.20", "lodash": "^4.17.20",
"moo": "^0.5.1", "moo": "^0.5.1",
"nearley": "^2.19.6", "nearley": "^2.19.6",
"path-browserify": "^1.0.1",
"pkce-challenge": "^2.1.0", "pkce-challenge": "^2.1.0",
"qrcode": "^1.0.0", "qrcode": "^1.0.0",
"scope-css": "^1.2.1", "scope-css": "^1.2.1",
"sprintf-js": "^1.1.2", "sprintf-js": "^1.1.2",
"stream-browserify": "^3.0.0",
"template7": "^1.4.2", "template7": "^1.4.2",
"tern": "^0.23.0", "tern": "^0.23.0",
"v-clipboard": "^2.2.3", "v-clipboard": "^2.2.3",
@ -112,35 +115,35 @@
"vue2-leaflet": "^2.5.2", "vue2-leaflet": "^2.5.2",
"vuetrend": "^0.3.4", "vuetrend": "^0.3.4",
"vuex": "^3.5.1", "vuex": "^3.5.1",
"yaml": "^1.10.0" "yaml": "^2.3.4"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.11.6", "@babel/core": "^7.23.7",
"@babel/eslint-parser": "^7.12.13", "@babel/eslint-parser": "^7.23.3",
"@babel/eslint-plugin": "^7.12.13", "@babel/eslint-plugin": "^7.23.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-jsx": "^7.10.4", "@babel/plugin-syntax-jsx": "^7.23.3",
"@babel/plugin-transform-modules-commonjs": "^7.10.4", "@babel/plugin-transform-modules-commonjs": "^7.23.3",
"@babel/plugin-transform-runtime": "^7.11.5", "@babel/plugin-transform-runtime": "^7.23.7",
"@babel/preset-env": "^7.11.5", "@babel/preset-env": "^7.23.8",
"@babel/runtime": "^7.11.2", "@babel/runtime": "^7.23.8",
"@iconify/vue2": "^1.0.0", "@iconify/vue2": "^1.0.0",
"@types/jest": "^24.9.1", "@types/jest": "^24.9.1",
"@types/marked": "^4.0.8", "@types/marked": "^4.0.8",
"@vue/eslint-config-standard": "^6.0.0", "@vue/eslint-config-standard": "^6.0.0",
"@vue/test-utils": "^1.0.5", "@vue/test-utils": "^1.0.5",
"babel-core": "7.0.0-bridge.0",
"babel-helper-vue-jsx-merge-props": "^2.0.3", "babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-jest": "^24.9.0", "babel-jest": "^24.9.0",
"babel-loader": "^8.1.0", "babel-loader": "^9.1.3",
"babel-plugin-dynamic-import-node-babel-7": "^2.0.7", "babel-plugin-dynamic-import-node": "^2.3.3",
"babel-plugin-transform-vue-jsx": "^4.0.1", "babel-plugin-transform-vue-jsx": "^4.0.1",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"chokidar": "^3.5.3", "chokidar": "^3.5.3",
"compression-webpack-plugin": "^6.0.3", "compression-webpack-plugin": "^11.0.0",
"copy-webpack-plugin": "^4.6.0", "copy-webpack-plugin": "^12.0.2",
"cross-env": "^5.2.1", "cross-env": "^5.2.1",
"css-loader": "^2.1.1", "css-loader": "^6.9.0",
"css-minimizer-webpack-plugin": "^6.0.0",
"cypress": "^3.8.3", "cypress": "^3.8.3",
"diacritic": "0.0.2", "diacritic": "0.0.2",
"eslint": "^7.19.0", "eslint": "^7.19.0",
@ -150,41 +153,38 @@
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-vue": "^7.5.0", "eslint-plugin-vue": "^7.5.0",
"eslint-webpack-plugin": "^2.5.0", "eslint-webpack-plugin": "^2.5.0",
"file-loader": "^3.0.1",
"global-prefix": "^3.0.0", "global-prefix": "^3.0.0",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^5.6.0",
"jest": "^24.9.0", "jest": "^24.9.0",
"jest-serializer-vue": "^2.0.2", "jest-serializer-vue": "^2.0.2",
"jest-transform-nearley": "^2.0.0", "jest-transform-nearley": "^2.0.0",
"jest-transform-stub": "^2.0.0", "jest-transform-stub": "^2.0.0",
"jest-vue-preprocessor": "^1.7.1", "jest-vue-preprocessor": "^1.7.1",
"marked": "^4.2.12", "marked": "^4.2.12",
"mini-css-extract-plugin": "^0.5.0", "mini-css-extract-plugin": "^2.7.7",
"nearley-loader": "^2.0.0", "nearley-loader": "^2.0.0",
"optimize-css-assets-webpack-plugin": "^5.0.4",
"ora": "^3.4.0", "ora": "^3.4.0",
"postcss-loader": "^3.0.0", "postcss-loader": "^7.3.4",
"postcss-preset-env": "^6.7.0", "postcss-preset-env": "^6.7.0",
"process": "^0.11.10",
"resolve-dir": "^1.0.1", "resolve-dir": "^1.0.1",
"rimraf": "^2.7.1", "rimraf": "^2.7.1",
"source-map-loader": "^1.1.3",
"standard": "^12.0.1", "standard": "^12.0.1",
"strip-ansi": "=3.0.1", "strip-ansi": "=3.0.1",
"style-loader": "^0.23.1", "style-loader": "^3.3.4",
"stylus": "^0.54.8", "stylus": "^0.62.0",
"stylus-loader": "^3.0.2", "stylus-loader": "^7.1.3",
"swagger-ui-dist": "^4.1.3", "swagger-ui-dist": "^4.1.3",
"url-loader": "^1.1.2",
"vue-jest": "^3.0.7", "vue-jest": "^3.0.7",
"vue-loader": "^15.9.3", "vue-loader": "^15.10.0",
"vue-masonry-css": "^1.0.3", "vue-masonry-css": "^1.0.3",
"vue-style-loader": "^4.1.2", "vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.12", "vue-template-compiler": "^2.6.12",
"webpack": "^4.46.0", "webpack": "^5.89.0",
"webpack-bundle-analyzer": "^4.6.1", "webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^3.3.12", "webpack-cli": "^5.1.4",
"webpack-dev-server": "^3.11.0", "webpack-dev-server": "^4.15.1",
"webpack-stats-plugin": "^0.2.1", "webpack-stats-plugin": "^1.1.3",
"workbox-webpack-plugin": "^3.6.3" "workbox-webpack-plugin": "^7.0.0"
} }
} }

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/_tmp/blocks-exec.js
View File

@ -1,5 +1,5 @@
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { FieldItemModelPicker } from './ohitemfield' import { FieldItemModelPicker } from './ohitemfield'
export default function defineOHBlocks_Exec (f7) { export default function defineOHBlocks_Exec (f7) {

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/_tmp/blocks-http.js
View File

@ -1,5 +1,5 @@
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { FieldItemModelPicker } from './ohitemfield' import { FieldItemModelPicker } from './ohitemfield'
export default function defineOHBlocks_HTTP (f7, scripts) { export default function defineOHBlocks_HTTP (f7, scripts) {

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-audio.js
View File

@ -11,7 +11,7 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { FieldSlider } from '@blockly/field-slider' import { FieldSlider } from '@blockly/field-slider'
export default function (f7, isGraalJs, sinks, voices) { export default function (f7, isGraalJs, sinks, voices) {

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-color.js
View File

@ -4,7 +4,7 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { blockGetCheckedInputType } from '@/assets/definitions/blockly/utils.js' import { blockGetCheckedInputType } from '@/assets/definitions/blockly/utils.js'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {

6
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dateoffsets.js
View File

@ -2,9 +2,9 @@
* supports jsscripting * supports jsscripting
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { FieldDatePicker } from './fields/date-field' import { FieldDatePicker } from './fields/date-field.js'
import { addDateSupport, addDateComparisonSupportNashorn, addDateComparisonSupportGraalVM, addGetZdtComponent, addChrono } from './utils' import { addDateSupport, addDateComparisonSupportNashorn, addDateComparisonSupportGraalVM, addGetZdtComponent, addChrono } from './utils.js'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {
/* /*

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dicts.js
View File

@ -3,7 +3,7 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {
Blockly.Blocks['dicts_create_with'] = { Blockly.Blocks['dicts_create_with'] = {

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-ephemeris.js
View File

@ -7,7 +7,7 @@
* supports jsscripting * supports jsscripting
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {
/* /*

4
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-eventbus.js
View File

@ -4,8 +4,8 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { blockGetCheckedInputType } from './utils' import { blockGetCheckedInputType } from './utils.js'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {
/* /*

8
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-items.js
View File

@ -4,11 +4,11 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { FieldItemModelPicker } from './fields/item-field' import { FieldItemModelPicker } from './fields/item-field.js'
import { FieldThingPicker } from './fields/thing-field' import { blockGetCheckedInputType } from './utils.js'
import api from '@/js/openhab/api' import api from '@/js/openhab/api'
import { blockGetCheckedInputType } from './utils'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {
/* Helper block to allow selecting an item */ /* Helper block to allow selecting an item */

3
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-list.js
View File

@ -3,7 +3,8 @@
* supports jsscripting * supports jsscripting
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {
/* /*
* allows to concatenate a list into a new list * allows to concatenate a list into a new list

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-logging.js
View File

@ -4,7 +4,7 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {
Blockly.Blocks['oh_print'] = { Blockly.Blocks['oh_print'] = {

4
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-math.js
View File

@ -3,8 +3,8 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { blockGetCheckedInputType } from './utils' import { blockGetCheckedInputType } from './utils.js'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {
Blockly.Blocks['oh_toNumber'] = { Blockly.Blocks['oh_toNumber'] = {

4
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-metadata.js
View File

@ -4,8 +4,8 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { addGetItemMetaConfigValue } from './utils' import { addGetItemMetaConfigValue } from './utils.js'
const unavailMsg = 'Metadata blocks aren\'t supported in "application/javascript;version=ECMAScript-5.1"' const unavailMsg = 'Metadata blocks aren\'t supported in "application/javascript;version=ECMAScript-5.1"'

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-notifications.js
View File

@ -4,7 +4,7 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
// TODO: Add options to set icon and level (argument order should be the same as for broadcast notification etc.) // TODO: Add options to set icon and level (argument order should be the same as for broadcast notification etc.)
export default function defineOHBlocks_Notifications (f7, isGraalJs) { export default function defineOHBlocks_Notifications (f7, isGraalJs) {

4
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-persistence.js
View File

@ -3,8 +3,8 @@
* supports jsscripting * supports jsscripting
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { addDateSupport, blockGetCheckedInputType } from './utils' import { addDateSupport, blockGetCheckedInputType } from './utils.js'
export default function defineOHBlocks_Persistence (f7, isGraalJs, persistenceServices) { export default function defineOHBlocks_Persistence (f7, isGraalJs, persistenceServices) {
/* /*

4
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-scripts.js
View File

@ -6,8 +6,8 @@
* supports jsscripting * supports jsscripting
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { addOSGiService } from './utils' import { addOSGiService } from './utils.js'
export default function defineOHBlocks_Scripts (f7, isGraalJs, scripts) { export default function defineOHBlocks_Scripts (f7, isGraalJs, scripts) {
/* /*

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-text.js
View File

@ -4,7 +4,7 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
export default function (f7, isGraalJs) { export default function (f7, isGraalJs) {
/* /*

5
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-things.js
View File

@ -4,9 +4,8 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { FieldItemModelPicker } from './fields/item-field' import { FieldThingPicker } from './fields/thing-field.js'
import { FieldThingPicker } from './fields/thing-field'
export default function defineOHBlocks (f7, isGraalJs) { export default function defineOHBlocks (f7, isGraalJs) {
Blockly.Blocks['oh_thing'] = { Blockly.Blocks['oh_thing'] = {

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-timers.js
View File

@ -4,7 +4,7 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
export default function defineOHBlocks_Timers (f7, isGraalJs) { export default function defineOHBlocks_Timers (f7, isGraalJs) {
/* /*

4
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-uom.js
View File

@ -4,8 +4,8 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { blockGetCheckedInputType } from './utils' import { blockGetCheckedInputType } from './utils.js'
const unavailMsg = 'Units of Measurements blocks aren\'t supported in "application/javascript;version=ECMAScript-5.1"' const unavailMsg = 'Units of Measurements blocks aren\'t supported in "application/javascript;version=ECMAScript-5.1"'

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-valuestorage.js
View File

@ -5,7 +5,7 @@
*/ */
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
export default function defineOHBlocks_Variables (f7, isGraalJs) { export default function defineOHBlocks_Variables (f7, isGraalJs) {
Blockly.Blocks['oh_store_value'] = { Blockly.Blocks['oh_store_value'] = {

40
bundles/org.openhab.ui/web/src/assets/definitions/blockly/index.js
View File

@ -1,24 +1,24 @@
import defineDictionaryBlocks from './blocks-dicts' import defineDictionaryBlocks from './blocks-dicts.js'
import defineDateOffsetsBlocks from './blocks-dateoffsets' import defineDateOffsetsBlocks from './blocks-dateoffsets.js'
import defineItemBlocks from './blocks-items' import defineItemBlocks from './blocks-items.js'
import defineThingsBlocks from './blocks-things' import defineThingsBlocks from './blocks-things.js'
import defineAudioBlocks from './blocks-audio' import defineAudioBlocks from './blocks-audio.js'
import defineEventBusBlocks from './blocks-eventbus' import defineEventBusBlocks from './blocks-eventbus.js'
import defineLoggingBlocks from './blocks-logging' import defineLoggingBlocks from './blocks-logging.js'
import defineNotificationBlocks from './blocks-notifications' import defineNotificationBlocks from './blocks-notifications.js'
import defineTimerBlocks from './blocks-timers' import defineTimerBlocks from './blocks-timers.js'
import defineValueStorageBlocks from './blocks-valuestorage' import defineValueStorageBlocks from './blocks-valuestorage.js'
import defineEphemerisBlocks from './blocks-ephemeris' import defineEphemerisBlocks from './blocks-ephemeris.js'
import defineScriptsBlocks from './blocks-scripts' import defineScriptsBlocks from './blocks-scripts.js'
import definePersistenceBlocks from './blocks-persistence' import definePersistenceBlocks from './blocks-persistence.js'
import defineColorBlocks from './blocks-color' import defineColorBlocks from './blocks-color.js'
import defineTextBlocks from './blocks-text' import defineTextBlocks from './blocks-text.js'
import defineListBlocks from './blocks-list' import defineListBlocks from './blocks-list.js'
import defineUomBlocks from './blocks-uom' import defineUomBlocks from './blocks-uom.js'
import defineMetaBlocks from './blocks-metadata' import defineMetaBlocks from './blocks-metadata.js'
import defineMathBlocks from './blocks-math' import defineMathBlocks from './blocks-math.js'
import { defineLibraries } from './libraries' import { defineLibraries } from './libraries.js'
import Blockly from 'blockly' import Blockly from 'blockly'

4
bundles/org.openhab.ui/web/src/assets/definitions/blockly/libraries.js
View File

@ -1,6 +1,6 @@
import Blockly from 'blockly' import Blockly from 'blockly'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import { addOSGiService } from './utils' import { addOSGiService } from './utils.js'
const generateCodeForBlock = (block) => { const generateCodeForBlock = (block) => {
const blockTypeId = block.openhab.blockTypeId const blockTypeId = block.openhab.blockTypeId

2
bundles/org.openhab.ui/web/src/assets/definitions/blockly/utils.js
View File

@ -1,4 +1,4 @@
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
/* /*
* Function allowing to call classes within the OSGi container * Function allowing to call classes within the OSGi container

2
bundles/org.openhab.ui/web/src/components/config/controls/blockly-editor.vue
View File

@ -1086,7 +1086,7 @@
<script> <script>
import Blockly from 'blockly' import Blockly from 'blockly'
import { WorkspaceSearch } from '@blockly/plugin-workspace-search' import { WorkspaceSearch } from '@blockly/plugin-workspace-search'
import { javascriptGenerator } from 'blockly/javascript' import { javascriptGenerator } from 'blockly/javascript.js'
import DarkTheme from '@blockly/theme-dark' import DarkTheme from '@blockly/theme-dark'
import { CrossTabCopyPaste } from '@blockly/plugin-cross-tab-copy-paste' import { CrossTabCopyPaste } from '@blockly/plugin-cross-tab-copy-paste'
import { ZoomToFitControl } from '@blockly/zoom-to-fit' import { ZoomToFitControl } from '@blockly/zoom-to-fit'

6
bundles/org.openhab.ui/web/src/pages/developer/blocks/blocks-edit.vue
View File

@ -101,15 +101,13 @@
</style> </style>
<script> <script>
import YAML from 'yaml' import YAML, { Schema } from 'yaml'
import { strOptions } from 'yaml/types'
import BlocklyEditor from '@/components/config/controls/blockly-editor.vue' import BlocklyEditor from '@/components/config/controls/blockly-editor.vue'
import BlockPreview from './block-preview.vue' import BlockPreview from './block-preview.vue'
import ConfigSheet from '@/components/config/config-sheet.vue'
import DirtyMixin from '@/pages/settings/dirty-mixin' import DirtyMixin from '@/pages/settings/dirty-mixin'
strOptions.fold.lineWidth = 0 Schema.toStringDefaults.lineWidth = 0
export default { export default {
mixins: [DirtyMixin], mixins: [DirtyMixin],

5
bundles/org.openhab.ui/web/src/pages/developer/widgets/widget-edit.vue
View File

@ -100,15 +100,14 @@
</style> </style>
<script> <script>
import YAML from 'yaml' import YAML, { Schema } from 'yaml'
import { strOptions } from 'yaml/types'
import ConfigSheet from '@/components/config/config-sheet.vue' import ConfigSheet from '@/components/config/config-sheet.vue'
import DirtyMixin from '@/pages/settings/dirty-mixin' import DirtyMixin from '@/pages/settings/dirty-mixin'
import * as StandardListWidgets from '@/components/widgets/standard/list' import * as StandardListWidgets from '@/components/widgets/standard/list'
strOptions.fold.lineWidth = 0 Schema.toStringDefaults.lineWidth = 0
export default { export default {
mixins: [DirtyMixin], mixins: [DirtyMixin],

2
bundles/org.openhab.ui/web/src/service-worker.js
View File

@ -1,3 +1,3 @@
// manifest import and workbox imports will be autogenerated by webpack // manifest import and workbox imports will be autogenerated by webpack
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
workbox.precaching.precacheAndRoute(self.__precacheManifest || []) workbox.precaching.precacheAndRoute(self.__WB_MANIFEST)