Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meteor 3.0 compatibility #741

Merged
merged 24 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e113bba
initiate migration
jankapunkt Dec 21, 2023
d0ab344
tests: upgraded to Meteor 3.0-beta.0
jankapunkt Jan 22, 2024
0b2d18d
build: upgrade package to Meteor 3.0-beta.0
jankapunkt Jan 22, 2024
d15c257
Merge branch 'master' into migrate/3.0
jankapunkt Jan 22, 2024
80b937c
tests: upgraded 2.x project to latest Meteor
jankapunkt Apr 18, 2024
8357887
tests: renamed tests to tests-2x
jankapunkt Apr 18, 2024
ca1daf5
tests: added Meteor 3.x tests project
jankapunkt Apr 18, 2024
42c0a12
Merge branch 'migrate/3.0' of github.com:Meteor-Community-Packages/me…
jankapunkt Apr 18, 2024
0dc7f37
tests: upgrade to Meteor 3.0-rc.2
jankapunkt Jun 11, 2024
84ac404
build: upgrade versions for 3.0-rc.2 compatibility
jankapunkt Jun 11, 2024
6c40537
publish 2.0.0-rc300.0
jankapunkt Jun 11, 2024
48166ca
tests: upgrade to 3.0 rc.4
jankapunkt Jun 14, 2024
81d79de
published 2.0.0-rc300.1
jankapunkt Jun 14, 2024
a176fbc
Meteor 3 release version updates
StorytellerCZ Jul 15, 2024
9a4e16f
aldeed:[email protected]
StorytellerCZ Jul 16, 2024
24d68be
Update version for final release
StorytellerCZ Jul 25, 2024
3dca88f
tests: upgraded to Meteor 3.0.2
jankapunkt Aug 21, 2024
269d500
tests: removed 2x project
jankapunkt Aug 21, 2024
10434ab
ci: update Meteor release
jankapunkt Aug 21, 2024
ee59859
build: update deps
jankapunkt Aug 21, 2024
283b657
published 2.0.0
jankapunkt Aug 21, 2024
f5c1c49
Merge branch 'migrate/3.0' of github.com:Meteor-Community-Packages/me…
jankapunkt Aug 21, 2024
c7d945d
Merge branch 'master' of github.com:Meteor-Community-Packages/meteor-…
jankapunkt Aug 21, 2024
9342ceb
docs: update jsdoc comments
jankapunkt Nov 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions .github/workflows/lint-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 tests && npm ci && npm run setup && npm run lint

Expand All @@ -36,29 +36,28 @@ jobs:
strategy:
matrix:
meteorRelease:
- '2.3'
- '2.14'
- '3.0-rc.2'
jankapunkt marked this conversation as resolved.
Show resolved Hide resolved
# 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 tests && npm ci && npm run setup && npm run test
3 changes: 3 additions & 0 deletions lib/testHelpers/asyncTimeout.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const asyncTimeout = ms => new Promise(resolve => {
setTimeout(() => resolve(), ms)
})
1 change: 1 addition & 0 deletions lib/utility/isPromiseLike.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const isPromiseLike = obj => obj && typeof obj.then === 'function'
21 changes: 8 additions & 13 deletions package.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Package.describe({
name: 'aldeed:simple-schema',
summary: 'A simple schema validation object with reactivity. Used by collection2 and autoform.',
version: '1.13.1',
version: '2.0.0-rc.300.10',
git: 'https://github.com/aldeed/meteor-simple-schema.git'
});

Expand All @@ -13,27 +13,22 @@ Npm.depends({
});

Package.onUse(function (api) {
api.versionsFrom(['1.3', '2.3', '3.0-alpha.19']);
api.versionsFrom(['2.3', '3.0']);
api.use('ecmascript');
api.mainModule('lib/main.js');
});

Package.onTest(function (api) {
api.versionsFrom(['2.3', '3.0']);
api.use([
'lmieulet:meteor-legacy-coverage',
'lmieulet:[email protected]',
'meteortesting:[email protected]',
'meteortesting:browser-tests',
])

api.versionsFrom(['2.3', '2.8.1'])

api.use([
// 'lmieulet:meteor-legacy-coverage',
// 'lmieulet:meteor-coverage',
'meteortesting:[email protected] || 3.1.0-rc.1',
jankapunkt marked this conversation as resolved.
Show resolved Hide resolved
'ecmascript',
'tracker',
'mongo',
// 'mongo',
'aldeed:simple-schema'
]);
])

api.addFiles([
'lib/clean/autoValue.tests.js',
Expand Down
6 changes: 6 additions & 0 deletions tests-2x/.coverage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"include": [
"**/packages/simple-schema/**/*",
"**/packages/*aldeed_simple_schema.js"
]
}
3 changes: 3 additions & 0 deletions tests-2x/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules/
.coverage
packages/
19 changes: 19 additions & 0 deletions tests-2x/.meteor/.finished-upgraders
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file contains information which helps Meteor properly upgrade your
# app when you run 'meteor update'. You should check it into version control
# with your project.

notices-for-0.9.0
notices-for-0.9.1
0.9.4-platform-file
notices-for-facebook-graph-api-2
1.2.0-standard-minifiers-package
1.2.0-meteor-platform-split
1.2.0-cordova-changes
1.2.0-breaking-changes
1.3.0-split-minifiers-package
1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
1.7-split-underscore-from-meteor-base
1.8.3-split-jquery-from-blaze
1 change: 1 addition & 0 deletions tests-2x/.meteor/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
local
7 changes: 7 additions & 0 deletions tests-2x/.meteor/.id
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file contains a token that is unique to your project.
# Check it into your repository along with the rest of this directory.
# It can be used for purposes such as:
# - ensuring you don't accidentally deploy one app on top of another
# - providing package authors with aggregated statistics

mfudc87vg05j.prele07sj42n
20 changes: 20 additions & 0 deletions tests-2x/.meteor/packages
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Meteor packages used by this project, one per line.
# Check this file (and the other files in this directory) into your repository.
#
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.

[email protected] # Packages every Meteor app needs to have
[email protected] # Packages for a great mobile UX
[email protected] # The database Meteor supports right now
[email protected] # Define static page content in .html files
[email protected] # Reactive variable for tracker
[email protected] # 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] # Server-side component of the `meteor shell` command
meteortesting:mocha
[email protected]
2 changes: 2 additions & 0 deletions tests-2x/.meteor/platforms
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
server
browser
1 change: 1 addition & 0 deletions tests-2x/.meteor/release
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[email protected]
jankapunkt marked this conversation as resolved.
Show resolved Hide resolved
74 changes: 74 additions & 0 deletions tests-2x/.meteor/versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
[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]
lmieulet:[email protected]
[email protected]
[email protected]
[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]
practicalmeteor:[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]
Loading