Merge pull request #382 from axonivy/use-esnext-target

Use ESNext as typescript target
axonivy · Nov 6, 2023 · 24c626f · 24c626f
2 parents d14d5a6 + bf29fee
commit 24c626f
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,6 @@ report.xml
 eslint.xml
 **/test-results/*
 playwright-report
+
+
+tsconfig.tsbuildinfo
diff --git a/configs/base.eslintrc.json b/configs/base.eslintrc.json
@@ -21,5 +21,5 @@
     "mocha": true,
     "es6": true
   },
-  "ignorePatterns": ["node_modules", "*.d.ts", ".eslintrc.js"]
+  "ignorePatterns": ["node_modules", "lib", "*.d.ts", ".eslintrc.js"]
 }
diff --git a/configs/base.tsconfig.json b/configs/base.tsconfig.json
@@ -1,5 +1,7 @@
 {
   "compilerOptions": {
+    "composite": true,
+    "incremental": true,
     "skipLibCheck": true,
     "declaration": true,
     "declarationMap": true,
@@ -15,10 +17,10 @@
     "allowSyntheticDefaultImports": true,
     "module": "ESNext",
     "moduleResolution": "node",
-    "target": "es2019",
+    "target": "ESNext",
     "jsx": "react",
     "jsxFactory": "JSX.createElement",
-    "lib": ["es6", "dom", "dom.iterable", "es2019"],
+    "lib": ["dom", "dom.iterable", "ESNext"],
     "sourceMap": true,
     "types": ["node", "reflect-metadata"]
   }

diff --git a/integration/eclipse/package.json b/integration/eclipse/package.json
@@ -21,8 +21,8 @@
     "vite-tsconfig-paths": "^4.2.1"
   },
   "scripts": {
-    "clean": "rimraf lib build/*",
-    "build": "type",
+    "clean": "rimraf lib build/* tsconfig.tsbuildinfo",
+    "build": "tsc --build",
     "build:production": "yarn type && vite build",
     "lint": "eslint -c ./.eslintrc.js --ext .ts ./src",
     "type": "tsc --noEmit",

diff --git a/integration/eclipse/tsconfig.json b/integration/eclipse/tsconfig.json
@@ -4,7 +4,12 @@
     "rootDir": "src",
     "outDir": "lib",
     "baseUrl": ".",
-    "types": ["vite/client"]
+    "types": ["vite/client"],
+    "noEmit": true
   },
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    { "path": "../../packages/inscription" },
+    { "path": "../../packages/editor" },
+  ]
 }
diff --git a/integration/standalone/package.json b/integration/standalone/package.json
@@ -26,10 +26,10 @@
     "vite-tsconfig-paths": "^4.2.1"
   },
   "scripts": {
-    "clean": "rimraf lib build/*",
+    "clean": "rimraf lib build/* tsconfig.tsbuildinfo",
     "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src",
     "type": "tsc --noEmit",
-    "build": "type",
+    "build": "tsc --build",
     "build:production": "yarn type && vite build",
     "webtest": "playwright test",
     "start": "vite"

diff --git a/integration/standalone/tsconfig.json b/integration/standalone/tsconfig.json
@@ -5,7 +5,12 @@
     "outDir": "lib",
     "baseUrl": ".",
     "noImplicitAny": false,
-    "types": ["vite/client"]
+    "types": ["vite/client"],
+    "noEmit": true
   },
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    { "path": "../../packages/inscription" },
+    { "path": "../../packages/editor" },
+  ]
 }
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
   },
   "scripts": {
     "build": "yarn && lerna run build",
+    "clean": "lerna run clean",
     "build:production": "lerna run build:production",
     "lint": "lerna run lint --",
     "type": "lerna run type",

diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -43,8 +43,8 @@
     "typescript": "^5.2.2"
   },
   "scripts": {
-    "clean": "rimraf lib",
-    "build": "yarn tsc",
+    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "build": "tsc --build",
     "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src",
     "type": "tsc --noEmit",
     "test:mocha": "mocha --config ../../configs/.mocharc.json \"./tests/**/*.spec.?(ts|tsx)\"",

diff --git a/packages/editor/src/diagram/views.tsx b/packages/editor/src/diagram/views.tsx
@@ -58,7 +58,7 @@ export class WorkflowEdgeView extends PolylineEdgeViewWithGapsOnIntersections {
 
   protected renderAdditionals(edge: Edge, segments: Point[], context: RenderingContext): VNode[] {
     const additionals = super.renderAdditionals(edge, segments, context);
-    const edgePadding = EdgePadding.from(edge);
+    const edgePadding = this.edgePadding(edge);
     const edgePaddingNode = edgePadding ? [this.renderMouseHandle(segments, edgePadding)] : [];
 
     const p1 = segments[segments.length - 2];
@@ -76,6 +76,13 @@ export class WorkflowEdgeView extends PolylineEdgeViewWithGapsOnIntersections {
     return additionals;
   }
 
+  private edgePadding(edge: Edge) {
+    if (edge.args) {
+      return EdgePadding.from(edge);
+    }
+    return undefined;
+  }
+
   protected renderMouseHandle(segments: Point[], padding: number): VNode {
     return (
       <path

diff --git a/packages/editor/src/edit-label/edit-label-tool.ts b/packages/editor/src/edit-label/edit-label-tool.ts
@@ -5,8 +5,6 @@ import { injectable } from 'inversify';
 export class IvyDirectLabelEditTool extends DirectLabelEditTool {
   static readonly ID = 'glsp.direct-label-edit-tool';
 
-  protected editLabelKeyListener: KeyListener;
-
   get id(): string {
     return DirectLabelEditTool.ID;
   }

diff --git a/packages/editor/src/tools/node-creation-tool.ts b/packages/editor/src/tools/node-creation-tool.ts
@@ -5,20 +5,16 @@ import {
   getAbsolutePosition,
   NodeCreationTool,
   NodeCreationToolMouseListener,
-  SModelElement,
-  ISnapper,
-  TYPES
+  SModelElement
 } from '@eclipse-glsp/client';
 import { TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
-import { inject, injectable, optional } from 'inversify';
+import { injectable } from 'inversify';
 import { addNegativeArea, removeNegativeArea } from './negative-area/model';
 
 @injectable()
 export class IvyNodeCreationTool extends NodeCreationTool {
   static ID = 'tool_create_node';
 
-  @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
-
   protected ivyCreationToolMouseListener: NodeCreationToolMouseListener;
 
   enable(): void {

diff --git a/packages/editor/tsconfig.json b/packages/editor/tsconfig.json
@@ -6,5 +6,8 @@
     "baseUrl": ".",
     "skipLibCheck": true
   },
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    { "path": "../protocol" },
+  ]
 }
diff --git a/packages/inscription/package.json b/packages/inscription/package.json
@@ -25,8 +25,8 @@
     "typescript": "^5.2.2"
   },
   "scripts": {
-    "clean": "rimraf lib",
-    "build": "tsc",
+    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "build": "tsc --build",
     "type": "tsc --noEmit",
     "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src"
   },

diff --git a/packages/inscription/tsconfig.json b/packages/inscription/tsconfig.json
@@ -6,5 +6,9 @@
     "baseUrl": ".",
     "skipLibCheck": true
   },
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    { "path": "../protocol" },
+    { "path": "../editor" },
+  ]
 }
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
@@ -25,8 +25,8 @@
     "typescript": "^5.2.2"
   },
   "scripts": {
-    "clean": "rimraf lib",
-    "build": "tsc",
+    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "build": "tsc --build",
     "type": "tsc --noEmit",
     "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src"
   },