Move type declarations

Christopher Mühl · Christopher Mühl · commit 7ac84c38c606 · 2021-03-24T21:50:40.000+01:00
diff --git a/packages/awtrix/package-lock.json b/packages/awtrix/package-lock.json
diff --git a/packages/awtrix/package.json b/packages/awtrix/package.json
@@ -23,7 +23,7 @@
   ],
   "license": "CC-BY-4.0",
   "bugs": {
-    "url": "https://github.com/awtrix/awtrix3-host/issues"
+    "url": "https://github.com/awtrix/awtrix-hd/issues"
   },
   "homepage": "https://blueforcer.de/2019/01/04/awtrix-2-0/",
   "files": [
@@ -99,6 +99,6 @@
     "@typescript-eslint/parser": "^2.23.0",
     "ts-node": "^8.6.2",
     "tsconfig-paths": "^3.9.0",
-    "typescript": "^4.0.5"
+    "typescript": "^4.2.3"
   }
 }
diff --git a/packages/awtrix/src/app/ActiveApplication.ts b/packages/awtrix/src/app/ActiveApplication.ts
@@ -1,4 +1,4 @@
-import { ApplicationConfig } from '../types/Application'
+import { ApplicationConfig } from '@awtrix/common/dist/types/app'
 import { BackendApp } from '@awtrix/common'
 
 export default class ActiveApplicationBackend {
diff --git a/packages/awtrix/src/app/ApplicationProcessor.ts b/packages/awtrix/src/app/ApplicationProcessor.ts
@@ -1,6 +1,6 @@
 import Container from './Container'
 import { BackendApp as ApplicationBackend } from '@awtrix/common'
-import { ApplicationIdentifier } from '../types/Application'
+import { ApplicationIdentifier } from '@awtrix/common/dist/types/app'
 import { join, resolve } from 'path'
 import { debounce } from 'lodash'
 import chokidar from 'chokidar'
diff --git a/packages/awtrix/src/types/Application.ts b/packages/awtrix/src/types/Application.ts
diff --git a/packages/awtrix/tsconfig.json b/packages/awtrix/tsconfig.json
@@ -1,24 +1,16 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "es2015",
     "moduleResolution": "node",
-    "module": "CommonJS",
+    "declaration": true,
+    "importHelpers": true,
+    "baseUrl": ".",
+    "outDir": "./dist",
     "lib": [
       "esnext",
       "esnext.asynciterable",
       "dom"
     ],
-    "skipLibCheck": true,
-    "declaration": true,
-    "esModuleInterop": true,
-    "importHelpers": true,
-    "strict": true,
-    "outDir": "./dist",
-    "baseUrl": ".",
-    "paths": {
-      "~/*": ["./web/*"],
-      "@/*": ["./src/*"],
-    },
     "types": [
       "node",
       "@types/node",
@@ -28,8 +20,8 @@
   },
   "exclude": [
     "node_modules",
-    "tests",
     "dist",
+    "web",
     "src/app/template"
   ]
 }
diff --git a/packages/awtrix/web/components/AppContainer.vue b/packages/awtrix/web/components/AppContainer.vue
@@ -26,7 +26,7 @@ import CircularMenu from './Settings/CircularMenu.vue'
 import shortid from 'shortid'
 import Hammer from 'hammerjs'
 import { debounce } from 'lodash'
-import { LifecycleApplication } from '@/types/Application'
+import { LifecycleApplication } from '@awtrix/common/dist/types/app'
 import { Socket } from 'socket.io-client'
 
 enum SwitchingReason {
diff --git a/packages/awtrix/web/components/Application.vue b/packages/awtrix/web/components/Application.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue'
-import { LifecycleApplication } from '@/types/Application'
+import { LifecycleApplication } from '@awtrix/common/dist/types/app'
 import io, { Socket } from 'socket.io-client'
 import { GeneratorType, FrontendApp } from '@awtrix/common'
 
diff --git a/packages/awtrix/web/components/ApplicationSettings/InputWrapper.vue b/packages/awtrix/web/components/ApplicationSettings/InputWrapper.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue'
-import { LifecycleApplication } from '@/types/Application'
+import { LifecycleApplication } from '@awtrix/common/dist/types/app'
 import Dropdown from '../Inputs/Dropdown.vue'
 import TextInput from '../Inputs/TextInput.vue'
 import IntegerInput from '../Inputs/IntegerInput.vue'
diff --git a/packages/awtrix/web/components/ApplicationSettings/index.vue b/packages/awtrix/web/components/ApplicationSettings/index.vue
@@ -17,7 +17,7 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 import InputWrapper from './InputWrapper.vue'
-import { LifecycleApplication } from '@/types/Application'
+import { LifecycleApplication } from '@awtrix/common/dist/types/app'
 
 export default Vue.extend({
   name: 'ApplicationSettings',
diff --git a/packages/awtrix/web/components/Scaffolding.vue b/packages/awtrix/web/components/Scaffolding.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
-import { LifecycleApplication } from '@/types/Application'
+import { LifecycleApplication } from '@awtrix/common/dist/types/app'
 import { Socket } from 'socket.io-client'
 
 export default Vue.extend({
diff --git a/packages/awtrix/web/components/Settings/ApplicationBanner.vue b/packages/awtrix/web/components/Settings/ApplicationBanner.vue
@@ -10,7 +10,7 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue'
-import { RawApplication } from '@/types/Application'
+import { RawApplication } from '@awtrix/common/dist/types/app'
 
 export default Vue.extend({
   props: {
diff --git a/packages/awtrix/web/components/Settings/Loop.vue b/packages/awtrix/web/components/Settings/Loop.vue
@@ -37,7 +37,7 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import { RawApplication } from '@/types/Application'
+import { RawApplication } from '@awtrix/common/dist/types/app'
 import Draggable, { MoveEvent } from 'vuedraggable'
 import shortid from 'shortid'
 import ApplicationBanner from './ApplicationBanner.vue'
diff --git a/packages/awtrix/web/plugins/translations.ts b/packages/awtrix/web/plugins/translations.ts
@@ -1,5 +1,5 @@
 import { Plugin } from '@nuxt/types'
-import { LifecycleApplication } from '@/types/Application'
+import { LifecycleApplication } from '@awtrix/common/dist/types/app'
 
 const translationPlugin: Plugin = ({ app }, inject) => {
   const translate = (key: string, application: LifecycleApplication | undefined): string => {
diff --git a/packages/awtrix/web/store/apps.ts b/packages/awtrix/web/store/apps.ts
@@ -1,5 +1,5 @@
 import { getAccessorType, mutationTree, getterTree } from 'typed-vuex'
-import { LifecycleApplication } from '@/types/Application'
+import { LifecycleApplication } from '@awtrix/common/dist/types/app'
 
 export const state = () => ({
   applications: [] as LifecycleApplication[],
diff --git a/packages/awtrix/web/store/config.ts b/packages/awtrix/web/store/config.ts
@@ -1,6 +1,6 @@
 import { getAccessorType, mutationTree, actionTree } from 'typed-vuex'
 import io, { Socket } from 'socket.io-client'
-import { LifecycleApplication } from '@/types/Application'
+import { LifecycleApplication } from '@awtrix/common/dist/types/app'
 
 export const state = () => ({
   locale: 'en',
diff --git a/packages/awtrix/web/store/index.ts b/packages/awtrix/web/store/index.ts
@@ -1,6 +1,6 @@
 import { getAccessorType } from 'typed-vuex'
-import * as apps from '~/store/apps'
-import * as config from '~/store/config'
+import * as apps from './apps'
+import * as config from './config'
 
 export const accessorType = getAccessorType({
   modules: {
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -16,7 +16,7 @@
     "@types/lodash": "^4.14.165",
     "@types/socket.io": "^2.1.11",
     "@types/socket.io-client": "^1.4.34",
-    "typescript": "^4.0.5",
+    "typescript": "^4.2",
     "vue": "^2.6.12"
   },
   "dependencies": {
diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json
@@ -1,16 +1,8 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "outDir": "./dist",
-    "declaration": true,
-    "strict": true,
-    "types": ["vue"],
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true
+    "baseUrl": ".",
+    "outDir": "./dist"
   },
-  "exclude": [
-    "node_modules",
-    "dist"
-  ]
+  "exclude": ["node_modules"]
 }
diff --git a/packages/dev/package.json b/packages/dev/package.json
@@ -61,6 +61,6 @@
     "@types/tar": "^4.0.3",
     "@types/yeoman-environment": "^2.10.1",
     "@types/yeoman-generator": "^4.11.2",
-    "typescript": "^4.0"
+    "typescript": "^4.2"
   }
 }
diff --git a/packages/dev/tsconfig.json b/packages/dev/tsconfig.json
@@ -1,12 +1,8 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "outDir": "./dist",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true
+    "baseUrl": ".",
+    "outDir": "./dist"
   },
   "exclude": [
     "node_modules",
diff --git a/packages/example-app/.gitignore b/packages/example-app/.gitignore
diff --git a/packages/example-app/assets/.gitkeep b/packages/example-app/assets/.gitkeep
diff --git a/packages/example-app/backend.ts b/packages/example-app/backend.ts
diff --git a/packages/example-app/frontend.vue b/packages/example-app/frontend.vue
diff --git a/packages/example-app/package-lock.json b/packages/example-app/package-lock.json
diff --git a/packages/example-app/package.json b/packages/example-app/package.json
diff --git a/packages/example-app/translations/en.json b/packages/example-app/translations/en.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "es6",
+    "module": "commonjs",
+    "strict": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "baseUrl": "./packages",
+    "paths": {
+      "@awtrix/dev": ["dev/src"],
+      "@awtrix/common": ["common/src"],
+      "@awtrix/app": ["awtrix/src"]
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ApplicationConfig } from '../types/Application'`
	`1`	`+import { ApplicationConfig } from '@awtrix/common/dist/types/app'`
`2`	`2`	`import { BackendApp } from '@awtrix/common'`
`3`	`3`
`4`	`4`	`export default class ActiveApplicationBackend {`