Merge pull request #20 from pyinsteon/scenes

Manage Insteon Scenes

package.json

@@ -23,99 +23,6 @@
     "url": "https://github.com/teharris1/insteon-panel/issues"
   },
   "homepage": "https://github.com/teharris1/insteon-panel",
-  "devDependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/plugin-external-helpers": "^7.14.5",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-decorators": "^7.15.4",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-syntax-import-meta": "^7.10.4",
-    "@babel/plugin-syntax-top-level-await": "^7.14.5",
-    "@babel/preset-env": "^7.15.6",
-    "@babel/preset-typescript": "^7.15.0",
-    "@koa/cors": "^3.1.0",
-    "@open-wc/dev-server-hmr": "^0.0.2",
-    "@rollup/plugin-babel": "^5.2.1",
-    "@rollup/plugin-commonjs": "^11.1.0",
-    "@rollup/plugin-json": "^4.0.3",
-    "@rollup/plugin-node-resolve": "^7.1.3",
-    "@rollup/plugin-replace": "^2.3.2",
-    "@types/chromecast-caf-receiver": "5.0.12",
-    "@types/chromecast-caf-sender": "^1.0.3",
-    "@types/glob": "^7",
-    "@types/js-yaml": "^4",
-    "@types/leaflet": "^1",
-    "@types/leaflet-draw": "^1",
-    "@types/marked": "^4",
-    "@types/mocha": "^8",
-    "@types/qrcode": "^1.4.2",
-    "@types/sortablejs": "^1",
-    "@types/webspeechapi": "^0.0.29",
-    "@typescript-eslint/eslint-plugin": "^4.32.0",
-    "@typescript-eslint/parser": "^4.32.0",
-    "@web/dev-server": "^0.0.24",
-    "@web/dev-server-rollup": "^0.2.11",
-    "babel-loader": "^8.2.2",
-    "chai": "^4.3.4",
-    "del": "^4.0.0",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-airbnb-typescript": "^14.0.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-import-resolver-webpack": "^0.13.1",
-    "eslint-plugin-disable": "^2.0.1",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-lit": "^1.6.1",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-unused-imports": "^1.1.5",
-    "eslint-plugin-wc": "^1.3.2",
-    "fancy-log": "^1.3.3",
-    "fs-extra": "^7.0.1",
-    "glob": "^7.2.0",
-    "gulp": "^4.0.2",
-    "gulp-flatmap": "^1.0.2",
-    "gulp-json-transform": "^0.4.6",
-    "gulp-merge-json": "^1.3.1",
-    "gulp-rename": "^2.0.0",
-    "gulp-zopfli-green": "^3.0.1",
-    "html-minifier": "^4.0.0",
-    "husky": "^8.0.1",
-    "instant-mocha": "^1.3.1",
-    "lint-staged": "^13.0.3",
-    "lit-analyzer": "^1.2.1",
-    "lodash.template": "^4.5.0",
-    "magic-string": "^0.25.7",
-    "map-stream": "^0.0.7",
-    "merge-stream": "^1.0.1",
-    "mocha": "^8.4.0",
-    "object-hash": "^2.0.3",
-    "open": "^7.0.4",
-    "pinst": "^3.0.0",
-    "prettier": "^2.4.1",
-    "require-dir": "^1.2.0",
-    "rollup": "^2.8.2",
-    "rollup-plugin-string": "^3.0.0",
-    "rollup-plugin-terser": "^5.3.0",
-    "rollup-plugin-visualizer": "^4.0.4",
-    "serve": "^11.3.2",
-    "sinon": "^11.0.0",
-    "source-map-url": "^0.4.0",
-    "systemjs": "^6.3.2",
-    "terser-webpack-plugin": "^5.2.4",
-    "ts-lit-plugin": "^1.2.1",
-    "typescript": "^4.4.3",
-    "vinyl-buffer": "^1.0.1",
-    "vinyl-source-stream": "^2.0.0",
-    "webpack": "^5.55.1",
-    "webpack-cli": "^4.8.0",
-    "webpack-dev-server": "^4.3.0",
-    "webpack-manifest-plugin": "^4.0.2",
-    "webpackbar": "^5.0.0-3",
-    "workbox-build": "^6.4.2"
-  },
   "dependencies": {
     "@braintree/sanitize-url": "^5.0.2",
     "@codemirror/autocomplete": "^0.19.12",
@@ -239,6 +146,99 @@
     "workbox-strategies": "^6.4.2",
     "xss": "^1.0.9"
   },
+  "devDependencies": {
+    "@babel/core": "^7.15.5",
+    "@babel/plugin-external-helpers": "^7.14.5",
+    "@babel/plugin-proposal-class-properties": "^7.14.5",
+    "@babel/plugin-proposal-decorators": "^7.15.4",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+    "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
+    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-syntax-import-meta": "^7.10.4",
+    "@babel/plugin-syntax-top-level-await": "^7.14.5",
+    "@babel/preset-env": "^7.15.6",
+    "@babel/preset-typescript": "^7.15.0",
+    "@koa/cors": "^3.1.0",
+    "@open-wc/dev-server-hmr": "^0.0.2",
+    "@rollup/plugin-babel": "^5.2.1",
+    "@rollup/plugin-commonjs": "^11.1.0",
+    "@rollup/plugin-json": "^4.0.3",
+    "@rollup/plugin-node-resolve": "^7.1.3",
+    "@rollup/plugin-replace": "^2.3.2",
+    "@types/chromecast-caf-receiver": "5.0.12",
+    "@types/chromecast-caf-sender": "^1.0.3",
+    "@types/glob": "^7",
+    "@types/js-yaml": "^4",
+    "@types/leaflet": "^1",
+    "@types/leaflet-draw": "^1",
+    "@types/marked": "^4",
+    "@types/mocha": "^8",
+    "@types/qrcode": "^1.4.2",
+    "@types/sortablejs": "^1",
+    "@types/webspeechapi": "^0.0.29",
+    "@typescript-eslint/eslint-plugin": "^4.32.0",
+    "@typescript-eslint/parser": "^4.32.0",
+    "@web/dev-server": "^0.0.24",
+    "@web/dev-server-rollup": "^0.2.11",
+    "babel-loader": "^8.2.2",
+    "chai": "^4.3.4",
+    "del": "^4.0.0",
+    "eslint": "^7.32.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-config-airbnb-typescript": "^14.0.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-webpack": "^0.13.1",
+    "eslint-plugin-disable": "^2.0.1",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-lit": "^1.6.1",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-unused-imports": "^1.1.5",
+    "eslint-plugin-wc": "^1.3.2",
+    "fancy-log": "^1.3.3",
+    "fs-extra": "^7.0.1",
+    "glob": "^7.2.0",
+    "gulp": "^4.0.2",
+    "gulp-flatmap": "^1.0.2",
+    "gulp-json-transform": "^0.4.6",
+    "gulp-merge-json": "^1.3.1",
+    "gulp-rename": "^2.0.0",
+    "gulp-zopfli-green": "^3.0.1",
+    "html-minifier": "^4.0.0",
+    "husky": "^8.0.1",
+    "instant-mocha": "^1.3.1",
+    "lint-staged": "^13.0.3",
+    "lit-analyzer": "^1.2.1",
+    "lodash.template": "^4.5.0",
+    "magic-string": "^0.25.7",
+    "map-stream": "^0.0.7",
+    "merge-stream": "^1.0.1",
+    "mocha": "^8.4.0",
+    "object-hash": "^2.0.3",
+    "open": "^7.0.4",
+    "pinst": "^3.0.0",
+    "prettier": "^2.4.1",
+    "require-dir": "^1.2.0",
+    "rollup": "^2.8.2",
+    "rollup-plugin-string": "^3.0.0",
+    "rollup-plugin-terser": "^5.3.0",
+    "rollup-plugin-visualizer": "^4.0.4",
+    "serve": "^11.3.2",
+    "sinon": "^11.0.0",
+    "source-map-url": "^0.4.0",
+    "systemjs": "^6.3.2",
+    "terser-webpack-plugin": "^5.2.4",
+    "ts-lit-plugin": "^1.2.1",
+    "typescript": "^4.4.3",
+    "vinyl-buffer": "^1.0.1",
+    "vinyl-source-stream": "^2.0.0",
+    "webpack": "^5.55.1",
+    "webpack-cli": "^4.8.0",
+    "webpack-dev-server": "^4.3.0",
+    "webpack-manifest-plugin": "^4.0.2",
+    "webpackbar": "^5.0.0-3",
+    "workbox-build": "^6.4.2"
+  },
   "resolutions": {
     "@polymer/polymer": "patch:@polymer/[email protected]#./homeassistant-frontend/.yarn/patches/@polymer/polymer/pr-5569.patch",
     "@webcomponents/webcomponentsjs": "^2.2.10",
@@ -247,12 +247,9 @@
     "lit-element": "3.1.2",
     "@lit/reactive-element": "1.2.1"
   },
-  "resolutionsOverride": {
-    "@polymer/polymer": "patch:@polymer/[email protected]#./homeassistant-frontend/.yarn/patches/@polymer/polymer/pr-5569.patch"
-  },
-  "dependenciesOverride": {
-    "@lit-labs/virtualizer": "patch:@lit-labs/[email protected]#./homeassistant-frontend/.yarn/patches/@lit-labs/virtualizer/event-target-shim.patch",
-    "@material/mwc-icon-button": "patch:@material/[email protected]#./homeassistant-frontend/.yarn/patches/@material/mwc-icon-button/remove-icon.patch"
+  "prettier": {
+    "trailingComma": "es5",
+    "arrowParens": "always"
   },
-  "devDependenciesOverride": {}
-}
+  "packageManager": "[email protected]"
+}

pyproject.toml

@@ -0,0 +1,25 @@
+[build-system]
+requires = ["setuptools~=62.3", "wheel~=0.37.1"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name         = "insteon-frontend-home-assistant"
+version      = "0.3.0"
+license      = {text = "MIT License"}
+description  = "The Insteon frontend for Home Assistant"
+readme       = "README.md"
+authors      = [
+    {name = "Tom Harris", email = "[email protected]"}
+]
+requires-python = ">=3.4.0"
+
+[project.urls]
+"Homepage" = "https://github.com/home-assistant/frontend"
+
+[tool.setuptools]
+platforms = ["any"]
+zip-safe  = false
+include-package-data = true
+
+[tool.setuptools.packages.find]
+include = ["insteon_frontend*"]

script/bootstrap

@@ -12,5 +12,5 @@ if [ ! -d "./homeassistant-frontend/src" ]; then
   git submodule update
   cd ..
 fi
-
+pip install --upgrade twine build
 yarn install

script/merge_requirements.js

@@ -14,6 +14,7 @@ fs.writeFileSync(
       resolutions: { ...core.resolutions, ...insteon.resolutionsOverride },
       dependencies: { ...core.dependencies, ...insteon.dependenciesOverride },
       devDependencies: { ...core.devDependencies, ...insteon.devDependenciesOverride },
+      prettier: { ...core.devDependencies, ...insteon.devDependenciesOverride },
     },
     null,
     2