diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0daaa1a..3864262 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - meteor-version: ['2.5.6', '2.6.1', '?'] # ? - latest meteor version + meteor-version: ['2.5.6', '2.6.1', '3.0-beta.6'] # ? - latest meteor version steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.versions b/.versions index 6278918..9c3e37e 100644 --- a/.versions +++ b/.versions @@ -31,9 +31,6 @@ modern-browsers@0.1.7 modules@0.17.0 modules-runtime@0.12.0 mongo-id@1.0.8 -practicalmeteor:chai@1.9.2_3 -practicalmeteor:mocha-core@1.0.1 -practicalmeteor:sinon@1.10.3_2 promise@0.12.0 random@1.2.0 react-fast-refresh@0.2.0 diff --git a/package.js b/package.js index a50607f..baa07e9 100644 --- a/package.js +++ b/package.js @@ -10,12 +10,13 @@ Package.describe({ const npmDependencies = { 'js-yaml': '4.1.0', 'strip-json-comments': '3.1.1', + '@babel/runtime': '7.20.7', }; Npm.depends(npmDependencies); Package.registerBuildPlugin({ name: 'universe:i18n', - use: ['caching-compiler@1.2.2', 'tracker', 'typescript'], + use: ['caching-compiler@1.2.2 || 2.0.0-beta300.6 || 2.0.0', 'tracker', 'typescript'], sources: [ 'source/common.ts', 'source/compiler.ts', @@ -26,7 +27,7 @@ Package.registerBuildPlugin({ }); Package.onUse(function (api) { - api.versionsFrom('2.3'); + api.versionsFrom(['2.3', '3.0-beta.6']); api.use([ 'check', 'ddp', @@ -46,9 +47,7 @@ Package.onUse(function (api) { Package.onTest(function (api) { api.use([ - 'meteortesting:mocha', - 'practicalmeteor:chai', - 'practicalmeteor:sinon', + 'meteortesting:mocha@3.0.3-alpha300.11', 'typescript', 'universe:i18n', ]); diff --git a/package.json b/package.json index 19e774c..073246d 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ }, "devDependencies": { "@types/chai": "4.3.0", - "@types/fibers": "3.1.1", "@types/js-yaml": "4.0.5", "@types/meteor": "1.4.76", "@types/mocha": "9.1.0", @@ -18,7 +17,10 @@ "@types/sinon": "10.0.11", "@types/sinon-chai": "3.2.8", "@types/strip-json-comments": "3.0.0", + "chai": "^4.3.10", "eslint-config-vazco": "7.0.0", + "sinon": "^17.0.1", + "sinon-chai": "^3.7.0", "typescript": "4.8.4" } } diff --git a/tests/client.ts b/tests/client.ts index c52b0be..0297062 100644 --- a/tests/client.ts +++ b/tests/client.ts @@ -1,5 +1,7 @@ import { i18n } from '../source/client'; +import chai from 'chai'; + const expect = chai.expect; describe('universe-i18n - client', () => { diff --git a/tests/common.ts b/tests/common.ts index b4aee04..b51e33d 100644 --- a/tests/common.ts +++ b/tests/common.ts @@ -1,6 +1,8 @@ /// - -import { sinon } from 'meteor/practicalmeteor:sinon'; +import chai from 'chai'; +import sinon from 'sinon'; +import sinonChai from "sinon-chai"; +chai.use(sinonChai); import { i18n } from '../source/common'; diff --git a/tests/server.ts b/tests/server.ts index 4eed706..d77037a 100644 --- a/tests/server.ts +++ b/tests/server.ts @@ -1,4 +1,5 @@ import { i18n } from '../source/server'; +import chai from 'chai'; const expect = chai.expect;