add json5 files to admin filelist (#1029)

Co-authored-by: AlCalzone <[email protected]>
ioBroker · Apr 14, 2023 · 41bb054 · 41bb054
1 parent 2a69e35
commit 41bb054
Show file tree

Hide file tree

Showing 35 changed files with 108 additions and 107 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,9 @@
 	(at the beginning of a new line )
 -->
 ## __WORK IN PROGRESS__
-* (xXBJXx) Add Ukranian translation [Migration guide](docs/updates/20221202_add_uk_translation.md)
-* (jpawlowski) Fix: Update JSON schema reference for `io-package.json` · [Migration guide](docs/updates/20221208_update_io-packages_json_schema_ref.md)
+* (xXBJXx) Ukranian translation has been added [Migration guide](docs/updates/20221202_add_uk_translation.md)
+* (jpawlowski) Fix: JSON schema reference for `io-package.json` has been updated· [Migration guide](docs/updates/20221208_update_io-packages_json_schema_ref.md)
+* (McM57) Fix: include json5 files from admin directory in npm package (#1029)
 
 ## 2.3.0 (2022-09-25)
 * (mcm1957) Fix: use `adapter.` instead of `this.` in `main.js` in legacy mode (#972)

diff --git a/templates/package.json.ts b/templates/package.json.ts
@@ -135,7 +135,7 @@ const templateFunction: TemplateFunction = async answers => {
 			// Web files in the admin root and all subdirectories except src/
 			"admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
 			// JSON files, but not tsconfig.*.json or .eslintrc.json
-			"admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).json"
+			"admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}"
 		] : []),
 		...(isAdapter && useReact ? ["admin/build/"] : []),
 		...(isWidget ? [

diff --git a/test/baselines/ReleaseScript_JS/README.md b/test/baselines/ReleaseScript_JS/README.md
@@ -116,7 +116,7 @@ For later updates, the above procedure is not necessary. Just do the following:
 ## License
 MIT License
 
-Copyright (c) 2022 Al Calzone <[email protected]>
+Copyright (c) 2023 Al Calzone <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/test/baselines/ReleaseScript_JS/package.json b/test/baselines/ReleaseScript_JS/package.json
@@ -22,7 +22,7 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7"
+    "@iobroker/adapter-core": "^2.6.8"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.5.9",
@@ -33,15 +33,15 @@
     "@iobroker/testing": "^4.1.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.29.0",
+    "eslint": "^8.38.0",
     "mocha": "^9.2.2",
     "proxyquire": "^2.1.3",
     "sinon-chai": "^3.7.0",
     "sinon": "^13.0.2"
   },
   "main": "main.js",
   "files": [
-    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).json",
+    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
     "lib/",
     "www/",

diff --git a/test/baselines/ReleaseScript_TS/README.md b/test/baselines/ReleaseScript_TS/README.md
@@ -124,7 +124,7 @@ For later updates, the above procedure is not necessary. Just do the following:
 ## License
 MIT License
 
-Copyright (c) 2022 Al Calzone <[email protected]>
+Copyright (c) 2023 Al Calzone <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/test/baselines/ReleaseScript_TS/package.json b/test/baselines/ReleaseScript_TS/package.json
@@ -22,7 +22,7 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7"
+    "@iobroker/adapter-core": "^2.6.8"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.5.9",
@@ -35,18 +35,18 @@
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^14.18.34",
+    "@types/node": "^14.18.42",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.29.0",
+    "eslint": "^8.38.0",
     "mocha": "^9.2.2",
     "proxyquire": "^2.1.3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.0",
     "sinon-chai": "^3.7.0",
     "sinon": "^13.0.2",
     "source-map-support": "^0.5.21",
@@ -55,7 +55,7 @@
   },
   "main": "build/main.js",
   "files": [
-    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).json",
+    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
     "build/",
     "www/",

diff --git a/test/baselines/TS_Prettier/package.json b/test/baselines/TS_Prettier/package.json
@@ -22,7 +22,7 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7"
+    "@iobroker/adapter-core": "^2.6.8"
   },
   "devDependencies": {
     "@iobroker/adapter-dev": "^1.2.0",
@@ -31,21 +31,21 @@
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^14.18.34",
+    "@types/node": "^14.18.42",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.29.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.38.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^9.2.2",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.7",
     "proxyquire": "^2.1.3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.0",
     "sinon-chai": "^3.7.0",
     "sinon": "^13.0.2",
     "source-map-support": "^0.5.21",
@@ -54,7 +54,7 @@
   },
   "main": "build/main.js",
   "files": [
-    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).json",
+    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
     "build/",
     "www/",

diff --git a/.../baselines/adapter_JS_ES6Class_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/LICENSE b/.../baselines/adapter_JS_ES6Class_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Al Calzone
+   Copyright 2023 Al Calzone
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/...dapter_JS_ES6Class_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/README.md b/...dapter_JS_ES6Class_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/README.md
@@ -290,7 +290,7 @@ For later updates, the above procedure is not necessary. Just do the following:
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Al Calzone
+   Copyright 2023 Al Calzone
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/...lines/adapter_JS_ES6Class_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json b/...lines/adapter_JS_ES6Class_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json
@@ -22,7 +22,7 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7"
+    "@iobroker/adapter-core": "^2.6.8"
   },
   "devDependencies": {
     "@iobroker/adapter-dev": "^1.2.0",
@@ -31,13 +31,13 @@
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^14.18.34",
+    "@types/node": "^14.18.42",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.29.0",
+    "eslint": "^8.38.0",
     "mocha": "^9.2.2",
     "proxyquire": "^2.1.3",
     "sinon-chai": "^3.7.0",
@@ -46,7 +46,7 @@
   },
   "main": "main.js",
   "files": [
-    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).json",
+    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
     "lib/",
     "www/",

diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/LICENSE b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Al Calzone
+   Copyright 2023 Al Calzone
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/.../adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/README.md b/.../adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/README.md
@@ -290,7 +290,7 @@ For later updates, the above procedure is not necessary. Just do the following:
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Al Calzone
+   Copyright 2023 Al Calzone
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/...selines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json b/...selines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json
@@ -22,7 +22,7 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7"
+    "@iobroker/adapter-core": "^2.6.8"
   },
   "devDependencies": {
     "@iobroker/adapter-dev": "^1.2.0",
@@ -31,13 +31,13 @@
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^14.18.34",
+    "@types/node": "^14.18.42",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.29.0",
+    "eslint": "^8.38.0",
     "mocha": "^9.2.2",
     "proxyquire": "^2.1.3",
     "sinon-chai": "^3.7.0",
@@ -46,7 +46,7 @@
   },
   "main": "main.js",
   "files": [
-    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).json",
+    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
     "lib/",
     "www/",

diff --git a/test/baselines/adapter_JS_React/LICENSE b/test/baselines/adapter_JS_React/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Al Calzone <[email protected]>
+Copyright (c) 2023 Al Calzone <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/test/baselines/adapter_JS_React/README.md b/test/baselines/adapter_JS_React/README.md
@@ -110,7 +110,7 @@ For later updates, the above procedure is not necessary. Just do the following:
 ## License
 MIT License
 
-Copyright (c) 2022 Al Calzone <[email protected]>
+Copyright (c) 2023 Al Calzone <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/test/baselines/adapter_JS_React/package.json b/test/baselines/adapter_JS_React/package.json
@@ -22,7 +22,7 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7"
+    "@iobroker/adapter-core": "^2.6.8"
   },
   "devDependencies": {
     "@iobroker/adapter-dev": "^1.2.0",
@@ -31,8 +31,8 @@
     "@material-ui/core": "^4.12.4",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.29.0",
-    "eslint-plugin-react": "^7.31.11",
+    "eslint": "^8.38.0",
+    "eslint-plugin-react": "^7.32.2",
     "mocha": "^9.2.2",
     "proxyquire": "^2.1.3",
     "react-dom": "^17.0.2",
@@ -42,7 +42,7 @@
   },
   "main": "main.js",
   "files": [
-    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).json",
+    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
     "admin/build/",
     "lib/",

diff --git a/test/baselines/adapter_TS_ES6Class_ESLint_Tabs_DoubleQuotes_MIT/LICENSE b/test/baselines/adapter_TS_ES6Class_ESLint_Tabs_DoubleQuotes_MIT/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Al Calzone <[email protected]>
+Copyright (c) 2023 Al Calzone <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/test/baselines/adapter_TS_ES6Class_ESLint_Tabs_DoubleQuotes_MIT/README.md b/test/baselines/adapter_TS_ES6Class_ESLint_Tabs_DoubleQuotes_MIT/README.md
@@ -111,7 +111,7 @@ For later updates, the above procedure is not necessary. Just do the following:
 ## License
 MIT License
 
-Copyright (c) 2022 Al Calzone <[email protected]>
+Copyright (c) 2023 Al Calzone <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/test/baselines/adapter_TS_ES6Class_ESLint_Tabs_DoubleQuotes_MIT/package.json b/test/baselines/adapter_TS_ES6Class_ESLint_Tabs_DoubleQuotes_MIT/package.json
@@ -22,7 +22,7 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7"
+    "@iobroker/adapter-core": "^2.6.8"
   },
   "devDependencies": {
     "@iobroker/adapter-dev": "^1.2.0",
@@ -31,18 +31,18 @@
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^14.18.34",
+    "@types/node": "^14.18.42",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.29.0",
+    "eslint": "^8.38.0",
     "mocha": "^9.2.2",
     "proxyquire": "^2.1.3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.0",
     "sinon-chai": "^3.7.0",
     "sinon": "^13.0.2",
     "source-map-support": "^0.5.21",
@@ -51,7 +51,7 @@
   },
   "main": "build/main.js",
   "files": [
-    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).json",
+    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
     "build/",
     "www/",

diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/LICENSE b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Al Calzone <[email protected]>
+Copyright (c) 2023 Al Calzone <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/README.md b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/README.md
@@ -111,7 +111,7 @@ For later updates, the above procedure is not necessary. Just do the following:
 ## License
 MIT License
 
-Copyright (c) 2022 Al Calzone <[email protected]>
+Copyright (c) 2023 Al Calzone <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal