Merge pull request #40 from Meteor-Community-Packages/migration/3.0

jankapunkt · web-flow · commit 3b3636f7cc49 · 2025-09-04T08:51:10.000+02:00
Migration for compatibility with Meteor 3.0
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
@@ -12,20 +12,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-node-20-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-16-
+            ${{ runner.os }}-node-20-
 
       - run: cd test-proxy && npm ci && npm run setup && npm run lint
 
@@ -36,30 +36,28 @@ jobs:
     strategy:
       matrix:
         meteorRelease:
-          - '2.3'
-          - '2.8.0'
-          - '2.14'
+          - '3.0-rc.2'
           # Latest version
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Setup meteor ${{ matrix.meteorRelease }}
         uses: meteorengineer/setup-meteor@v1
         with:
           meteor-release: ${{ matrix.meteorRelease }}
 
       - name: cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-node-20-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-16-
+            ${{ runner.os }}-node-20-
 
       - run: cd test-proxy && npm ci && npm run setup && npm run test
diff --git a/.versions b/.versions
@@ -1,60 +1,61 @@
-accounts-base@2.2.9
-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
-dburles:mongo-collection-instances@0.4.0
-ddp@1.4.1
-ddp-client@2.6.1
-ddp-common@1.4.0
-ddp-rate-limiter@1.2.1
-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
-http@1.0.10
-id-map@1.1.1
-inter-process-messaging@0.1.1
-lai:collection-extensions@0.4.0
-local-test:dburles:mongo-collection-instances@0.4.0
-localstorage@1.2.0
-logging@1.3.3
-meteor@1.11.4
-meteortesting:browser-tests@1.3.5
-meteortesting:mocha@2.0.0
-meteortesting:mocha-core@7.0.1
-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
-random@1.2.1
-rate-limit@1.1.1
-react-fast-refresh@0.2.8
-reactive-var@1.0.12
-reload@1.3.1
-retry@1.1.0
-routepolicy@1.1.1
-socket-stream-client@0.5.2
-tracker@1.3.3
-typescript@4.9.5
-underscore@1.0.13
-url@1.3.2
-webapp@1.13.6
-webapp-hashing@1.1.1
+accounts-base@3.0.1
+allow-deny@2.0.0
+babel-compiler@7.11.0
+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.2
+core-runtime@1.0.0
+dburles:mongo-collection-instances@1.0.0
+ddp@1.4.2
+ddp-client@3.0.1
+ddp-common@1.4.4
+ddp-rate-limiter@1.2.2
+ddp-server@3.0.1
+diff-sequence@1.1.3
+dynamic-import@0.7.4
+ecmascript@0.16.9
+ecmascript-runtime@0.8.2
+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
+lai:collection-extensions@1.0.0
+local-test:dburles:mongo-collection-instances@1.0.0
+localstorage@1.2.1
+logging@1.3.5
+meteor@2.0.1
+meteortesting:browser-tests@1.7.0
+meteortesting:mocha@3.2.0
+meteortesting:mocha-core@8.2.0
+minimongo@2.0.1
+modern-browsers@0.1.11
+modules@0.20.1
+modules-runtime@0.13.2
+mongo@2.0.1
+mongo-decimal@0.1.4-beta300.7
+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
+random@1.2.2
+rate-limit@1.1.2
+react-fast-refresh@0.2.9
+reactive-var@1.0.13
+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
+url@1.3.3
+webapp@2.0.1
+webapp-hashing@1.1.2
diff --git a/README.md b/README.md
@@ -6,9 +6,13 @@
 [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
 
+This package augments Mongo.Collection (and the deprecated Meteor.Collection) and allows you to later lookup a Mongo Collection instance by the collection name.
 
+## Version 1.0.0 breaking changes!
 
-This package augments Mongo.Collection (and the deprecated Meteor.Collection) and allows you to later lookup a Mongo Collection instance by the collection name.
+> Beginning with version 1.0.0, this packages requires Meteor >= 3.0
+
+Apart from that, everything else remains the same.
 
 ## Installation
 
diff --git a/mongo-instances.js b/mongo-instances.js
@@ -1,12 +1,12 @@
-/* global CollectionExtensions */
 import { Mongo } from 'meteor/mongo'
 import { Meteor } from 'meteor/meteor'
+import { CollectionExtensions } from 'meteor/lai:collection-extensions'
 const instances = []
 
-CollectionExtensions.addExtension(function (name, options) {
+CollectionExtensions.addExtension(function mongoCollectionInstances (collection, name, options) {
   instances.push({
     name: name,
-    instance: this,
+    instance: collection,
     options: options
   })
 })
diff --git a/mongo-instances.tests.js b/mongo-instances.tests.js
@@ -7,31 +7,35 @@ import { Meteor } from 'meteor/meteor'
 const randomName = () => `test${Random.id(6)}`
 const equal = (a, b) => expect(a).to.equal(b)
 
+const insert = (collection, doc) => Meteor.isClient
+  ? collection.insert(doc)
+  : collection.insertAsync(doc)
+
 describe('unit tests', () => {
   let collectionName
 
   beforeEach(() => {
     collectionName = randomName() // random ID, so a new collection every time
   })
 
-  it('basic - works Mongo.Collection', () => {
+  it('basic - works Mongo.Collection', async () => {
     const Test = new Mongo.Collection(collectionName)
 
-    Test.insert({ test: true })
+    await insert(Test, { test: true })
     const find = Mongo.Collection.get(collectionName).find({ test: true })
-    equal(find.count(), 1)
+    equal(await find.countAsync(), 1)
 
     // get an existing collection again
     const ReGet = Mongo.Collection.get(collectionName)
-    equal(ReGet.find().count(), 1)
+    equal(await ReGet.find().countAsync(), 1)
   })
 
-  it('basic - works Meteor.Collection', function () {
+  it('basic - works Meteor.Collection', async () => {
     const Test = new Meteor.Collection(collectionName)
-    Test.insert({ test: true })
+    await insert(Test, { test: true })
 
     const find = Meteor.Collection.get(collectionName).find({ test: true })
-    equal(find.count(), 1)
+    equal(await find.countAsync(), 1)
   })
 
   it('basic - collection already exists', () => {
diff --git a/package.js b/package.js
@@ -2,26 +2,28 @@
 Package.describe({
   name: 'dburles:mongo-collection-instances',
   summary: 'Access your Mongo instances',
-  version: '0.4.0',
+  version: '1.0.0',
   git: 'https://github.com/dburles/mongo-collection-instances.git'
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['1.0', '2.3', '2.8.0'])
+  api.versionsFrom(['2.3', '2.8.0', '3.0'])
   api.use([
-    'mongo',
     'ecmascript',
-    'lai:collection-extensions@0.4.0'])
+    'mongo',
+    'lai:collection-extensions@1.0.0'])
   api.addFiles('mongo-instances.js')
 })
 
 Package.onTest(function (api) {
+  api.versionsFrom(['2.3', '2.8.0', '3.0'])
   api.use([
     'ecmascript',
-    'meteortesting:mocha@2.0.0',
     'accounts-base',
     'mongo',
-    'dburles:mongo-collection-instances'
+    'typescript',
+    'meteortesting:mocha@3.2.0',
+    'dburles:mongo-collection-instances@1.0.0'
   ])
   api.addFiles('mongo-instances.tests.js')
 })
diff --git a/test-proxy/.meteor/packages b/test-proxy/.meteor/packages
@@ -4,16 +4,18 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base@1.5.1             # Packages every Meteor app needs to have
-mobile-experience@1.1.1       # Packages for a great mobile UX
-mongo@1.16.8                   # The database Meteor supports right now
-static-html@1.3.2             # Define static page content in .html files
-reactive-var@1.0.12            # Reactive variable for tracker
-tracker@1.3.3                 # Meteor's client-side reactive programming library
+meteor-base@1.5.2             # Packages every Meteor app needs to have
+mobile-experience@1.1.2       # Packages for a great mobile UX
+mongo@2.0.0                   # The database Meteor supports right now
+static-html@1.3.3             # Define static page content in .html files
+reactive-var@1.0.13            # Reactive variable for tracker
+tracker@1.3.4                 # Meteor's client-side reactive programming library
 
-standard-minifier-css@1.9.2   # CSS minifier run for production mode
-standard-minifier-js@2.8.1    # JS minifier run for production mode
-es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.16.8              # Enable ECMAScript2015+ syntax in app code
-typescript@4.9.5              # Enable TypeScript syntax in .ts and .tsx modules
-shell-server@0.5.0            # Server-side component of the `meteor shell` command
+standard-minifier-css@1.9.3   # CSS minifier run for production mode
+standard-minifier-js@3.0.0    # JS minifier run for production mode
+es5-shim@4.8.1                # ECMAScript 5 compatibility for older browsers
+ecmascript@0.16.9              # Enable ECMAScript2015+ syntax in app code
+typescript@5.4.3              # Enable TypeScript syntax in .ts and .tsx modules
+shell-server@0.6.0            # Server-side component of the `meteor shell` command
+
+accounts-base@3.0.0
diff --git a/test-proxy/.meteor/release b/test-proxy/.meteor/release
@@ -1 +1 @@
-METEOR@2.14
+METEOR@3.0.1
diff --git a/test-proxy/.meteor/versions b/test-proxy/.meteor/versions
diff --git a/test-proxy/package-lock.json b/test-proxy/package-lock.json
diff --git a/test-proxy/package.json b/test-proxy/package.json

-Original file line number
+Diff line change
@@ @@ -1,60 +1,61 @@ @@
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -dburles:[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]
 -lai:[email protected]
 -local-test:dburles:[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -meteortesting:[email protected]
 -meteortesting:[email protected]
 -meteortesting:[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]
 +dburles:[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]
 +lai:[email protected]
 +local-test:dburles:[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +meteortesting:[email protected]
 +meteortesting:[email protected]
 +meteortesting:[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]
-Original file line number
+Diff line change
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 -[email protected].1             # Packages every Meteor app needs to have
 -[email protected].1       # Packages for a great mobile UX
 -mongo@1.16.8                   # The database Meteor supports right now
 -[email protected].2             # Define static page content in .html files
 -[email protected].12            # Reactive variable for tracker
 -[email protected].3                 # Meteor's client-side reactive programming library
 +[email protected].2             # Packages every Meteor app needs to have
 +[email protected].2       # Packages for a great mobile UX
 +mongo@2.0.0                   # The database Meteor supports right now
 +[email protected].3             # Define static page content in .html files
 +[email protected].13            # Reactive variable for tracker
 +[email protected].4                 # Meteor's client-side reactive programming library
 -[email protected]   # CSS minifier run for production mode
 -[email protected]    # JS minifier run for production mode
 -[email protected]                # ECMAScript 5 compatibility for older browsers
 -[email protected]              # Enable ECMAScript2015+ syntax in app code
 -[email protected]              # Enable TypeScript syntax in .ts and .tsx modules
 -[email protected]            # Server-side component of the `meteor shell` command
 +[email protected]   # CSS minifier run for production mode
 +[email protected]    # JS minifier run for production mode
 +[email protected]                # ECMAScript 5 compatibility for older browsers
 +[email protected]              # Enable ECMAScript2015+ syntax in app code
 +[email protected]              # Enable TypeScript syntax in .ts and .tsx modules
 +[email protected]            # Server-side component of the `meteor shell` command
++
 +[email protected]