Skip to content

Commit

Permalink
Further work on removing submodule dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
richturner committed Jan 30, 2024
1 parent 9c76406 commit 35edf08
Show file tree
Hide file tree
Showing 11 changed files with 200 additions and 223 deletions.
4 changes: 2 additions & 2 deletions project.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def createTSGeneratorConfigForClient(String outputFileName, Project...customProj
extensions = [
"CustomExtension",
"JsonSerializeExtension",
"AggregatedApiClient",
"CustomAggregatedApiClient",
"cz.habarta.typescript.generator.ext.AxiosClientExtension"
]
customTypeMappings = [
Expand All @@ -249,7 +249,7 @@ def createTSGeneratorConfigForClient(String outputFileName, Project...customProj
]
moduleDependencies = [
cz.habarta.typescript.generator.ModuleDependency.module(
"@openremote/model",
"model",
"Model",
new File("$buildDir/typescript-generator-info.json"),
(String) null,
Expand Down
18 changes: 18 additions & 0 deletions ui/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "tsconfig.json",
"sourceType": "module"
},
"extends": [
"eslint:recommended",
"standard",
"plugin:@typescript-eslint/recommended",
"prettier"
],
"plugins": ["@typescript-eslint"],
"env": {
"es6": true
},
"ignorePatterns": ["dist", "lib", "node_modules"]
}
5 changes: 5 additions & 0 deletions ui/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"trailingComma": "es5",
"printWidth": 120,
"singleQuote": false
}
4 changes: 3 additions & 1 deletion ui/app/custom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@openremote/manager": "^1.0.4"
"@openremote/manager": "^1.0.4",
"model": "^1.0.0",
"rest": "^1.0.0"
},
"devDependencies": {
"@babel/core": "^7.16.0",
Expand Down
1 change: 1 addition & 0 deletions ui/app/custom/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig",
"compilerOptions": {
"outDir": "./lib",
"rootDir": "src",
Expand Down
2 changes: 1 addition & 1 deletion ui/component/model/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "model",
"version": "1.1.0",
"version": "1.0.0",
"description": "Model Types",
"main": "dist/umd/index.bundle.js",
"module": "lib/index.js",
Expand Down
3 changes: 2 additions & 1 deletion ui/component/rest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rest",
"version": "1.1.0",
"version": "1.0.0",
"description": "REST API",
"main": "dist/umd/index.bundle.js",
"private": true,
Expand All @@ -23,6 +23,7 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openremote/model": "^1.1.0",
"@openremote/rest": "^1.1.0",
"axios": "0.24.0",
"qs": "^6.8.0"
},
Expand Down
84 changes: 0 additions & 84 deletions ui/component/rest/src/main/java/ExtendedAggregatedApiClient.java

This file was deleted.

20 changes: 20 additions & 0 deletions ui/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"compileOnSave": false,
"compilerOptions": {
"target": "es6",
"module": "esNext",
"moduleResolution": "node",
"lib": [
"dom",
"es2017",
"es2019"
],
"strict": true,
"declaration": true,
"sourceMap": true,
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"composite": true,
"useDefineForClassFields": false
}
}
18 changes: 18 additions & 0 deletions ui/typedoc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
"mode": "modules",
"out": "docs",
"exclude": "test",
"theme": "minimal",
"ignoreCompilerErrors": true,
"excludePrivate": true,
"excludeProtected": true,
"excludeNotExported": true,
"target": "es6",
"moduleResolution": "node",
"preserveConstEnums": true,
"stripInternal": true,
"suppressExcessPropertyErrors": true,
"suppressImplicitAnyIndexErrors": true,
"module": "esNext",
"external-modulemap": ".*node_modules\/(@openremote\/[^\/]+)\/.*"
}
Loading

0 comments on commit 35edf08

Please sign in to comment.