From 368973b66884c6ee751a0b5363c7445fd1892ab6 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 21 Jun 2020 12:37:12 -0700 Subject: [PATCH] Add app alias --- .eslintrc.json | 6 +----- cast/src/launcher/entrypoint.ts | 4 ++-- cast/src/receiver/entrypoint.ts | 6 +++--- gallery/src/components/demo-cards.js | 4 ++-- hassio/src/entrypoint.ts | 4 ++-- package.json | 1 + yarn.lock | 3 +++ 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index b4edeb632e..f637df7ddc 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -66,11 +66,7 @@ "import/prefer-default-export": 0, "import/no-unresolved": 0, "import/no-cycle": 0, - "import/extensions": [ - 2, - "ignorePackages", - { "ts": "never", "js": "never" } - ], + "import/extensions": 0, "no-restricted-syntax": ["error", "LabeledStatement", "WithStatement"], "object-curly-newline": 0, "default-case": 0, diff --git a/cast/src/launcher/entrypoint.ts b/cast/src/launcher/entrypoint.ts index dd4711e379..1bdbbe425b 100644 --- a/cast/src/launcher/entrypoint.ts +++ b/cast/src/launcher/entrypoint.ts @@ -1,3 +1,3 @@ -import "../../../src/resources/ha-style"; -import "../../../src/resources/roboto"; +import "~app/resources/ha-style"; +import "~app/resources/roboto"; import "./layout/hc-connect"; diff --git a/cast/src/receiver/entrypoint.ts b/cast/src/receiver/entrypoint.ts index c52c137048..fab0181d6c 100644 --- a/cast/src/receiver/entrypoint.ts +++ b/cast/src/receiver/entrypoint.ts @@ -1,7 +1,7 @@ /* eslint-disable no-undef */ -import { CAST_NS } from "../../../src/cast/const"; -import { HassMessage } from "../../../src/cast/receiver_messages"; -import "../../../src/resources/custom-card-support"; +import { CAST_NS } from "~app/cast/const"; +import { HassMessage } from "~app/cast/receiver_messages"; +import "~app/resources/custom-card-support"; import { castContext } from "./cast_context"; import { HcMain } from "./layout/hc-main"; import { ReceivedMessage } from "./types"; diff --git a/gallery/src/components/demo-cards.js b/gallery/src/components/demo-cards.js index 26ac82e3f7..5d8f3ef501 100644 --- a/gallery/src/components/demo-cards.js +++ b/gallery/src/components/demo-cards.js @@ -2,8 +2,8 @@ import "@polymer/app-layout/app-toolbar/app-toolbar"; import { html } from "@polymer/polymer/lib/utils/html-tag"; /* eslint-plugin-disable lit */ import { PolymerElement } from "@polymer/polymer/polymer-element"; -import "../../../src/components/ha-switch"; -import "../../../src/components/ha-formfield"; +import "~app/components/ha-switch"; +import "~app/components/ha-formfield"; import "./demo-card"; class DemoCards extends PolymerElement { diff --git a/hassio/src/entrypoint.ts b/hassio/src/entrypoint.ts index 10f2c3a23f..3402230465 100644 --- a/hassio/src/entrypoint.ts +++ b/hassio/src/entrypoint.ts @@ -1,5 +1,5 @@ -import "../../src/resources/compatibility"; -import "../../src/resources/roboto"; +import "~app/resources/compatibility"; +import "~app/resources/roboto"; import "./hassio-main"; const styleEl = document.createElement("style"); diff --git a/package.json b/package.json index 4084e0036b..28cafa289e 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "author": "Paulus Schoutsen (http://paulusschoutsen.nl)", "license": "Apache-2.0", "dependencies": { + "~app": "file:./src", "@formatjs/intl-pluralrules": "^1.5.8", "@fullcalendar/core": "^5.0.0-beta.2", "@fullcalendar/daygrid": "^5.0.0-beta.2", diff --git a/yarn.lock b/yarn.lock index 73b25d5b77..4fd916d54e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12631,3 +12631,6 @@ yup@^0.26.10: property-expr "^1.5.0" synchronous-promise "^2.0.5" toposort "^2.0.2" + +"~app@file:./src": + version "0.0.0"