Merge pull request #81 from AlCalzone/update-templates-to-1.30.1

Update templates to creator version v1.30.1
ioBroker · Nov 9, 2020 · cb42fae · cb42fae
2 parents 860f05d + edf9d05
commit cb42fae
Show file tree

Hide file tree

Showing 29 changed files with 40 additions and 47 deletions.
diff --git a/JavaScript/.create-adapter.json b/JavaScript/.create-adapter.json
@@ -28,5 +28,5 @@
     ],
     "indentation": "Space (4)",
     "quotes": "single",
-    "creatorVersion": "1.30.0"
+    "creatorVersion": "1.30.1"
 }
diff --git a/JavaScript/main.js b/JavaScript/main.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*
- * Created with @iobroker/create-adapter v1.30.0
+ * Created with @iobroker/create-adapter v1.30.1
  */
 
 // The adapter-core module gives you access to the core ioBroker functions

diff --git a/JavaScript/package.json b/JavaScript/package.json
@@ -34,7 +34,7 @@
     "axios": "^0.21.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^7.12.1",
+    "eslint": "^7.13.0",
     "gulp": "^4.0.2",
     "mocha": "^8.2.1",
     "proxyquire": "^2.1.3",

diff --git a/JavaScript/tsconfig.json b/JavaScript/tsconfig.json
@@ -11,12 +11,10 @@
 
         "module": "commonjs",
         "moduleResolution": "node",
+        "esModuleInterop": true,
         // this is necessary for the automatic typing of the adapter config
         "resolveJsonModule": true,
 
-        // Support React
-        "jsx": "react",
-
         // Set this to false if you want to disable the very strict rules (not recommended)
         "strict": true,
         // Or enable some of those features for more fine-grained control

diff --git a/JavaScriptReact/.create-adapter.json b/JavaScriptReact/.create-adapter.json
@@ -28,5 +28,5 @@
     ],
     "indentation": "Space (4)",
     "quotes": "single",
-    "creatorVersion": "1.30.0"
+    "creatorVersion": "1.30.1"
 }
diff --git a/JavaScriptReact/main.js b/JavaScriptReact/main.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*
- * Created with @iobroker/create-adapter v1.30.0
+ * Created with @iobroker/create-adapter v1.30.1
  */
 
 // The adapter-core module gives you access to the core ioBroker functions

diff --git a/JavaScriptReact/package.json b/JavaScriptReact/package.json
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@babel/cli": "^7.12.1",
     "@babel/core": "^7.12.3",
-    "@iobroker/adapter-react": "^1.4.4",
+    "@iobroker/adapter-react": "^1.4.7",
     "@iobroker/testing": "^2.3.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -35,13 +35,13 @@
     "@types/node": "^14.14.6",
     "@types/proxyquire": "^1.3.28",
     "@types/react-dom": "^16.9.9",
-    "@types/react": "^16.9.55",
+    "@types/react": "^16.9.56",
     "@types/sinon": "^9.0.8",
     "@types/sinon-chai": "^3.2.5",
     "axios": "^0.21.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^7.12.1",
+    "eslint": "^7.13.0",
     "eslint-plugin-react": "^7.21.5",
     "gulp": "^4.0.2",
     "mocha": "^8.2.1",

diff --git a/JavaScriptReact/tsconfig.json b/JavaScriptReact/tsconfig.json
@@ -11,12 +11,10 @@
 
         "module": "commonjs",
         "moduleResolution": "node",
+        "esModuleInterop": true,
         // this is necessary for the automatic typing of the adapter config
         "resolveJsonModule": true,
 
-        // Support React
-        "jsx": "react",
-
         // Set this to false if you want to disable the very strict rules (not recommended)
         "strict": true,
         // Or enable some of those features for more fine-grained control

diff --git a/JavaScriptVIS/.create-adapter.json b/JavaScriptVIS/.create-adapter.json
@@ -29,5 +29,5 @@
     ],
     "indentation": "Space (4)",
     "quotes": "single",
-    "creatorVersion": "1.30.0"
+    "creatorVersion": "1.30.1"
 }
diff --git a/JavaScriptVIS/main.js b/JavaScriptVIS/main.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /*
- * Created with @iobroker/create-adapter v1.30.0
+ * Created with @iobroker/create-adapter v1.30.1
  */
 
 // The adapter-core module gives you access to the core ioBroker functions

diff --git a/JavaScriptVIS/package.json b/JavaScriptVIS/package.json
@@ -34,7 +34,7 @@
     "axios": "^0.21.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^7.12.1",
+    "eslint": "^7.13.0",
     "gulp": "^4.0.2",
     "mocha": "^8.2.1",
     "proxyquire": "^2.1.3",

diff --git a/JavaScriptVIS/tsconfig.json b/JavaScriptVIS/tsconfig.json
@@ -11,12 +11,10 @@
 
         "module": "commonjs",
         "moduleResolution": "node",
+        "esModuleInterop": true,
         // this is necessary for the automatic typing of the adapter config
         "resolveJsonModule": true,
 
-        // Support React
-        "jsx": "react",
-
         // Set this to false if you want to disable the very strict rules (not recommended)
         "strict": true,
         // Or enable some of those features for more fine-grained control

diff --git a/TypeScript/.create-adapter.json b/TypeScript/.create-adapter.json
@@ -28,5 +28,5 @@
 	],
 	"indentation": "Tab",
 	"quotes": "double",
-	"creatorVersion": "1.30.0"
+	"creatorVersion": "1.30.1"
 }
diff --git a/TypeScript/package.json b/TypeScript/package.json
@@ -36,7 +36,7 @@
     "axios": "^0.21.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^7.12.1",
+    "eslint": "^7.13.0",
     "gulp": "^4.0.2",
     "mocha": "^8.2.1",
     "nyc": "^15.1.0",

diff --git a/TypeScript/src/main.ts b/TypeScript/src/main.ts
@@ -1,5 +1,5 @@
 /*
- * Created with @iobroker/create-adapter v1.30.0
+ * Created with @iobroker/create-adapter v1.30.1
  */
 
 // The adapter-core module gives you access to the core ioBroker functions

diff --git a/TypeScript/tsconfig.json b/TypeScript/tsconfig.json
@@ -16,12 +16,10 @@
 		"removeComments": false,
 		"module": "commonjs",
 		"moduleResolution": "node",
+		"esModuleInterop": true,
 		// this is necessary for the automatic typing of the adapter config
 		"resolveJsonModule": true,
 
-		// Support React
-		"jsx": "react",
-
 		// Set this to false if you want to disable the very strict rules (not recommended)
 		"strict": true,
 		// Or enable some of those features for more fine-grained control

diff --git a/TypeScriptReact/.create-adapter.json b/TypeScriptReact/.create-adapter.json
@@ -28,5 +28,5 @@
 	],
 	"indentation": "Tab",
 	"quotes": "double",
-	"creatorVersion": "1.30.0"
+	"creatorVersion": "1.30.1"
 }
diff --git a/TypeScriptReact/admin/src/app.tsx b/TypeScriptReact/admin/src/app.tsx
@@ -1,4 +1,4 @@
-import * as React from "react";
+import React from "react";
 import { Theme, withStyles } from "@material-ui/core/styles";
 
 import GenericApp from "@iobroker/adapter-react/GenericApp";

diff --git a/TypeScriptReact/admin/src/components/settings.tsx b/TypeScriptReact/admin/src/components/settings.tsx
@@ -1,4 +1,4 @@
-import * as React from "react";
+import React from "react";
 import { withStyles } from "@material-ui/core/styles";
 import { CreateCSSProperties } from "@material-ui/core/styles/withStyles";
 import TextField from "@material-ui/core/TextField";

diff --git a/TypeScriptReact/admin/src/index.tsx b/TypeScriptReact/admin/src/index.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
-import * as ReactDOM from "react-dom";
+import React from "react";
+import ReactDOM from "react-dom";
 import { MuiThemeProvider } from "@material-ui/core/styles";
 import theme from "@iobroker/adapter-react/Theme";
 import Utils from "@iobroker/adapter-react/Components/Utils";

diff --git a/TypeScriptReact/admin/tsconfig.json b/TypeScriptReact/admin/tsconfig.json
@@ -11,7 +11,12 @@
 		"lib": [
 			"es2018",
 			"DOM"
-		]
+		],
+
+		// Support React - both must be here because parcel v1 does not
+		// evaluate the "extends" option
+		"jsx": "react",
+		"esModuleInterop": true
 	},
 	"include": [
 		"./**/*.ts",
@@ -22,4 +27,4 @@
 		"./**/*.test.ts",
 		"./**/*.test.tsx"
 	]
-}
+}
diff --git a/TypeScriptReact/package.json b/TypeScriptReact/package.json
@@ -27,7 +27,7 @@
     "@babel/plugin-proposal-decorators": "^7.12.1",
     "@babel/preset-env": "^7.12.1",
     "@babel/preset-typescript": "^7.12.1",
-    "@iobroker/adapter-react": "^1.4.4",
+    "@iobroker/adapter-react": "^1.4.7",
     "@iobroker/testing": "^2.3.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -38,15 +38,15 @@
     "@types/node": "^14.14.6",
     "@types/proxyquire": "^1.3.28",
     "@types/react-dom": "^16.9.9",
-    "@types/react": "^16.9.55",
+    "@types/react": "^16.9.56",
     "@types/sinon": "^9.0.8",
     "@types/sinon-chai": "^3.2.5",
     "@typescript-eslint/eslint-plugin": "^4.6.1",
     "@typescript-eslint/parser": "^4.6.1",
     "axios": "^0.21.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^7.12.1",
+    "eslint": "^7.13.0",
     "eslint-plugin-react": "^7.21.5",
     "gulp": "^4.0.2",
     "mocha": "^8.2.1",

diff --git a/TypeScriptReact/src/main.ts b/TypeScriptReact/src/main.ts
@@ -1,5 +1,5 @@
 /*
- * Created with @iobroker/create-adapter v1.30.0
+ * Created with @iobroker/create-adapter v1.30.1
  */
 
 // The adapter-core module gives you access to the core ioBroker functions

diff --git a/TypeScriptReact/tsconfig.json b/TypeScriptReact/tsconfig.json
@@ -16,12 +16,10 @@
 		"removeComments": false,
 		"module": "commonjs",
 		"moduleResolution": "node",
+		"esModuleInterop": true,
 		// this is necessary for the automatic typing of the adapter config
 		"resolveJsonModule": true,
 
-		// Support React
-		"jsx": "react",
-
 		// Set this to false if you want to disable the very strict rules (not recommended)
 		"strict": true,
 		// Or enable some of those features for more fine-grained control

diff --git a/TypeScriptVIS/.create-adapter.json b/TypeScriptVIS/.create-adapter.json
@@ -29,5 +29,5 @@
 	],
 	"indentation": "Tab",
 	"quotes": "double",
-	"creatorVersion": "1.30.0"
+	"creatorVersion": "1.30.1"
 }
diff --git a/TypeScriptVIS/package.json b/TypeScriptVIS/package.json
@@ -36,7 +36,7 @@
     "axios": "^0.21.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^7.12.1",
+    "eslint": "^7.13.0",
     "gulp": "^4.0.2",
     "mocha": "^8.2.1",
     "nyc": "^15.1.0",

diff --git a/TypeScriptVIS/src/main.ts b/TypeScriptVIS/src/main.ts
@@ -1,5 +1,5 @@
 /*
- * Created with @iobroker/create-adapter v1.30.0
+ * Created with @iobroker/create-adapter v1.30.1
  */
 
 // The adapter-core module gives you access to the core ioBroker functions

diff --git a/TypeScriptVIS/tsconfig.json b/TypeScriptVIS/tsconfig.json
@@ -16,12 +16,10 @@
 		"removeComments": false,
 		"module": "commonjs",
 		"moduleResolution": "node",
+		"esModuleInterop": true,
 		// this is necessary for the automatic typing of the adapter config
 		"resolveJsonModule": true,
 
-		// Support React
-		"jsx": "react",
-
 		// Set this to false if you want to disable the very strict rules (not recommended)
 		"strict": true,
 		// Or enable some of those features for more fine-grained control

diff --git a/VIS/.create-adapter.json b/VIS/.create-adapter.json
@@ -13,5 +13,5 @@
     ],
     "title": "Template (VIS only)",
     "type": "visualization-widgets",
-    "creatorVersion": "1.30.0"
+    "creatorVersion": "1.30.1"
 }