diff --git a/docs/releasenotes/v02-00-00.md b/docs/releasenotes/v02-00-00.md index 22bc2caa..47919257 100644 --- a/docs/releasenotes/v02-00-00.md +++ b/docs/releasenotes/v02-00-00.md @@ -19,5 +19,8 @@ title: Release Notes v2.0.0 ### RC21 * **2.0.5** [Release notes](docs/releasenotes/v02-00-05.md) +### RC22 +* **2.0.6** [Release notes](docs/releasenotes/v02-00-06.md) + ## Docs Compatibility with Homey 3.0 SDK diff --git a/docs/releasenotes/v02-00-06.md b/docs/releasenotes/v02-00-06.md new file mode 100644 index 00000000..a0fb67b1 --- /dev/null +++ b/docs/releasenotes/v02-00-06.md @@ -0,0 +1,6 @@ +--- +layout: page +title: Release Notes v2.0.6 +--- + +Changed dependency management of socket.io packages and homey-api. \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 965b674e..5adc9a51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "body-scroll-lock": "^2.6.1", "d3": "^5.9.2", "date-fns": "^2.0.0-alpha.21", + "encoding": "^0.1.13", "graceful-fs": "^4.2.3", "homey-api": "^3.0.0-rc.19", "lodash": "^4.17.11", @@ -28,7 +29,6 @@ "react-router-dom": "^5.0.0", "react-scroll-locky": "^1.5.0", "reflect-metadata": "^0.1.13", - "socket.io-client": "^2.5.0", "strongly-typed-events": "^1.4.10", "tslint-react": "^4.0.0", "tsyringe": "^4.0.1", @@ -5478,6 +5478,25 @@ "node": ">= 0.8" } }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -21228,6 +21247,24 @@ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", "dev": true }, + "encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "requires": { + "iconv-lite": "^0.6.2" + }, + "dependencies": { + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + } + } + }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", diff --git a/package.json b/package.json index 3b595844..551fdbad 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "body-scroll-lock": "^2.6.1", "d3": "^5.9.2", "date-fns": "^2.0.0-alpha.21", + "encoding": "^0.1.13", "graceful-fs": "^4.2.3", "homey-api": "^3.0.0-rc.19", "lodash": "^4.17.11", @@ -27,7 +28,6 @@ "react-router-dom": "^5.0.0", "react-scroll-locky": "^1.5.0", "reflect-metadata": "^0.1.13", - "socket.io-client": "^2.5.0", "strongly-typed-events": "^1.4.10", "tslint-react": "^4.0.0", "tsyringe": "^4.0.1", diff --git a/src/app/services/settings-manager/SettingsManagerService.ts b/src/app/services/settings-manager/SettingsManagerService.ts index 6b158a5e..dbf03575 100644 --- a/src/app/services/settings-manager/SettingsManagerService.ts +++ b/src/app/services/settings-manager/SettingsManagerService.ts @@ -38,14 +38,14 @@ export class SettingsManagerService { if (val == null) { val = def; } - this.logger.debug(`Get '${setting}' => '${val}'`); + this.logger.debug(`Get '${setting}' => '${val}' (${typeof(val)})`); return val; } // Catastrophic failure, cannot be handeled here. @trycatchlog() public set(setting: AllSettings, val: T) { - this.logger.debug(`Put '${setting}' <= '${val}'`); + this.logger.debug(`Put '${setting}' <= '${val}' (${typeof(val)})`); // tslint:disable: one-line try { diff --git a/webpack.app.js b/webpack.app.js index 51dc9b41..b3cac886 100644 --- a/webpack.app.js +++ b/webpack.app.js @@ -9,7 +9,7 @@ const distPath = path.resolve('/tmp/homey-heating'); var appConfig = (env, argv) => { const PRODUCTION = argv.mode === 'production' || process.env.FORCE_PRODUCTION == "true"; - console.log('******************* PRODUCTION?', PRODUCTION ); + console.log('******************* PRODUCTION?', PRODUCTION); const package = require("./package.json"); const appPackage = require("./src/app.json"); @@ -95,18 +95,22 @@ var appConfig = (env, argv) => { from: 'node_modules/reflect-metadata/Reflect.js', to: distPath + '/node_modules/reflect-metadata/index.js' }, - { - from: 'node_modules/homey-api', - to: distPath + '/node_modules/homey-api' - }, - { - from: 'node_modules/socket.io-client', - to: distPath + '/node_modules/socket.io-client' - }, - { - from: 'node_modules/regenerator-runtime', - to: distPath + '/node_modules/regenerator-runtime' - }, + // { + // from: 'node_modules/homey-api', + // to: distPath + '/node_modules/homey-api' + // }, + // { + // from: 'node_modules/socket.io-client/dist/socket.io.js', + // to: distPath + '/node_modules/socket.io-client/index.js' + // }, + // { + // from: 'node_modules/socket.io-parser', + // to: distPath + '/node_modules/socket.io-parser' + // }, + // { + // from: 'node_modules/regenerator-runtime', + // to: distPath + '/node_modules/regenerator-runtime' + // }, { from: 'locales/**/*', to: distPath @@ -165,7 +169,7 @@ var appConfig = (env, argv) => { test: /\.tsx?$/, use: 'ts-loader', exclude: /node_modules/ - }, + } ] }, @@ -183,6 +187,8 @@ var appConfig = (env, argv) => { devtool: PRODUCTION ? 'source-map' : "inline-source-map", resolve: { + // node-fetch + mainFields: ["main", "module"], extensions: ['.tsx', '.ts', '.js'], }, @@ -191,7 +197,7 @@ var appConfig = (env, argv) => { "utf-8-validate": "utf-8-validate", "ws": "ws", "homey": "homey", - "homey-api": "homey-api", + // "homey-api": "homey-api", "reflect-metadata": "reflect-metadata", "tsyringe": "tsyringe", "lodash": "lodash", @@ -199,10 +205,15 @@ var appConfig = (env, argv) => { "@app/helper": "@app/helper", "@app/services": "@app/services", "@app/flows": "@app/flows", - "socket.io-client": "socket.io-client", + // "socket.io-client": "socket.io-client", + // "socket.io-parser": "socket.io-parser", "regenerator-runtime": "regenerator-runtime" }, + externalsPresets: { + node: true, + }, + plugins: plugins, output: {