From d161a586357d2fdb3f05ff453743a9c39491bacc Mon Sep 17 00:00:00 2001 From: AlCalzone Date: Fri, 13 Sep 2024 21:24:53 +0200 Subject: [PATCH] Remove deprecated `title` and `main` fields from `io-package.json` (#1115) --- CHANGELOG.md | 1 + templates/io-package.json.ts | 3 --- .../io-package.json | 2 -- test/baselines/adapter_JS_React/io-package.json | 2 -- .../adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/io-package.json | 2 -- test/baselines/adapter_TS_React/io-package.json | 2 -- test/baselines/connectionIndicator_yes/io-package.json | 2 -- test/baselines/connectionType/io-package.json | 2 -- test/baselines/customAdapterSettings/io-package.json | 2 -- test/baselines/description_empty_1/io-package.json | 2 -- test/baselines/description_empty_2/io-package.json | 2 -- test/baselines/description_valid/io-package.json | 2 -- test/baselines/keywords/io-package.json | 2 -- test/baselines/no_config/io-package.json | 2 -- test/baselines/startMode_schedule/io-package.json | 2 -- test/baselines/type_storage/io-package.json | 2 -- test/baselines/type_visualization-icons/io-package.json | 2 -- test/baselines/vis_Widget/io-package.json | 2 -- 18 files changed, 1 insertion(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2719fe9d..898ca175 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ (at the beginning of a new line) --> ## __WORK IN PROGRESS__ +* (AlCalzone) Remove deprecated `main` and `title` fields from `io-package.json` (#1115) * (AlCalzone) Remove deprecated license field from `io-package.json` (#1114) * (AlCalzone) Add Node.js 22 as a supported version, set 20 as the default choice (#1112) * (AlCalzone) Update CI workflows for the adapter creator (#1111) diff --git a/templates/io-package.json.ts b/templates/io-package.json.ts index d104520e..65ce30d0 100644 --- a/templates/io-package.json.ts +++ b/templates/io-package.json.ts @@ -9,7 +9,6 @@ export = (async answers => { const isAdapter = answers.features.indexOf("adapter") > -1; const isWidget = answers.features.indexOf("vis") > -1; - const useTypeScript = answers.language === "TypeScript"; const useJsonConfig = answers.adminUi === "json"; const useAdminReact = answers.adminUi === "react"; const useTabReact = answers.tabReact === "yes"; @@ -80,7 +79,6 @@ export = (async answers => { "zh-cn": "首次出版" } }, - "title": "${title}", "titleLang": ${titleLang}, "desc": ${descriptionLang}, "authors": [ @@ -89,7 +87,6 @@ export = (async answers => { "keywords": ${JSON.stringify(answers.keywords || getDefaultAnswer("keywords"))}, "licenseInformation": ${JSON.stringify(licenseInformation)}, "platform": "Javascript/Node.js", - "main": "${useTypeScript ? "build/" : ""}main.js", "icon": "${getIconName(answers)}", "enabled": true, "extIcon": "https://raw.githubusercontent.com/${answers.authorGithub}/ioBroker.${answers.adapterName}/${defaultBranch}/admin/${getIconName(answers)}", diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/io-package.json b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/io-package.json index 6adeddfc..1d4c5046 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/io-package.json +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "Apache-2.0" }, "platform": "Javascript/Node.js", - "main": "main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/adapter_JS_React/io-package.json b/test/baselines/adapter_JS_React/io-package.json index ca787b36..2d55d942 100644 --- a/test/baselines/adapter_JS_React/io-package.json +++ b/test/baselines/adapter_JS_React/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/io-package.json b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/io-package.json index 4694337b..9ed1d8e5 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/io-package.json +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/adapter_TS_React/io-package.json b/test/baselines/adapter_TS_React/io-package.json index 67466861..2d55d942 100644 --- a/test/baselines/adapter_TS_React/io-package.json +++ b/test/baselines/adapter_TS_React/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/connectionIndicator_yes/io-package.json b/test/baselines/connectionIndicator_yes/io-package.json index ea675005..124c7992 100644 --- a/test/baselines/connectionIndicator_yes/io-package.json +++ b/test/baselines/connectionIndicator_yes/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/connectionType/io-package.json b/test/baselines/connectionType/io-package.json index 7aa0f854..a4638bdc 100644 --- a/test/baselines/connectionType/io-package.json +++ b/test/baselines/connectionType/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/customAdapterSettings/io-package.json b/test/baselines/customAdapterSettings/io-package.json index 27e6ff47..6a0b8f3a 100644 --- a/test/baselines/customAdapterSettings/io-package.json +++ b/test/baselines/customAdapterSettings/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/description_empty_1/io-package.json b/test/baselines/description_empty_1/io-package.json index 1ab38771..7182ae9a 100644 --- a/test/baselines/description_empty_1/io-package.json +++ b/test/baselines/description_empty_1/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/description_empty_2/io-package.json b/test/baselines/description_empty_2/io-package.json index 1ab38771..7182ae9a 100644 --- a/test/baselines/description_empty_2/io-package.json +++ b/test/baselines/description_empty_2/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/description_valid/io-package.json b/test/baselines/description_valid/io-package.json index 03d943b7..1e9c8462 100644 --- a/test/baselines/description_valid/io-package.json +++ b/test/baselines/description_valid/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/keywords/io-package.json b/test/baselines/keywords/io-package.json index d0cddd8d..77f5e874 100644 --- a/test/baselines/keywords/io-package.json +++ b/test/baselines/keywords/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -59,7 +58,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/no_config/io-package.json b/test/baselines/no_config/io-package.json index 2e8ad111..903a5d1f 100644 --- a/test/baselines/no_config/io-package.json +++ b/test/baselines/no_config/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/startMode_schedule/io-package.json b/test/baselines/startMode_schedule/io-package.json index 341d6288..cb6d51cc 100644 --- a/test/baselines/startMode_schedule/io-package.json +++ b/test/baselines/startMode_schedule/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/type_storage/io-package.json b/test/baselines/type_storage/io-package.json index d85b3459..5e8ec9b9 100644 --- a/test/baselines/type_storage/io-package.json +++ b/test/baselines/type_storage/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/type_visualization-icons/io-package.json b/test/baselines/type_visualization-icons/io-package.json index b5260102..5192c666 100644 --- a/test/baselines/type_visualization-icons/io-package.json +++ b/test/baselines/type_visualization-icons/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "build/main.js", "icon": "test-adapter.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", diff --git a/test/baselines/vis_Widget/io-package.json b/test/baselines/vis_Widget/io-package.json index 7600bfaa..6e0de196 100644 --- a/test/baselines/vis_Widget/io-package.json +++ b/test/baselines/vis_Widget/io-package.json @@ -17,7 +17,6 @@ "zh-cn": "首次出版" } }, - "title": "Is used to test the creator", "titleLang": { "en": "Is used to test the creator", "de": "Mock translation of 'Is used to test the creator' to 'de'", @@ -58,7 +57,6 @@ "license": "MIT" }, "platform": "Javascript/Node.js", - "main": "main.js", "icon": "test-widget.png", "enabled": true, "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-widget/main/admin/test-widget.png",