Skip to content

Commit

Permalink
Changed dependency management of socket.io packages and homey-api.
Browse files Browse the repository at this point in the history
  • Loading branch information
Markus Kling committed May 1, 2023
1 parent bab6ab9 commit 55c38c2
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 20 deletions.
3 changes: 3 additions & 0 deletions docs/releasenotes/v02-00-00.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions docs/releasenotes/v02-00-06.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
layout: page
title: Release Notes v2.0.6
---

Changed dependency management of socket.io packages and homey-api.
39 changes: 38 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/app/services/settings-manager/SettingsManagerService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<T extends AllowedSetting>(setting: AllSettings, val: T) {
this.logger.debug(`Put '${setting}' <= '${val}'`);
this.logger.debug(`Put '${setting}' <= '${val}' (${typeof(val)})`);

// tslint:disable: one-line
try {
Expand Down
43 changes: 27 additions & 16 deletions webpack.app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -165,7 +169,7 @@ var appConfig = (env, argv) => {
test: /\.tsx?$/,
use: 'ts-loader',
exclude: /node_modules/
},
}
]
},

Expand All @@ -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'],
},

Expand All @@ -191,18 +197,23 @@ 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",
"@app/model": "@app/model",
"@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: {
Expand Down

0 comments on commit 55c38c2

Please sign in to comment.