diff --git a/addons/Dexie.Observable/package-lock.json b/addons/Dexie.Observable/package-lock.json index 0c93d77ca..c4823e6df 100644 --- a/addons/Dexie.Observable/package-lock.json +++ b/addons/Dexie.Observable/package-lock.json @@ -9,14 +9,14 @@ "version": "3.0.0-beta.11", "license": "Apache-2.0", "devDependencies": { - "dexie": "^3.0.2", + "dexie": "^3.0.2 || ^4.0.0-alpha.1", "eslint": "^7.27.0", "just-build": "^0.9.19", "qunit": "^2.9.2", "uglify-js": "^3.5.6" }, "peerDependencies": { - "dexie": "^3.0.2" + "dexie": "^3.0.2 || ^4.0.0-alpha.1" } }, "node_modules/@babel/code-frame": { diff --git a/addons/Dexie.Observable/package.json b/addons/Dexie.Observable/package.json index bb50f7bfb..20daede43 100644 --- a/addons/Dexie.Observable/package.json +++ b/addons/Dexie.Observable/package.json @@ -79,10 +79,10 @@ }, "homepage": "https://dexie.org", "peerDependencies": { - "dexie": "^3.0.2" + "dexie": "^3.0.2 || ^4.0.0-alpha.1" }, "devDependencies": { - "dexie": "^3.0.2", + "dexie": "^3.0.2 || ^4.0.0-alpha.1", "eslint": "^7.27.0", "just-build": "^0.9.19", "qunit": "^2.9.2", diff --git a/addons/Dexie.Observable/src/Dexie.Observable.js b/addons/Dexie.Observable/src/Dexie.Observable.js index dbd7ec525..0993893ea 100644 --- a/addons/Dexie.Observable/src/Dexie.Observable.js +++ b/addons/Dexie.Observable/src/Dexie.Observable.js @@ -60,8 +60,8 @@ var browserIsShuttingDown = false; * @param {Dexie} db */ function Observable(db) { - if (!/^3\./.test(Dexie.version)) - throw new Error(`Missing dexie version 3.x`); + if (!/^(3|4)\./.test(Dexie.version)) + throw new Error(`Missing dexie version 3.x or 4.x`); if (db.observable) { if (db.observable.version !== "{version}") throw new Error(`Mixed versions of dexie-observable`); return; // Addon already active. diff --git a/addons/Dexie.Syncable/package-lock.json b/addons/Dexie.Syncable/package-lock.json index 9f3067994..fbe1a010a 100644 --- a/addons/Dexie.Syncable/package-lock.json +++ b/addons/Dexie.Syncable/package-lock.json @@ -9,7 +9,7 @@ "version": "3.0.0-beta.10", "license": "Apache-2.0", "devDependencies": { - "dexie": "^3.0.2", + "dexie": "^3.0.2 || ^4.0.0-alpha.1", "dexie-observable": "^3.0.0-beta.9", "eslint": "^5.16.0", "just-build": "^0.9.19", @@ -17,7 +17,7 @@ "uglify-js": "^3.5.6" }, "peerDependencies": { - "dexie": "^3.0.2", + "dexie": "^3.0.2 || ^4.0.0-alpha.1", "dexie-observable": "^3.0.0-beta.9" } }, diff --git a/addons/Dexie.Syncable/package.json b/addons/Dexie.Syncable/package.json index 424a3ef84..d1591b9a6 100644 --- a/addons/Dexie.Syncable/package.json +++ b/addons/Dexie.Syncable/package.json @@ -70,11 +70,11 @@ }, "homepage": "https://dexie.org", "peerDependencies": { - "dexie": "^3.0.2", + "dexie": "^3.0.2 || ^4.0.0-alpha.1", "dexie-observable": "^3.0.0-beta.9" }, "devDependencies": { - "dexie": "^3.0.2", + "dexie": "^3.0.2 || ^4.0.0-alpha.1", "dexie-observable": "^3.0.0-beta.9", "eslint": "^5.16.0", "just-build": "^0.9.19", diff --git a/addons/Dexie.Syncable/src/Dexie.Syncable.js b/addons/Dexie.Syncable/src/Dexie.Syncable.js index 4654e6bf5..9feb4af3c 100644 --- a/addons/Dexie.Syncable/src/Dexie.Syncable.js +++ b/addons/Dexie.Syncable/src/Dexie.Syncable.js @@ -37,10 +37,10 @@ var override = Dexie.override, * @param {Dexie} db */ function Syncable (db) { - if (!/^3\./.test(Dexie.version)) - throw new Error(`Missing dexie version 3.x`); - if (!db.observable || (db.observable.version !== "{version}" && !/^3\./.test(db.observable.version))) - throw new Error(`Missing dexie-observable version 3.x`); + if (!/^(3|4)\./.test(Dexie.version)) + throw new Error(`Missing dexie version 3.x or 4.x`); + if (!db.observable || (db.observable.version !== "{version}" && !/^(3|4)\./.test(db.observable.version))) + throw new Error(`Missing dexie-observable version 3.x or 4.x`); if (db.syncable) { if (db.syncable.version !== "{version}") throw new Error(`Mixed versions of dexie-syncable`); return; // Addon already active. diff --git a/addons/dexie-cloud/package-lock.json b/addons/dexie-cloud/package-lock.json index 49f6e6290..1ce63cea9 100644 --- a/addons/dexie-cloud/package-lock.json +++ b/addons/dexie-cloud/package-lock.json @@ -37,7 +37,7 @@ "node": ">=14" }, "peerDependencies": { - "dexie": "^3.2.0-beta.2" + "dexie": "^3.2.0-beta.2 || ^4.0.0-alpha.1" } }, "node_modules/@rollup/plugin-commonjs": { diff --git a/addons/dexie-cloud/package.json b/addons/dexie-cloud/package.json index a01b1fb64..7102e1d7c 100644 --- a/addons/dexie-cloud/package.json +++ b/addons/dexie-cloud/package.json @@ -109,6 +109,6 @@ "rxjs": "^7.4.0" }, "peerDependencies": { - "dexie": "^3.2.0-beta.2" + "dexie": "^3.2.0-beta.2 || ^4.0.0-alpha.1" } } diff --git a/addons/dexie-export-import/package-lock.json b/addons/dexie-export-import/package-lock.json index 4a9ef6f58..b2e3e4078 100644 --- a/addons/dexie-export-import/package-lock.json +++ b/addons/dexie-export-import/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "dexie-export-import", "version": "1.0.3", "license": "Apache-2.0", "devDependencies": { @@ -18,7 +19,7 @@ "typeson-registry": "^1.0.0-alpha.21" }, "peerDependencies": { - "dexie": "^3.0.0 || ^2.0.4" + "dexie": "^2.0.4 || ^3.0.0 || ^4.0.0-alpha.1" } }, "node_modules/@rollup/plugin-alias": { diff --git a/addons/dexie-export-import/package.json b/addons/dexie-export-import/package.json index fe4d042c1..73644af83 100644 --- a/addons/dexie-export-import/package.json +++ b/addons/dexie-export-import/package.json @@ -43,6 +43,6 @@ "typeson-registry": "^1.0.0-alpha.21" }, "peerDependencies": { - "dexie": "^3.0.0 || ^2.0.4" + "dexie": "^2.0.4 || ^3.0.0 || ^4.0.0-alpha.1" } }