Merge branch 'feat/another-overhaul' into feat/internal-overhaul

Author: Pckool

.trunk/trunk.yaml

@@ -1,10 +1,10 @@
 version: 0.1
 cli:
-  version: 1.14.2
+  version: 1.15.0
 plugins:
   sources:
     - id: trunk
-      ref: v1.1.0
+      ref: v1.2.1
       uri: https://github.com/trunk-io/plugins
 lint:
   threshold:

docs/docs/api-reference/PlexusActionHelpers.mdx

@@ -12,7 +12,6 @@ The action helpers for a defined plexus action
   - [.onCatch(handler, useGlobal)](#PlexusActionHelpers+onCatch)
   - [.runErrorHandlers()](#PlexusActionHelpers+runErrorHandlers)
   - [.ignoreInit()](#PlexusActionHelpers+ignoreInit)
-  - [.batch(fn)](#PlexusActionHelpers+batch)
 
 <a name='PlexusActionHelpers+catchError'></a>
 
@@ -51,16 +50,3 @@ The action helpers for a defined plexus action
 ### .ignoreInit()
 
 <p>Ignore the default halt for preActions</p>
-
-<a name='PlexusActionHelpers+batch'></a>
-
-### .batch(fn)
-
-<p>
-	Run a function. During that function's execution, any state changes will be
-	batched and only applied once the function has finished.
-</p>
-
-| Param | Description                           |
-| ----- | ------------------------------------- |
-| fn    | <p>The function to run in a batch</p> |

docs/docs/api-reference/Scope.mdx

@@ -11,8 +11,6 @@ Create a new PlexusJS plugin
   - [.computed(item)](#Scope+computed) ⇒
   - [.event()](#Scope+event) ⇒
   - [.collection(config)](#Scope+collection) ⇒
-  - [.action(fn)](#Scope+action) ⇒
-  - [.batchAction(fn)](#Scope+batchAction) ⇒
   - [.batch(fn)](#Scope+batch)
   - [.preaction(fn)](#Scope+preaction) ⇒
 
@@ -60,30 +58,6 @@ Create a new PlexusJS plugin
 | ------ | ------------------------------------------- |
 | config | <p>The configuration for the collection</p> |
 
-<a name='Scope+action'></a>
-
-### .action(fn) ⇒
-
-<p>Generate a Plexus Action</p>
-
-**Returns**: <p>The intended return value of fn, or null if an error is caught</p>
-
-| Param | Description                              |
-| ----- | ---------------------------------------- |
-| fn    | <p>The Plexus action function to run</p> |
-
-<a name='Scope+batchAction'></a>
-
-### .batchAction(fn) ⇒
-
-<p>Generate a Plexus Action</p>
-
-**Returns**: <p>The intended return value of fn, or null if an error is caught</p>
-
-| Param | Description                              |
-| ----- | ---------------------------------------- |
-| fn    | <p>The Plexus action function to run</p> |
-
 <a name='Scope+batch'></a>
 
 ### .batch(fn)

docs/docs/api-reference/action.mdx

@@ -17,15 +17,3 @@ Generate a Plexus Action
 | Param | Description                              |
 | ----- | ---------------------------------------- |
 | fn    | <p>The Plexus action function to run</p> |
-
-<a name='Scope+action'></a>
-
-## .action(fn) ⇒
-
-<p>Generate a Plexus Action</p>
-
-**Returns**: <p>The intended return value of fn, or null if an error is caught</p>
-
-| Param | Description                              |
-| ----- | ---------------------------------------- |
-| fn    | <p>The Plexus action function to run</p> |

docs/docs/api-reference/batch.mdx

@@ -19,9 +19,9 @@ Run a function. During that function's execution, any state changes will be batc
 | ----- | ------------------------------------- |
 | fn    | <p>The function to run in a batch</p> |
 
-<a name='PlexusActionHelpers+batch'></a>
+<a name='batch'></a>
 
-## .batch(fn)
+## batch(fn)
 
 <p>
 	Run a function. During that function's execution, any state changes will be

docs/docs/api-reference/batchAction.mdx

@@ -17,15 +17,3 @@ Generate a Plexus Action
 | Param | Description                              |
 | ----- | ---------------------------------------- |
 | fn    | <p>The Plexus action function to run</p> |
-
-<a name='Scope+batchAction'></a>
-
-## .batchAction(fn) ⇒
-
-<p>Generate a Plexus Action</p>
-
-**Returns**: <p>The intended return value of fn, or null if an error is caught</p>
-
-| Param | Description                              |
-| ----- | ---------------------------------------- |
-| fn    | <p>The Plexus action function to run</p> |

docs/docs/api-reference/onCatch.mdx

@@ -0,0 +1,34 @@
+---
+title: onCatch
+---
+
+[![view on npm](http://img.shields.io/npm/v/@plexusjs/core.svg)](https://www.npmjs.org/package/@plexusjs/core)
+
+Add a new error handler for this action. This will catch any errors that occur during the execution of this action and prevent a crash.
+
+<a name='onCatch'></a>
+
+## onCatch(handler?)
+
+<p>
+	Add a new error handler for this action. This will catch any errors that occur
+	during the execution of this action and prevent a crash.
+</p>
+
+| Param    | Description                                                                        |
+| -------- | ---------------------------------------------------------------------------------- |
+| handler? | <p>A function that will be called when an error occurs; omit to fail silently.</p> |
+
+<a name='PlexusActionHelpers+onCatch'></a>
+
+## .onCatch(handler, useGlobal)
+
+<p>
+	Add a new error handler for this action. This will catch any errors that occur
+	during the execution of this action and prevent a crash.
+</p>
+
+| Param     | Default           | Description                                                                        |
+| --------- | ----------------- | ---------------------------------------------------------------------------------- |
+| handler   |                   | <p>A function that will be called when an error occurs; omit to fail silently.</p> |
+| useGlobal | <code>true</code> | <p>Should the global error handler be used? (default: true)</p>                    |

jest.config.ts

@@ -1,5 +1,5 @@
 {
-	"version": "1.10.3",
+	"version": "1.10.4",
 	"npmClient": "yarn",
 	"useNx": true,
 	"packages": ["packages/*"],

lerna.json

@@ -20,7 +20,7 @@
 		"bootstrap": "lerna bootstrap --use-workspaces",
 		"build": "lerna run build",
 		"postbuild": "yarn docs:generate:ref",
-		"dev": "lerna run build && lerna watch -- lerna run build --since",
+		"dev": "lerna run build && lerna watch -- lerna run build --scope=$LERNA_PACKAGE_NAME",
 		"prereleaseOnly": "pinst --disable && echo '🚀  Publishing...'",
 		"release-canary": "lerna run build && lerna publish --preid canary --no-private --yes --force-publish --canary",
 		"release-stable": "lerna run build && lerna publish --preid canary --no-private --yes --force-publish",
@@ -41,7 +41,6 @@
 		"@testing-library/react": "^14.0.0",
 		"@trunkio/launcher": "^1.2.3",
 		"@types/fs-readdir-recursive": "^1.1.0",
-		"@types/jest": "^27.4.0",
 		"@types/jsdoc-to-markdown": "^7.0.3",
 		"@types/node": "^18.11.11",
 		"@types/react": "^18.0.17",
@@ -50,11 +49,9 @@
 		"@types/recursive-readdir": "^2.2.1",
 		"@vitejs/plugin-react": "^4.0.4",
 		"@vitest/ui": "^0.34.2",
-		"babel-jest": "^27.4.6",
 		"chalk": "4",
 		"fs-readdir-recursive": "^1.1.0",
 		"happy-dom": "^10.10.4",
-		"jest": "^27.4.7",
 		"jsdoc-babel": "^0.5.0",
 		"jsdoc-to-markdown": "^8.0.0",
 		"jsdom": "^20.0.1",
@@ -68,9 +65,8 @@
 		"react-dom": "^18",
 		"react-test-renderer": "^18.2.0",
 		"recursive-readdir": "^2.2.3",
-		"ts-jest": "^27.1.2",
 		"ts-node": "^10.9.1",
-		"typescript": "^5.1.6",
+		"typescript": "^5.2.2",
 		"vite": "^4.4.9",
 		"vitest": "^0.34.2",
 		"yargs": "^17.4.1"