codecharta-visualization 1.119.0 → 1.120.0

package/dist/webpack/main.js

@@ -0,0 +1,52 @@
+// main.js
+
+// Modules to control application life and create native browser window
+const { app, BrowserWindow, shell } = require("electron")
+const path = require("path")
+
+const createWindow = () => {
+	// Create the browser window.
+	const mainWindow = new BrowserWindow({
+		width: 1400,
+		height: 900,
+		icon: path.join(__dirname, "codeCharta/assets/icon.ico")
+	})
+
+	// open links in web browser instead of in electron
+	mainWindow.webContents.setWindowOpenHandler(({ url }) => {
+		shell.openExternal(url)
+		return { action: "deny" }
+	})
+
+	// and load the index.html of the app
+	mainWindow.loadFile(path.join(__dirname, "index.html"))
+
+	// Open the DevTools.
+	// mainWindow.webContents.openDevTools()
+}
+
+app.enableSandbox()
+
+// This method will be called when Electron has finished
+// initialization and is ready to create browser windows.
+// Some APIs can only be used after this event occurs.
+app.whenReady().then(() => {
+	createWindow()
+
+	app.on("activate", () => {
+		// On macOS it's common to re-create a window in the app when the
+		// dock icon is clicked and there are no other windows open.
+		if (BrowserWindow.getAllWindows().length === 0) {
+			createWindow()
+		}
+	})
+})
+
+// Quit when all windows are closed, except on macOS. There, it's common
+// for applications and their menu bar to stay active until the user quits
+// explicitly with Cmd + Q.
+app.on("window-all-closed", () => {
+	if (process.platform !== "darwin") {
+		app.quit()
+	}
+})

package/dist/webpack/package.json

@@ -0,0 +1,132 @@
+{
+	"author": "MaibornWolff GmbH <dist_intern_codecharta@maibornwolff.de>",
+	"homepage": "https://maibornwolff.github.io/codecharta/",
+	"bugs": {
+		"url": "https://github.com/MaibornWolff/codecharta/issues",
+		"email": "dist_intern_codecharta@maibornwolff.de"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/MaibornWolff/codecharta.git"
+	},
+	"name": "codecharta-visualization",
+	"version": "1.120.0",
+	"engines": {
+		"node": ">=16"
+	},
+	"description": "MaibornWolff CodeCharta",
+	"files": [
+		"dist/webpack",
+		"conf",
+		"Dockerfile",
+		"LICENSE.md",
+		"package.json",
+		"package-lock.json",
+		"README.md",
+		"tsconfig.json",
+		"cli.js"
+	],
+	"codecharta": {
+		"apiVersion": "1.3"
+	},
+	"main": "main.js",
+	"browserslist": [
+		"last 2 chrome version",
+		"last 2 firefox version",
+		"last 2 safari version"
+	],
+	"scripts": {
+		"start": "electron dist/webpack",
+		"build": "ng build && cp electron/* package.json dist/webpack",
+		"dev": "ng serve",
+		"test": "jest --config conf/jestUnit.config.json .*\\.spec\\.ts",
+		"test:auto": "npm test -- --watch",
+		"test:autoNoCoverage": "npm run test:auto -- --coverage false",
+		"test:updateSnaps": "npm test -- --updateSnapshot",
+		"e2e": "jest --config conf/jestE2E.config.json .*\\.e2e\\.ts --coverage false",
+		"e2e:auto": "npm run e2e -- --watch",
+		"e2e:ci": "npm run e2e -- --runInBand",
+		"package": "node script/appMain.js",
+		"package:local": "npm run package -- --local",
+		"package:zip": "node script/package-zips.js",
+		"lint": "eslint \"app/**/*.ts\"",
+		"lint:fix": "npm run lint -- --fix",
+		"precommit": "lint-staged",
+		"schema:generate": "typescript-json-schema ./app/codeCharta/codeCharta.model.ts ExportCCFile --required --topRef --out app/codeCharta/util/generatedSchema.json"
+	},
+	"lint-staged": {
+		"app/**/*.ts": "eslint --fix"
+	},
+	"bin": {
+		"codecharta-visualization": "cli.js"
+	},
+	"license": "BSD-3-Clause",
+	"dependencies": {
+		"@angular/animations": "^15.1.1",
+		"@angular/cdk": "^15.1.1",
+		"@angular/common": "^15.1.1",
+		"@angular/core": "^15.1.1",
+		"@angular/forms": "^15.1.1",
+		"@angular/material": "^15.1.1",
+		"@angular/platform-browser": "^15.1.1",
+		"@angular/platform-browser-dynamic": "^15.1.1",
+		"@ngrx/effects": "^15.4.0",
+		"@ngrx/store": "^15.4.0",
+		"ajv": "^6.12.6",
+		"color-convert": "^2.0.1",
+		"d3-hierarchy": "^2.0.0",
+		"dequal": "^2.0.3",
+		"electron": "27.0.2",
+		"font-awesome": "^4.7.0",
+		"hotkeys-js": "^3.8.2",
+		"ignore": "^5.1.8",
+		"klona": "^2.0.4",
+		"material-icons": "^1.10.4",
+		"md5": "^2.3.0",
+		"ngx-color": "^7.3.3",
+		"pako": "^2.0.4",
+		"percent-round": "^2.2.1",
+		"rxjs": "^7.5.1",
+		"shelljs": "^0.8.4",
+		"three": "^0.126.1",
+		"three-orbit-controls": "^82.1.0",
+		"typescript-json-schema": "0.56.0",
+		"zone.js": "^0.12.0"
+	},
+	"devDependencies": {
+		"@angular-builders/custom-webpack": "^15.0.0",
+		"@angular-devkit/build-angular": "^15.1.2",
+		"@angular/cli": "^15.1.2",
+		"@angular/compiler": "^15.1.1",
+		"@angular/compiler-cli": "^15.1.1",
+		"@babel/plugin-proposal-class-static-block": "^7.20.7",
+		"@electron/get": "^2.0.3",
+		"@testing-library/angular": "^13.1.0",
+		"@testing-library/user-event": "^14.0.0",
+		"@types/color-convert": "^2.0.0",
+		"@types/d3-hierarchy": "^3.0.2",
+		"@types/expect-puppeteer": "^5.0.2",
+		"@types/jest-environment-puppeteer": "^5.0.3",
+		"@types/node": "^18.0.0",
+		"@types/three": "^0.126.0",
+		"@typescript-eslint/eslint-plugin": "^5.44.0",
+		"@typescript-eslint/parser": "^5.44.0",
+		"bestzip": "^2.2.0",
+		"electron-packager": "^17.1.2",
+		"eslint": "^8.28.0",
+		"eslint-config-prettier": "^8.5.0",
+		"eslint-plugin-unicorn": "^47.0.0",
+		"eslint-plugin-unused-imports": "^2.0.0",
+		"html-loader": "^4.0.0",
+		"jest": "^29.4.3",
+		"jest-canvas-mock": "^2.4.0",
+		"jest-preset-angular": "^13.0.0",
+		"jest-puppeteer": "^6.1.1",
+		"lint-staged": "^13.0.0",
+		"marked": "^4.3.0",
+		"puppeteer": "^17.0.0",
+		"ts-jest": "^29.0.5",
+		"typescript": "~4.9.4",
+		"webpack-glsl-loader": "^1.0.1"
+	}
+}

package/package.json

@@ -10,14 +10,13 @@
 		"url": "https://github.com/MaibornWolff/codecharta.git"
 	},
 	"name": "codecharta-visualization",
-	"version": "1.119.0",
+	"version": "1.120.0",
 	"engines": {
 		"node": ">=16"
 	},
 	"description": "MaibornWolff CodeCharta",
 	"files": [
 		"dist/webpack",
-		"app",
 		"conf",
 		"Dockerfile",
 		"LICENSE.md",
@@ -30,22 +29,15 @@
 	"codecharta": {
 		"apiVersion": "1.3"
 	},
-	"window": {
-		"icon": "app/codeCharta/assets/icon.png",
-		"toolbar": true,
-		"frame": true,
-		"width": 1024,
-		"height": 768
-	},
-	"main": "dist/webpack/index.html",
+	"main": "main.js",
 	"browserslist": [
 		"last 2 chrome version",
 		"last 2 firefox version",
 		"last 2 safari version"
 	],
 	"scripts": {
-		"start": "nw .",
-		"build": "ng build",
+		"start": "electron dist/webpack",
+		"build": "ng build && cp electron/* package.json dist/webpack",
 		"dev": "ng serve",
 		"test": "jest --config conf/jestUnit.config.json .*\\.spec\\.ts",
 		"test:auto": "npm test -- --watch",
@@ -54,7 +46,9 @@
 		"e2e": "jest --config conf/jestE2E.config.json .*\\.e2e\\.ts --coverage false",
 		"e2e:auto": "npm run e2e -- --watch",
 		"e2e:ci": "npm run e2e -- --runInBand",
-		"package": "node script/build-nwjs.js",
+		"package": "node script/appMain.js",
+		"package:local": "npm run package -- --local",
+		"package:zip": "node script/package-zips.js",
 		"lint": "eslint \"app/**/*.ts\"",
 		"lint:fix": "npm run lint -- --fix",
 		"precommit": "lint-staged",
@@ -82,6 +76,7 @@
 		"color-convert": "^2.0.1",
 		"d3-hierarchy": "^2.0.0",
 		"dequal": "^2.0.3",
+		"electron": "27.0.2",
 		"font-awesome": "^4.7.0",
 		"hotkeys-js": "^3.8.2",
 		"ignore": "^5.1.8",
@@ -89,7 +84,6 @@
 		"material-icons": "^1.10.4",
 		"md5": "^2.3.0",
 		"ngx-color": "^7.3.3",
-		"nw": "^0.75.0",
 		"pako": "^2.0.4",
 		"percent-round": "^2.2.1",
 		"rxjs": "^7.5.1",
@@ -106,6 +100,7 @@
 		"@angular/compiler": "^15.1.1",
 		"@angular/compiler-cli": "^15.1.1",
 		"@babel/plugin-proposal-class-static-block": "^7.20.7",
+		"@electron/get": "^2.0.3",
 		"@testing-library/angular": "^13.1.0",
 		"@testing-library/user-event": "^14.0.0",
 		"@types/color-convert": "^2.0.0",
@@ -117,6 +112,7 @@
 		"@typescript-eslint/eslint-plugin": "^5.44.0",
 		"@typescript-eslint/parser": "^5.44.0",
 		"bestzip": "^2.2.0",
+		"electron-packager": "^17.1.2",
 		"eslint": "^8.28.0",
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-unicorn": "^47.0.0",
@@ -128,7 +124,6 @@
 		"jest-puppeteer": "^6.1.1",
 		"lint-staged": "^13.0.0",
 		"marked": "^4.3.0",
-		"nw-builder": "3.7.4",
 		"puppeteer": "^17.0.0",
 		"ts-jest": "^29.0.5",
 		"typescript": "~4.9.4",

package/app/app.e2e.ts

@@ -1,15 +0,0 @@
-import { goto } from "./puppeteer.helper"
-
-describe("app", () => {
-	beforeEach(async () => {
-		await goto()
-	})
-
-	it("should not have errors in console", async () => {
-		page.on("console", message => {
-			expect(message.type).not.toBe("error")
-		})
-		await goto()
-		await page.waitForSelector("#loading-gif-file", { visible: false })
-	})
-})

package/app/app.module.ts

@@ -1,73 +0,0 @@
-import { APP_INITIALIZER, NgModule } from "@angular/core"
-import { BrowserModule } from "@angular/platform-browser"
-import { platformBrowserDynamic } from "@angular/platform-browser-dynamic"
-import { HttpClientModule } from "@angular/common/http"
-import { FormsModule, ReactiveFormsModule } from "@angular/forms"
-import { MaterialModule } from "./material/material.module"
-import { EffectsModule } from "@ngrx/effects"
-import { UnfocusNodesEffect } from "./codeCharta/state/effects/unfocusNodes/unfocusNodes.effect"
-import { AddBlacklistItemsIfNotResultsInEmptyMapEffect } from "./codeCharta/state/effects/addBlacklistItemsIfNotResultsInEmptyMap/addBlacklistItemsIfNotResultsInEmptyMap.effect"
-import { dialogs } from "./codeCharta/ui/dialogs/dialogs"
-import { OpenNodeContextMenuEffect } from "./codeCharta/state/effects/nodeContextMenu/openNodeContextMenu.effect"
-import { BlacklistSearchPatternEffect } from "./codeCharta/ui/searchPanel/searchBar/blacklistSearchPattern.effect"
-import { UpdateEdgePreviewsEffect } from "./codeCharta/state/effects/updateEdgePreviews/updateEdgePreviews.effect"
-import { ChangelogDialogModule } from "./codeCharta/ui/dialogs/changelogDialog/changelogDialog.module"
-import { VersionService } from "./codeCharta/services/version/version.service"
-import { RenderCodeMapEffect } from "./codeCharta/state/effects/renderCodeMapEffect/renderCodeMap.effect"
-import { AutoFitCodeMapEffect } from "./codeCharta/state/effects/autoFitCodeMapChange/autoFitCodeMap.effect"
-import { CodeChartaModule } from "./codeCharta/codeCharta.module"
-import { UpdateVisibleTopLabelsEffect } from "./codeCharta/state/effects/updateVisibleTopLabels/updateVisibleTopLabels.effect"
-import { LinkColorMetricToHeightMetricEffect } from "./codeCharta/state/effects/linkColorMetricToHeightMetric/linkColorMetricToHeightMetric.effect"
-import { UpdateFileSettingsEffect } from "./codeCharta/state/effects/updateFileSettings/updateFileSettings.effect"
-import { CodeChartaComponent } from "./codeCharta/codeCharta.component"
-import { NodeContextMenuCardModule } from "./codeCharta/state/effects/nodeContextMenu/nodeContextMenuCard/nodeContextMenuCard.module"
-import { StoreModule } from "@ngrx/store"
-import { appReducers, setStateMiddleware } from "./codeCharta/state/store/state.manager"
-import { ResetColorRangeEffect } from "./codeCharta/state/store/dynamicSettings/colorRange/resetColorRange.effect"
-import { ResetChosenMetricsEffect } from "./codeCharta/state/effects/resetChosenMetrics/resetChosenMetrics.effect"
-import { ResetSelectedEdgeMetricWhenItDoesntExistAnymoreEffect } from "./codeCharta/state/effects/resetSelectedEdgeMetricWhenItDoesntExistAnymore/resetSelectedEdgeMetricWhenItDoesntExistAnymore.effect"
-import { SetLoadingIndicatorEffect } from "./codeCharta/state/effects/setLoadingIndicator/setLoadingIndicator.effect"
-
-@NgModule({
-	imports: [
-		BrowserModule,
-		HttpClientModule,
-		StoreModule.forRoot(appReducers, { metaReducers: [setStateMiddleware] }),
-		EffectsModule.forRoot([
-			UnfocusNodesEffect,
-			AddBlacklistItemsIfNotResultsInEmptyMapEffect,
-			OpenNodeContextMenuEffect,
-			BlacklistSearchPatternEffect,
-			ResetColorRangeEffect,
-			ResetChosenMetricsEffect,
-			UpdateEdgePreviewsEffect,
-			RenderCodeMapEffect,
-			AutoFitCodeMapEffect,
-			UpdateVisibleTopLabelsEffect,
-			LinkColorMetricToHeightMetricEffect,
-			ResetSelectedEdgeMetricWhenItDoesntExistAnymoreEffect,
-			UpdateFileSettingsEffect,
-			SetLoadingIndicatorEffect
-		]),
-		MaterialModule,
-		FormsModule,
-		ReactiveFormsModule,
-		ChangelogDialogModule,
-		CodeChartaModule,
-		NodeContextMenuCardModule
-	],
-	providers: [
-		VersionService,
-		{
-			provide: APP_INITIALIZER,
-			useFactory: (config: VersionService) => () => config.synchronizeLocalCodeChartaVersion(),
-			deps: [VersionService],
-			multi: true
-		}
-	],
-	declarations: [...dialogs],
-	bootstrap: [CodeChartaComponent]
-})
-export class AppModule {}
-
-platformBrowserDynamic().bootstrapModule(AppModule)

package/app/app.scss

@@ -1,40 +0,0 @@
-@import "mixins.scss";
-@import "~font-awesome/css/font-awesome.css";
-
-@import "./material/material.scss";
-
-*,
-*:before,
-*:after {
-	@include prefix(
-		(
-			box-sizing: border-box
-		),
-		webkit moz ms o
-	);
-}
-
-html,
-body {
-	overflow-y: hidden;
-	overflow-x: hidden;
-	font-family: Roboto, "Helvetica Neue", sans-serif;
-
-	@include prefix(
-		(
-			user-select: none
-		),
-		webkit moz ms o
-	);
-
-	width: 100%;
-	height: 100%;
-	margin: 0;
-	padding: 0;
-}
-
-button {
-	border: 0;
-	margin: 6px 8px;
-	cursor: pointer;
-}