Skip to content

Commit

Permalink
Merge branch 'feature/meteor-3'
Browse files Browse the repository at this point in the history
  • Loading branch information
StorytellerCZ committed Dec 19, 2024
2 parents 2e03d50 + eac1518 commit afe3bbe
Show file tree
Hide file tree
Showing 11 changed files with 113 additions and 136 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Change Log

## 4.0.2

Updated dependencies for `aldeed:[email protected]`

Added compatibility for `aldeed:[email protected]`

Api versions from now include Meteor `3.0.1` and `3.1`

## 4.0.1

Updated to depend on `aldeed:[email protected]`

Updated to be compatible with Meteor 3.0-rc.0

## 4.0.0

Update to depend on `aldeed:[email protected]`

Switched back to using `aldeed:simple-schema` instead of the NPM version as per `[email protected]` requirements.

Minimum Meteor version is `2.8.1` and added compatibility for Meteor 3.

## 3.1.0

Update to depend on `aldeed:[email protected]`. Add the appropriate Meteor version constraints, starting lowest with Meteor v1.12.1.
Expand Down
102 changes: 52 additions & 50 deletions package/deny/.versions
Original file line number Diff line number Diff line change
@@ -1,51 +1,53 @@
aldeed:[email protected]
aldeed:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
raix:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
tmeasday:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
6 changes: 4 additions & 2 deletions package/deny/deny.js
Original file line number Diff line number Diff line change
@@ -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']);
Expand Down
7 changes: 4 additions & 3 deletions package/deny/package.js
Original file line number Diff line number Diff line change
@@ -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:[email protected]');
api.versionsFrom(['2.8.1', '3.0.1', '3.1']);
api.use('aldeed:[email protected]');
api.use('aldeed:[email protected] || 2.0.0');
api.use('ecmascript');

api.mainModule('deny.js');
Expand Down
4 changes: 2 additions & 2 deletions tests/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ [email protected] # Server-side component of the `meteor shell` comm
[email protected] # Publish all data to the clients (for prototyping)
[email protected] # Allow all DB writes from clients (for prototyping)

underscore@1.0.13
underscore@1.6.0
aldeed:schema-deny
[email protected]
meteortesting:mocha
aldeed:collection2@3.0.0
aldeed:collection2
2 changes: 1 addition & 1 deletion tests/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@2.14
METEOR@2.15
12 changes: 6 additions & 6 deletions tests/.meteor/versions
2 changes: 1 addition & 1 deletion tests/deny.tests.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
82 changes: 16 additions & 66 deletions tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
1 change: 1 addition & 0 deletions tests/packages/deny

0 comments on commit afe3bbe

Please sign in to comment.