diff --git a/CHANGELOG.md b/CHANGELOG.md index 1147934..b26890d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 4.0.2 + +Updated dependencies for `aldeed:collection2@4.0.4` + +Added compatibility for `aldeed:simple-schema@2.0.0` + +Api versions from now include Meteor `3.0.1` and `3.1` + +## 4.0.1 + +Updated to depend on `aldeed:collection2@4.0.1` + +Updated to be compatible with Meteor 3.0-rc.0 + +## 4.0.0 + +Update to depend on `aldeed:collection2@4.0.0` + +Switched back to using `aldeed:simple-schema` instead of the NPM version as per `collection2@4.0.0` requirements. + +Minimum Meteor version is `2.8.1` and added compatibility for Meteor 3. + ## 3.1.0 Update to depend on `aldeed:collection2@3.5.0`. Add the appropriate Meteor version constraints, starting lowest with Meteor v1.12.1. diff --git a/package/deny/.versions b/package/deny/.versions index 882bcbd..3861e49 100644 --- a/package/deny/.versions +++ b/package/deny/.versions @@ -1,51 +1,53 @@ -aldeed:collection2@3.5.0 -aldeed:schema-deny@3.1.0 -allow-deny@1.1.1 -babel-compiler@7.10.5 -babel-runtime@1.5.1 -base64@1.0.12 -binary-heap@1.0.11 -boilerplate-generator@1.7.2 -callback-hook@1.5.1 -check@1.3.2 -ddp@1.4.1 -ddp-client@2.6.1 -ddp-common@1.4.0 -ddp-server@2.7.0 -diff-sequence@1.1.2 -dynamic-import@0.7.3 -ecmascript@0.16.8 -ecmascript-runtime@0.8.1 -ecmascript-runtime-client@0.12.1 -ecmascript-runtime-server@0.11.0 -ejson@1.1.3 -fetch@0.1.4 -geojson-utils@1.0.11 -id-map@1.1.1 -inter-process-messaging@0.1.1 -logging@1.3.3 -meteor@1.11.4 -minimongo@1.9.3 -modern-browsers@0.1.10 -modules@0.20.0 -modules-runtime@0.13.1 -mongo@1.16.8 -mongo-decimal@0.1.3 -mongo-dev-server@1.1.0 -mongo-id@1.0.8 -npm-mongo@4.17.2 -ordered-dict@1.1.0 -promise@0.12.2 +aldeed:collection2@4.0.4 +aldeed:schema-deny@4.0.2 +aldeed:simple-schema@1.13.1 +allow-deny@2.0.0 +babel-compiler@7.11.1 +babel-runtime@1.5.2 +base64@1.0.13 +binary-heap@1.0.12 +boilerplate-generator@2.0.0 +callback-hook@1.6.0 +check@1.4.4 +core-runtime@1.0.0 +ddp@1.4.2 +ddp-client@3.0.2 +ddp-common@1.4.4 +ddp-server@3.0.2 +diff-sequence@1.1.3 +dynamic-import@0.7.4 +ecmascript@0.16.9 +ecmascript-runtime@0.8.3 +ecmascript-runtime-client@0.12.2 +ecmascript-runtime-server@0.11.1 +ejson@1.1.4 +facts-base@1.0.2 +fetch@0.1.5 +geojson-utils@1.0.12 +id-map@1.2.0 +inter-process-messaging@0.1.2 +logging@1.3.5 +meteor@2.0.2 +minimongo@2.0.1 +modern-browsers@0.1.11 +modules@0.20.2 +modules-runtime@0.13.2 +mongo@2.0.2 +mongo-decimal@0.1.4 +mongo-dev-server@1.1.1 +mongo-id@1.0.9 +npm-mongo@4.17.4 +ordered-dict@1.2.0 +promise@1.0.0 raix:eventemitter@1.0.0 -random@1.2.1 -react-fast-refresh@0.2.8 -reload@1.3.1 -retry@1.1.0 -routepolicy@1.1.1 -socket-stream-client@0.5.2 -tmeasday:check-npm-versions@1.0.2 -tracker@1.3.3 -typescript@4.9.5 -underscore@1.0.13 -webapp@1.13.6 -webapp-hashing@1.1.1 +random@1.2.2 +react-fast-refresh@0.2.9 +reload@1.3.2 +retry@1.1.1 +routepolicy@1.1.2 +socket-stream-client@0.5.3 +tracker@1.3.4 +typescript@5.4.3 +underscore@1.6.4 +webapp@2.0.3 +webapp-hashing@1.1.2 diff --git a/package/deny/deny.js b/package/deny/deny.js index 88d2a78..b28b496 100644 --- a/package/deny/deny.js +++ b/package/deny/deny.js @@ -1,6 +1,8 @@ // collection2 checks to make sure that simpl-schema package is added -import SimpleSchema from 'simpl-schema'; -import Collection2 from 'meteor/aldeed:collection2'; +import 'meteor/aldeed:collection2/dynamic'; +import SimpleSchema from 'meteor/aldeed:simple-schema'; + +Collection2.load(); // Extend the schema options allowed by SimpleSchema SimpleSchema.extendOptions(['denyInsert', 'denyUpdate']); diff --git a/package/deny/package.js b/package/deny/package.js index 6864aee..9450580 100644 --- a/package/deny/package.js +++ b/package/deny/package.js @@ -1,14 +1,15 @@ Package.describe({ name: "aldeed:schema-deny", summary: "Deny inserting or updating certain properties through schema options", - version: "3.1.0", + version: "4.0.2", documentation: '../../README.md', git: "https://github.com/aldeed/meteor-schema-deny.git" }); Package.onUse(function(api) { - api.versionsFrom(['1.12.1', '2.3.6', '2.8.1']); - api.use('aldeed:collection2@3.5.0'); + api.versionsFrom(['2.8.1', '3.0.1', '3.1']); + api.use('aldeed:collection2@4.0.4'); + api.use('aldeed:simple-schema@1.13.1 || 2.0.0'); api.use('ecmascript'); api.mainModule('deny.js'); diff --git a/tests/.meteor/packages b/tests/.meteor/packages index e550015..5b88dde 100644 --- a/tests/.meteor/packages +++ b/tests/.meteor/packages @@ -21,8 +21,8 @@ shell-server@0.5.0 # Server-side component of the `meteor shell` comm autopublish@1.0.7 # Publish all data to the clients (for prototyping) insecure@1.0.7 # Allow all DB writes from clients (for prototyping) -underscore@1.0.13 +underscore@1.6.0 aldeed:schema-deny dynamic-import@0.7.3 meteortesting:mocha -aldeed:collection2@3.0.0 +aldeed:collection2 diff --git a/tests/.meteor/release b/tests/.meteor/release index c500c39..966586c 100644 --- a/tests/.meteor/release +++ b/tests/.meteor/release @@ -1 +1 @@ -METEOR@2.14 +METEOR@2.15 diff --git a/tests/.meteor/versions b/tests/.meteor/versions index f0e2dc4..ee4d2d8 100644 --- a/tests/.meteor/versions +++ b/tests/.meteor/versions @@ -1,5 +1,6 @@ -aldeed:collection2@3.5.0 -aldeed:schema-deny@3.1.0 +aldeed:collection2@4.0.0 +aldeed:schema-deny@4.0.0 +aldeed:simple-schema@1.13.1 allow-deny@1.1.1 autopublish@1.0.7 autoupdate@1.8.0 @@ -39,7 +40,7 @@ inter-process-messaging@0.1.1 jquery@1.11.11 launch-screen@2.0.0 logging@1.3.3 -meteor@1.11.4 +meteor@1.11.5 meteor-base@1.5.1 meteortesting:browser-tests@1.5.3 meteortesting:mocha@2.1.0 @@ -77,11 +78,10 @@ templating@1.4.3 templating-compiler@1.4.2 templating-runtime@1.6.4 templating-tools@1.2.3 -tmeasday:check-npm-versions@1.0.2 tracker@1.3.3 typescript@4.9.5 ui@1.0.13 -underscore@1.0.13 +underscore@1.6.1 url@1.3.2 -webapp@1.13.6 +webapp@1.13.8 webapp-hashing@1.1.1 diff --git a/tests/deny.tests.js b/tests/deny.tests.js index f44defc..3eac7af 100644 --- a/tests/deny.tests.js +++ b/tests/deny.tests.js @@ -1,6 +1,6 @@ import expect from 'expect'; import { Mongo } from 'meteor/mongo'; -import SimpleSchema from 'simpl-schema'; +import SimpleSchema from 'meteor/aldeed:simple-schema'; const test = new Mongo.Collection('test'); test.attachSchema(new SimpleSchema({ diff --git a/tests/package-lock.json b/tests/package-lock.json index 441e542..f2a8889 100644 --- a/tests/package-lock.json +++ b/tests/package-lock.json @@ -135,9 +135,9 @@ } }, "@babel/runtime": { - "version": "7.23.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.8.tgz", - "integrity": "sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz", + "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==", "requires": { "regenerator-runtime": "^0.14.0" }, @@ -327,9 +327,9 @@ "dev": true }, "axios": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", - "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "dev": true, "requires": { "follow-redirects": "^1.15.4", @@ -426,13 +426,13 @@ } }, "chromedriver": { - "version": "120.0.1", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-120.0.1.tgz", - "integrity": "sha512-ETTJlkibcAmvoKsaEoq2TFqEsJw18N0O9gOQZX6Uv/XoEiOV8p+IZdidMeIRYELWJIgCZESvlOx5d1QVnB4v0w==", + "version": "120.0.2", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-120.0.2.tgz", + "integrity": "sha512-A6/feXNWoKzkoUISJs/JAi0iIa+t6vwUnQCgGGFK7L/1r7CrreaRynVgnIliQJRdwY/8F41r6Mt3WDD9QXdV8A==", "dev": true, "requires": { "@testim/chrome-version": "^1.1.4", - "axios": "^1.6.0", + "axios": "^1.6.5", "compare-versions": "^6.1.0", "extract-zip": "^2.0.1", "https-proxy-agent": "^5.0.1", @@ -446,11 +446,6 @@ "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true }, - "clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==" - }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -827,9 +822,9 @@ } }, "follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true }, "forever-agent": { @@ -1255,36 +1250,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==" - }, - "lodash.template": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", - "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", - "requires": { - "lodash._reinterpolate": "^3.0.0", - "lodash.templatesettings": "^4.0.0" - } - }, - "lodash.templatesettings": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", - "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", - "requires": { - "lodash._reinterpolate": "^3.0.0" - } - }, - "message-box": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/message-box/-/message-box-0.2.7.tgz", - "integrity": "sha512-C4ccA5nHb58kTS+pLrgF/JWtr7fAIkHxRDceH7tdy5fMA783nUfbYwZ7H2XLvSeYfcnWIYCig5dWW+icK9X/Ag==", - "requires": { - "lodash.template": "^4.5.0" - } - }, "meteor-node-stubs": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.7.tgz", @@ -2120,11 +2085,6 @@ "minimist": "^1.2.6" } }, - "mongo-object": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/mongo-object/-/mongo-object-0.1.4.tgz", - "integrity": "sha512-QtYk0gupWEn2+iB+DDRt1L+WbcNYvJRaHdih/dcqthOa1DbnREUGSs2WGcW478GNYpElflo/yybZXu0sTiRXHg==" - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -2465,9 +2425,9 @@ "dev": true }, "selenium-webdriver": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.16.0.tgz", - "integrity": "sha512-IbqpRpfGE7JDGgXHJeWuCqT/tUqnLvZ14csSwt+S8o4nJo3RtQoE9VR4jB47tP/A8ArkYsh/THuMY6kyRP6kuA==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.18.1.tgz", + "integrity": "sha512-uP4OJ5wR4+VjdTi5oi/k8oieV2fIhVdVuaOPrklKghgS59w7Zz3nGa5gcG73VcU9EBRv5IZEBRhPr7qFJAj5mQ==", "dev": true, "requires": { "jszip": "^3.10.1", @@ -2487,16 +2447,6 @@ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", "dev": true }, - "simpl-schema": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/simpl-schema/-/simpl-schema-1.13.1.tgz", - "integrity": "sha512-20Qc2X13TvLJYY37eapvJ5CWyYYSScX2BJV5RcP4A15efA4k8c0XEsp9F/RofQi/IMrp7PzyxTXyjwlG7EFhCQ==", - "requires": { - "clone": "^2.1.2", - "message-box": "^0.2.7", - "mongo-object": "^0.1.4" - } - }, "single-line-log": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz", diff --git a/tests/package.json b/tests/package.json index 4d126db..62ebb2a 100644 --- a/tests/package.json +++ b/tests/package.json @@ -7,17 +7,16 @@ "test:watch:browser": "METEOR_PACKAGE_DIRS=../package TEST_WATCH=1 meteor test --driver-package meteortesting:mocha" }, "dependencies": { - "@babel/runtime": "^7.23.8", + "@babel/runtime": "^7.23.9", "babel-polyfill": "6.26.0", "babel-runtime": "6.26.0", - "meteor-node-stubs": "1.2.7", - "simpl-schema": "1.13.1" + "meteor-node-stubs": "1.2.7" }, "devDependencies": { - "chromedriver": "120.0.1", + "chromedriver": "120.0.2", "expect": "29.7.0", "istanbul-lib-coverage": "^3.2.2", "nightmare": "^3.0.2", - "selenium-webdriver": "^4.16.0" + "selenium-webdriver": "^4.18.1" } } diff --git a/tests/packages/deny b/tests/packages/deny new file mode 120000 index 0000000..c0500b9 --- /dev/null +++ b/tests/packages/deny @@ -0,0 +1 @@ +../../package/deny/ \ No newline at end of file