chore: resolve merge conflicts

atellmer · atellmer · commit 185e00e56b01 · 2025-01-19T14:41:45.000+05:00
diff --git a/packages/animations/package.json b/packages/animations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/animations",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Spring based animations for Dark",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/animations/src/constants.ts b/packages/animations/src/constants.ts
@@ -1,2 +1,2 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/animations';
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/core",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "The lightweight and powerful UI rendering engine without dependencies and written in TypeScript (Browser, Node.js, Android, iOS, Windows, Linux, macOS)",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/core/src/constants.ts b/packages/core/src/constants.ts
@@ -1,4 +1,4 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/core';
 export const ROOT = 'dark:root';
 export const REPLACER = 'dark:matter';
diff --git a/packages/data/package.json b/packages/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/data",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Declarative queries and mutations for Dark",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/data/src/constants.ts b/packages/data/src/constants.ts
@@ -1,3 +1,3 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/data';
 export const ROOT_ID = '__ROOT__';
diff --git a/packages/native-navigation/package.json b/packages/native-navigation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/native-navigation",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Dark navigation for NativeScript platform",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/native-navigation/src/constants.ts b/packages/native-navigation/src/constants.ts
@@ -1,4 +1,4 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/native-navigation';
 export const SLASH_MARK = '/';
 
diff --git a/packages/platform-browser/package.json b/packages/platform-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/platform-browser",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Dark renderer for browser",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/platform-browser/src/constants.ts b/packages/platform-browser/src/constants.ts
@@ -1,4 +1,4 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/platform-browser';
 export const HEAD_TAG = 'head';
 export const TITLE_TAG = 'title';
diff --git a/packages/platform-desktop/package.json b/packages/platform-desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/platform-desktop",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Dark renderer to desktop platforms like Windows, Linux, macOS via Nodegui and Qt",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/platform-desktop/src/constants.ts b/packages/platform-desktop/src/constants.ts
@@ -1,4 +1,4 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/platform-desktop';
 export const TEXT_ATTR = 'text';
 export const HIDDEN_ATTR = 'hidden';
diff --git a/packages/platform-native/package.json b/packages/platform-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/platform-native",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Dark renderer to native platforms like Android and iOS via NativeScript",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/platform-native/src/constants.ts b/packages/platform-native/src/constants.ts
@@ -1,4 +1,4 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/platform-native';
 export const ANDROID = 'android';
 export const IOS = 'ios';
diff --git a/packages/platform-server/package.json b/packages/platform-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/platform-server",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Dark renderer for server",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/platform-server/src/constants.ts b/packages/platform-server/src/constants.ts
@@ -1,3 +1,3 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/platform-server';
 export const DOCTYPE = '<!DOCTYPE html>';
diff --git a/packages/styled/package.json b/packages/styled/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/styled",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Styled components for Dark",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/styled/src/constants.ts b/packages/styled/src/constants.ts
@@ -1,4 +1,4 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/styled';
 export const STYLE_TAG = 'style';
 export const STYLED_ATTR = 'dark-styled';
diff --git a/packages/web-router/package.json b/packages/web-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dark-engine/web-router",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "The isomorphic Dark router designed for rendering universal web applications that work both on the client and on the server",
   "author": "AlexPlex",
   "license": "MIT",
diff --git a/packages/web-router/src/constants.ts b/packages/web-router/src/constants.ts
@@ -1,4 +1,4 @@
-export const VERSION = '1.4.2';
+export const VERSION = '1.5.0';
 export const LIB = '@dark-engine/web-router';
 export const SLASH_MARK = '/';
 export const PARAMETER_MARK = ':';
diff --git a/templates/browser/package.json b/templates/browser/package.json
@@ -6,12 +6,12 @@
     "dev": "npx webpack-dev-server --env development"
   },
   "dependencies": {
-    "@dark-engine/animations": "1.4.2",
-    "@dark-engine/core": "1.4.2",
-    "@dark-engine/data": "1.4.2",
-    "@dark-engine/platform-browser": "1.4.2",
-    "@dark-engine/styled": "1.4.2",
-    "@dark-engine/web-router": "1.4.2"
+    "@dark-engine/animations": "1.5.0",
+    "@dark-engine/core": "1.5.0",
+    "@dark-engine/data": "1.5.0",
+    "@dark-engine/platform-browser": "1.5.0",
+    "@dark-engine/styled": "1.5.0",
+    "@dark-engine/web-router": "1.5.0"
   },
   "devDependencies": {
     "ts-loader": "9.4.2",
diff --git a/templates/desktop/package.json b/templates/desktop/package.json
@@ -6,9 +6,9 @@
     "dev": "npx webpack --watch --env development"
   },
   "dependencies": {
-    "@dark-engine/core": "1.4.2",
-    "@dark-engine/data": "1.4.2",
-    "@dark-engine/platform-desktop": "1.4.2",
+    "@dark-engine/core": "1.5.0",
+    "@dark-engine/data": "1.5.0",
+    "@dark-engine/platform-desktop": "1.5.0",
     "@nodegui/nodegui": "0.70.0"
   },
   "devDependencies": {
diff --git a/templates/native/package.json b/templates/native/package.json
@@ -10,11 +10,11 @@
     "clean": "npx ns clean"
   },
   "dependencies": {
-    "@dark-engine/animations": "1.4.2",
-    "@dark-engine/core": "1.4.2",
-    "@dark-engine/data": "1.4.2",
-    "@dark-engine/native-navigation": "1.4.2",
-    "@dark-engine/platform-native": "1.4.2",
+    "@dark-engine/animations": "1.5.0",
+    "@dark-engine/core": "1.5.0",
+    "@dark-engine/data": "1.5.0",
+    "@dark-engine/native-navigation": "1.5.0",
+    "@dark-engine/platform-native": "1.5.0",
     "@nativescript/core": "8.8.6",
     "@nativescript/theme": "3.1.0"
   },
diff --git a/templates/server/package.json b/templates/server/package.json
@@ -8,13 +8,13 @@
     "frontend:watch": "cd frontend && npx webpack --watch --env development"
   },
   "dependencies": {
-    "@dark-engine/animations": "1.4.2",
-    "@dark-engine/core": "1.4.2",
-    "@dark-engine/data": "1.4.2",
-    "@dark-engine/platform-browser": "1.4.2",
-    "@dark-engine/platform-server": "1.4.2",
-    "@dark-engine/styled": "1.4.2",
-    "@dark-engine/web-router": "1.4.2",
+    "@dark-engine/animations": "1.5.0",
+    "@dark-engine/core": "1.5.0",
+    "@dark-engine/data": "1.5.0",
+    "@dark-engine/platform-browser": "1.5.0",
+    "@dark-engine/platform-server": "1.5.0",
+    "@dark-engine/styled": "1.5.0",
+    "@dark-engine/web-router": "1.5.0",
     "@types/compression": "^1.7.2",
     "@types/express": "^4.17.15",
     "@types/node": "^18.11.17",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dark-engine/animations",`
`3`		`- "version": "1.4.2",`
	`3`	`+ "version": "1.5.0",`
`4`	`4`	`"description": "Spring based animations for Dark",`
`5`	`5`	`"author": "AlexPlex",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-export const VERSION = '1.4.2';`
	`1`	`+export const VERSION = '1.5.0';`
`2`	`2`	`export const LIB = '@dark-engine/animations';`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dark-engine/core",`
`3`		`- "version": "1.4.2",`
	`3`	`+ "version": "1.5.0",`
`4`	`4`	`"description": "The lightweight and powerful UI rendering engine without dependencies and written in TypeScript (Browser, Node.js, Android, iOS, Windows, Linux, macOS)",`
`5`	`5`	`"author": "AlexPlex",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export const VERSION = '1.4.2';`
	`1`	`+export const VERSION = '1.5.0';`
`2`	`2`	`export const LIB = '@dark-engine/core';`
`3`	`3`	`export const ROOT = 'dark:root';`
`4`	`4`	`export const REPLACER = 'dark:matter';`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dark-engine/data",`
`3`		`- "version": "1.4.2",`
	`3`	`+ "version": "1.5.0",`
`4`	`4`	`"description": "Declarative queries and mutations for Dark",`
`5`	`5`	`"author": "AlexPlex",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dark-engine/native-navigation",`
`3`		`- "version": "1.4.2",`
	`3`	`+ "version": "1.5.0",`
`4`	`4`	`"description": "Dark navigation for NativeScript platform",`
`5`	`5`	`"author": "AlexPlex",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dark-engine/platform-browser",`
`3`		`- "version": "1.4.2",`
	`3`	`+ "version": "1.5.0",`
`4`	`4`	`"description": "Dark renderer for browser",`
`5`	`5`	`"author": "AlexPlex",`
`6`	`6`	`"license": "MIT",`