@tryghost/bookshelf-collision 2.0.3 → 2.1.0

package/README.md

@@ -6,8 +6,7 @@
 
 or
 
-`yarn add @tryghost/bookshelf-collision`
-
+`pnpm add @tryghost/bookshelf-collision`
 
 ## Purpose
 
@@ -15,29 +14,24 @@ Bookshelf plugin that detects stale updates and throws an update-collision error
 
 ## Usage
 
-
 ## Develop
 
-This is a mono repository, managed with [lerna](https://lernajs.io/).
+This is a mono repository, managed with [Nx](https://nx.dev).
 
 Follow the instructions for the top-level repo.
-1. `git clone` this repo & `cd` into it as usual
-2. Run `yarn` to install top-level dependencies.
 
+1. `git clone` this repo & `cd` into it as usual
+2. Run `pnpm install` to install top-level dependencies.
 
 ## Run
 
-- `yarn dev`
-
+- `pnpm dev`
 
 ## Test
 
-- `yarn lint` run just eslint
-- `yarn test` run lint and tests
-
-
-
+- `pnpm lint` runs oxlint
+- `pnpm test` runs lint and tests
 
-# Copyright & License 
+# Copyright & License
 
-Copyright (c) 2013-2026 Ghost Foundation - Released under the [MIT license](LICENSE).
+Copyright (c) 2013-2026 Ghost Foundation - Released under the [MIT license](LICENSE).

package/lib/bookshelf-collision.js

@@ -30,9 +30,11 @@ module.exports = function (Bookshelf) {
             const self = this;
 
             // CASE: only enabled for posts table
-            if (this.tableName !== 'posts' ||
+            if (
+                this.tableName !== 'posts' ||
                 !self.serverData ||
-                ((options.method !== 'update' && options.method !== 'patch') || !options.method)
+                (options.method !== 'update' && options.method !== 'patch') ||
+                !options.method
             ) {
                 return parentSync;
             }
@@ -49,11 +51,19 @@ module.exports = function (Bookshelf) {
             parentSync.update = async function update() {
                 const response = await originalUpdateSync.apply(this, arguments);
                 const changed = _.omit(self._changed, [
-                    'created_at', 'updated_at', 'author_id', 'id',
-                    'published_by', 'updated_by', 'html', 'plaintext'
+                    'created_at',
+                    'updated_at',
+                    'author_id',
+                    'id',
+                    'published_by',
+                    'updated_by',
+                    'html',
+                    'plaintext',
                 ]);
 
-                const clientUpdatedAt = moment(self.clientData.updated_at || self.serverData.updated_at || new Date());
+                const clientUpdatedAt = moment(
+                    self.clientData.updated_at || self.serverData.updated_at || new Date(),
+                );
                 const serverUpdatedAt = moment(self.serverData.updated_at || clientUpdatedAt);
 
                 const changedFields = Object.keys(changed);
@@ -68,8 +78,8 @@ module.exports = function (Bookshelf) {
                             errorDetails: {
                                 changedFields,
                                 clientUpdatedAt: self.clientData.updated_at,
-                                serverUpdatedAt: self.serverData.updated_at
-                            }
+                                serverUpdatedAt: self.serverData.updated_at,
+                            },
                         });
                     }
                 }
@@ -91,7 +101,7 @@ module.exports = function (Bookshelf) {
             this.serverData = _.cloneDeep(this.attributes);
 
             return ParentModel.prototype.save.apply(this, arguments);
-        }
+        },
     });
 
     Bookshelf.Model = Model;

package/package.json

@@ -1,33 +1,33 @@
 {
   "name": "@tryghost/bookshelf-collision",
-  "version": "2.0.3",
+  "version": "2.1.0",
+  "license": "MIT",
+  "author": "Ghost Foundation",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/TryGhost/framework.git",
     "directory": "packages/bookshelf-collision"
   },
-  "author": "Ghost Foundation",
-  "license": "MIT",
-  "main": "index.js",
-  "scripts": {
-    "dev": "echo \"Implement me!\"",
-    "test": "NODE_ENV=testing vitest run --coverage --config ../../vitest.config.ts",
-    "lint": "eslint . --ext .js --cache",
-    "posttest": "yarn lint"
-  },
   "files": [
     "index.js",
     "lib"
   ],
+  "main": "index.js",
   "publishConfig": {
     "access": "public"
   },
+  "dependencies": {
+    "lodash": "4.18.1",
+    "moment-timezone": "^0.5.33",
+    "@tryghost/errors": "3.1.0"
+  },
   "devDependencies": {
-    "sinon": "21.0.2"
+    "sinon": "21.1.2"
   },
-  "dependencies": {
-    "@tryghost/errors": "^3.0.3",
-    "lodash": "4.17.23",
-    "moment-timezone": "^0.5.33"
+  "scripts": {
+    "dev": "echo \"Implement me!\"",
+    "test": "NODE_ENV=testing vitest run --coverage --config ../../vitest.config.ts",
+    "lint": "oxlint -c ../../.oxlintrc.json .",
+    "posttest": "pnpm run lint"
   }
-}
+}