You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2024/03/14 11:35:22 UTC
(streampipes) branch bump-angular-eslint updated: Improve ts config
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch bump-angular-eslint
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/bump-angular-eslint by this push:
new fe26d5187a Improve ts config
fe26d5187a is described below
commit fe26d5187a5d2056460892195ba85d22a08718f7
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Mar 14 10:53:38 2024 +0100
Improve ts config
---
ui/deployment/appng5.module.mst | 1 -
ui/package-lock.json | 21 +-
ui/package.json | 6 +-
.../streampipes/platform-services/package.json | 2 +-
ui/projects/streampipes/shared-ui/package.json | 2 +-
.../streampipes/shared-ui/tsconfig.lib.prod.json | 3 +
ui/src/app/add/add.module.ts | 2 +-
.../connect/services/adapter-template.service.ts | 2 +-
.../editor/services/pipeline-validation.service.ts | 2 +-
ui/src/app/home/home.component.ts | 2 +-
ui/src/app/pipelines/pipelines.module.ts | 2 +-
ui/src/federation.config.js | 256 ++++++++++++++++-----
ui/src/tsconfig.app.json | 8 +
ui/src/tsconfig.federation.json | 8 +
ui/tsconfig.json | 8 -
15 files changed, 232 insertions(+), 93 deletions(-)
diff --git a/ui/deployment/appng5.module.mst b/ui/deployment/appng5.module.mst
index 64e84d35d5..e20178e998 100644
--- a/ui/deployment/appng5.module.mst
+++ b/ui/deployment/appng5.module.mst
@@ -61,7 +61,6 @@ import { MapTransform } from './core-ui/echarts-transform/map.transform';
import * as echarts from 'echarts';
import * as transform from 'echarts-simple-transform';
-import 'echarts-gl';
echarts.registerTransform(transform.aggregate);
echarts.registerTransform(ValueDistributionTransform);
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 7a8933f70c..f6ca79677a 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -7,7 +7,6 @@
"": {
"name": "apache-streampipes",
"version": "0.95.0-SNAPSHOT",
- "hasInstallScript": true,
"dependencies": {
"@ali-hm/angular-tree-component": "12.0.5",
"@angular-architects/native-federation": "^17.1.7",
@@ -42,8 +41,7 @@
"datatables.net": "^1.13.1",
"datatables.net-dt": "^1.13.1",
"date-fns": "^2.30.0",
- "echarts": "^5.4.3",
- "echarts-gl": "^2.0.9",
+ "echarts": "^5.5.0",
"echarts-simple-transform": "^1.0.0",
"echarts-wordcloud": "^2.1.0",
"es-module-shims": "^1.5.12",
@@ -9114,11 +9112,6 @@
"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
"integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
},
- "node_modules/claygl": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/claygl/-/claygl-1.3.0.tgz",
- "integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ=="
- },
"node_modules/clean-stack": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -11249,18 +11242,6 @@
"zrender": "5.5.0"
}
},
- "node_modules/echarts-gl": {
- "version": "2.0.9",
- "resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-2.0.9.tgz",
- "integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==",
- "dependencies": {
- "claygl": "^1.2.1",
- "zrender": "^5.1.1"
- },
- "peerDependencies": {
- "echarts": "^5.1.2"
- }
- },
"node_modules/echarts-simple-transform": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/echarts-simple-transform/-/echarts-simple-transform-1.0.0.tgz",
diff --git a/ui/package.json b/ui/package.json
index e7f9c2197d..af5e9774c6 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -26,8 +26,7 @@
"test-cypress-open": "cypress open",
"test-cypress-smoke": "npx cypress run --spec 'cypress/tests/**/*.smoke.spec.ts'",
"test-cypress-all": "npx cypress run --spec 'cypress/tests/**/*.spec.ts'",
- "prepare": "cd ../ && husky install ./ui/.husky",
- "postinstall": "npm run build-libraries"
+ "prepare": "cd ../ && husky install ./ui/.husky"
},
"dependencies": {
"@ali-hm/angular-tree-component": "12.0.5",
@@ -63,8 +62,7 @@
"datatables.net": "^1.13.1",
"datatables.net-dt": "^1.13.1",
"date-fns": "^2.30.0",
- "echarts": "^5.4.3",
- "echarts-gl": "^2.0.9",
+ "echarts": "^5.5.0",
"echarts-simple-transform": "^1.0.0",
"echarts-wordcloud": "^2.1.0",
"es-module-shims": "^1.5.12",
diff --git a/ui/projects/streampipes/platform-services/package.json b/ui/projects/streampipes/platform-services/package.json
index a4af996a32..73aa6ea2b0 100644
--- a/ui/projects/streampipes/platform-services/package.json
+++ b/ui/projects/streampipes/platform-services/package.json
@@ -8,7 +8,7 @@
"angular-gridster2": "^17.0.0"
},
"dependencies": {
- "tslib": "^2.5.0"
+ "tslib": "^2.6.2"
},
"devDependencies": {
"karma": "~6.4.1",
diff --git a/ui/projects/streampipes/shared-ui/package.json b/ui/projects/streampipes/shared-ui/package.json
index 6b2a52d638..ebc28d47d7 100644
--- a/ui/projects/streampipes/shared-ui/package.json
+++ b/ui/projects/streampipes/shared-ui/package.json
@@ -13,6 +13,6 @@
"rxjs": "^7.5.7"
},
"dependencies": {
- "tslib": "^2.5.0"
+ "tslib": "^2.6.2"
}
}
diff --git a/ui/projects/streampipes/shared-ui/tsconfig.lib.prod.json b/ui/projects/streampipes/shared-ui/tsconfig.lib.prod.json
index 06de549e10..0baca7aa93 100644
--- a/ui/projects/streampipes/shared-ui/tsconfig.lib.prod.json
+++ b/ui/projects/streampipes/shared-ui/tsconfig.lib.prod.json
@@ -2,6 +2,9 @@
{
"extends": "./tsconfig.lib.json",
"compilerOptions": {
+ "paths": {
+ "@streampipes/platform-services": ["dist/streampipes/platform-services"]
+ },
"declarationMap": false
},
"angularCompilerOptions": {
diff --git a/ui/src/app/add/add.module.ts b/ui/src/app/add/add.module.ts
index 4ec4b3cede..82fd038c30 100644
--- a/ui/src/app/add/add.module.ts
+++ b/ui/src/app/add/add.module.ts
@@ -34,7 +34,7 @@ import { EndpointInstallationComponent } from './dialogs/endpoint-installation/e
import { PipelineElementNameFilter } from './filter/pipeline-element-name.pipe';
import { PipelineElementInstallationStatusFilter } from './filter/pipeline-element-installation-status.pipe';
import { RouterModule } from '@angular/router';
-import { SharedUiModule } from '../../../projects/streampipes/shared-ui/src/lib/shared-ui.module';
+import { SharedUiModule } from '@streampipes/shared-ui';
@NgModule({
imports: [
diff --git a/ui/src/app/connect/services/adapter-template.service.ts b/ui/src/app/connect/services/adapter-template.service.ts
index 34969c5b61..ed0f859c29 100644
--- a/ui/src/app/connect/services/adapter-template.service.ts
+++ b/ui/src/app/connect/services/adapter-template.service.ts
@@ -19,7 +19,7 @@
import { Injectable } from '@angular/core';
import { SpAdapterTemplateDialogComponent } from '../dialog/adapter-template/adapter-template-dialog.component';
import { DialogService, PanelType } from '@streampipes/shared-ui';
-import { StaticPropertyUnion } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
+import { StaticPropertyUnion } from '@streampipes/platform-services';
@Injectable({ providedIn: 'root' })
export class AdapterTemplateService {
diff --git a/ui/src/app/editor/services/pipeline-validation.service.ts b/ui/src/app/editor/services/pipeline-validation.service.ts
index 791b632ba8..fffb402232 100644
--- a/ui/src/app/editor/services/pipeline-validation.service.ts
+++ b/ui/src/app/editor/services/pipeline-validation.service.ts
@@ -26,11 +26,11 @@ import {
import {
DataProcessorInvocation,
DataSinkInvocation,
+ PipelineModificationMessage,
} from '@streampipes/platform-services';
import { JsplumbFactoryService } from './jsplumb-factory.service';
import { UserErrorMessage } from '../../core-model/base/UserErrorMessage';
import { Connection } from '@jsplumb/browser-ui';
-import { PipelineModificationMessage } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
@Injectable({ providedIn: 'root' })
export class PipelineValidationService {
diff --git a/ui/src/app/home/home.component.ts b/ui/src/app/home/home.component.ts
index 6670c28a61..0cb6585c43 100644
--- a/ui/src/app/home/home.component.ts
+++ b/ui/src/app/home/home.component.ts
@@ -37,9 +37,9 @@ import {
Pipeline,
PipelineElementService,
PipelineService,
+ UserInfo,
} from '@streampipes/platform-services';
import { zip } from 'rxjs';
-import { UserInfo } from '../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
@Component({
templateUrl: './home.component.html',
diff --git a/ui/src/app/pipelines/pipelines.module.ts b/ui/src/app/pipelines/pipelines.module.ts
index 79b34d02b4..65537aefdc 100644
--- a/ui/src/app/pipelines/pipelines.module.ts
+++ b/ui/src/app/pipelines/pipelines.module.ts
@@ -39,7 +39,7 @@ import { MatTableModule } from '@angular/material/table';
import { PipelineNotificationsComponent } from './dialog/pipeline-notifications/pipeline-notifications.component';
import { CoreUiModule } from '../core-ui/core-ui.module';
import { PlatformServicesModule } from '@streampipes/platform-services';
-import { SharedUiModule } from '../../../projects/streampipes/shared-ui/src/lib/shared-ui.module';
+import { SharedUiModule } from '@streampipes/shared-ui';
import { EditorModule } from '../editor/editor.module';
import { PipelineDetailsModule } from '../pipeline-details/pipeline-details.module';
import { RouterModule } from '@angular/router';
diff --git a/ui/src/federation.config.js b/ui/src/federation.config.js
index d1f7ef387b..5c8f3753d7 100644
--- a/ui/src/federation.config.js
+++ b/ui/src/federation.config.js
@@ -23,13 +23,24 @@ const {
module.exports = withNativeFederation({
shared: {
- // '@angular/core': {
+ ...shareAll({
+ singleton: true,
+ strictVersion: true,
+ requiredVersion: 'auto',
+ }),
+ // '@angular/animations': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
// eager: true,
// },
- // '@angular/core/primitives/signals': {
+ // '@angular/animations/browser': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/core': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
@@ -47,127 +58,266 @@ module.exports = withNativeFederation({
// requiredVersion: 'auto',
// eager: true,
// },
+ // '@angular/compiler': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
// '@angular/forms': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
// eager: true,
// },
+ // '@angular/platform-browser': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/platform-browser/animations': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/platform-browser-dynamic': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
// '@angular/router': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
// eager: true,
// },
- // '@ngbracket/ngx-layout': {
+ // '@angular/cdk': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
- // includeSecondaries: true
+ // eager: true,
// },
- // '@ngbracket/ngx-layout/core': {
+ // '@angular/dialog': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
- // includeSecondaries: true
+ // eager: true,
// },
- // '@ngbracket/ngx-layout/extended': {
+ // '@angular/cdk/a11y': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
- // includeSecondaries: true
+ // eager: true,
// },
- // '@ngbracket/ngx-layout/_private-utils': {
+ // '@angular/cdk/accordion': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
- // includeSecondaries: true
+ // eager: true,
// },
- // '@ngbracket/ngx-layout/flex': {
+ // '@angular/cdk/bidi': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
- // includeSecondaries: true
+ // eager: true,
// },
- // '@ngbracket/ngx-layout/grid': {
+ // '@angular/cdk/coercion': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
- // includeSecondaries: true
+ // eager: true,
+ // },
+ // '@angular/cdk/collections': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/cdk/keycodes': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/cdk/layout': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/cdk/observers': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/cdk/platform': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/cdk/scrolling': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/cdk/stepper': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/cdk/table': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/cdk/overlay': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/cdk/portal': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
// },
// '@angular/material': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
- // includeSecondaries: true
+ // eager: true,
+ // },
+ // '@angular/material/autocomplete': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
// },
// '@angular/material/core': {
// singleton: true,
- // strictVersion: true,
+ // strictVersion: false,
// requiredVersion: 'auto',
- // includeSecondaries: true
+ // eager: true,
// },
// '@angular/material/button': {
// singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/checkbox': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/grid-list': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/icon': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/input': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/list': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/menu': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/progress-spinner': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/tabs': {
+ // singleton: true,
+ // strictVersion: false,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/tooltip': {
+ // singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
// eager: true,
// },
- // '@angular/material/progress-bar': {
+ // '@angular/material/dialog': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
// eager: true,
// },
- // '@angular/cdk': {
+ // '@angular/material/divider': {
// singleton: true,
// strictVersion: true,
// requiredVersion: 'auto',
// eager: true,
// },
- ...shareAll({
+ // '@angular/material/select': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@angular/material/form-field': {
+ // singleton: true,
+ // strictVersion: true,
+ // requiredVersion: 'auto',
+ // eager: true,
+ // },
+ // '@streampipes/shared-ui': {
+ // singleton: true,
+ // strictVersion: true,
+ // version: '0.0.1',
+ // eager: true,
+ // },
+ '@streampipes/platform-services': {
+ singleton: true,
+ strictVersion: true,
+ version: '0.0.1',
+ eager: true,
+ },
+ '@angular/core/primitives/signals': {
singleton: true,
strictVersion: true,
requiredVersion: 'auto',
- }),
+ eager: true,
+ },
},
skip: [
- 'material-icons',
- 'rxjs/ajax',
- 'rxjs/fetch',
- 'rxjs/testing',
- 'rxjs/webSocket',
- 'jquery',
- 'jquery-ui-dist',
- 'd3-array/umd',
- 'd3-array/default',
- 'd3-contour/umd',
- 'd3-contour/default',
- 'd3-contour',
- 'konva',
- pkg => pkg.startsWith('marked'),
- pkg => pkg.startsWith('swagger-ui'),
- pkg => pkg.startsWith('date-fns'),
- 'roboto-fontface',
- // '@angular/platform-server',
- // 'ngx-markdown',
- // 'date-fns',
- // '@ngbracket/ngx-layout/server',
- // (pkg) => pkg.startsWith('echarts'),
- // 'echarts-gl',
- // 'echarts-wordcloud',
- // 'file-saver',
- // 'ngx-quill',
- // 'ngx-markdown',
- // 'quill',
- // 'shepherd.js',
- // 'stream-browserify',
- // 'tslib',
pkg => {
return (
(!pkg.startsWith('@angular') &&
- !pkg.startsWith('@ngbracket')) ||
+ !pkg.startsWith('@ngbracket') &&
+ !pkg.startsWith('@streampipes')) ||
pkg.startsWith('@angular/platform-server') ||
pkg.startsWith('@ngbracket/ngx-layout/server')
);
diff --git a/ui/src/tsconfig.app.json b/ui/src/tsconfig.app.json
index d0f5c0e935..2a264aa594 100644
--- a/ui/src/tsconfig.app.json
+++ b/ui/src/tsconfig.app.json
@@ -1,6 +1,14 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
+ "paths": {
+ "@streampipes/platform-services": [
+ "../projects/streampipes/platform-services/src/public-api.ts"
+ ],
+ "@streampipes/shared-ui": [
+ "../projects/streampipes/shared-ui/src/public-api.ts"
+ ]
+ },
"outDir": "../out-tsc/app",
"baseUrl": "./",
"types": []
diff --git a/ui/src/tsconfig.federation.json b/ui/src/tsconfig.federation.json
index bc2ba4092a..53a5c988bb 100644
--- a/ui/src/tsconfig.federation.json
+++ b/ui/src/tsconfig.federation.json
@@ -1,6 +1,14 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
+ "paths": {
+ "@streampipes/platform-services": [
+ "../projects/streampipes/platform-services/src/public-api.ts"
+ ],
+ "@streampipes/shared-ui": [
+ "../projects/streampipes/shared-ui/src/public-api.ts"
+ ]
+ },
"outDir": "../out-tsc/app",
"baseUrl": "./",
"types": []
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
index e22d1ad63c..51016a1975 100644
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@@ -1,14 +1,6 @@
{
"compileOnSave": false,
"compilerOptions": {
- "paths": {
- "@streampipes/platform-services": [
- "projects/streampipes/platform-services/src/public-api.ts"
- ],
- "@streampipes/shared-ui": [
- "projects/streampipes/shared-ui/src/public-api.ts"
- ]
- },
"downlevelIteration": true,
"importHelpers": true,
"outDir": "./dist/out-tsc",