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

[chore] bump dependencies #7520

Merged
merged 21 commits into from
May 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
**/tmp/
/packages/-ember-data/docs/

**/DEBUG/

# dependencies
**/bower_components/
**/node_modules/
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module.exports = {
'no-caller': 'error',
'no-eq-null': 'error',
'no-console': 'error', // no longer recommended in eslint v6, this restores it
'simple-import-sort/sort': ['error', { groups: ImportSortGroups }],
'simple-import-sort/imports': ['error', { groups: ImportSortGroups }],
'sort-imports': 'off',
'import/order': 'off',
'import/first': 'error',
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/alpha-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fi
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies for master
run: yarn install --frozen-lockfile --non-interactive
- name: Basic Tests
Expand All @@ -36,7 +36,7 @@ jobs:
- uses: actions/setup-node@v2
with:
registry-url: 'https://registry.npmjs.org'
node-version: 12.x
node-version: 14.x
- name: Install dependencies for master
run: yarn install --frozen-lockfile --non-interactive
- name: Make sure git user is setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/asset-size-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Check SHA
run: |
sha=$(git rev-parse --short=8 HEAD)
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Yarn install
run: yarn --frozen-lockfile
- name: Lint features
Expand All @@ -37,7 +37,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Yarn install
run: yarn --frozen-lockfile
- name: Yarn test infra compatWith 3.0
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies
run: yarn install --frozen-lockfile --network-timeout=300000
- name: Launcher Info
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies
run: yarn install --frozen-lockfile --network-timeout=300000
- name: Fastboot Test ${{ matrix.scenario }}
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies
run: yarn install --frozen-lockfile --network-timeout=300000
- name: Launcher Info
Expand All @@ -190,7 +190,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies w/o lockfile
run: yarn install --no-lockfile --non-interactive
- name: Basic Tests
Expand All @@ -207,7 +207,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies
run: yarn install
- name: Basic tests with ${{ matrix.scenario }}
Expand All @@ -234,7 +234,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies
run: yarn install
- name: Basic tests with ${{ matrix.scenario }}
Expand All @@ -260,7 +260,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies
run: yarn install --frozen-lockfile --network-timeout=300000
- name: Basic tests with ${{ matrix.scenario }}
Expand All @@ -275,7 +275,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [10.x, 14.x]
node-version: [12.x, 16.x]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
Expand Down Expand Up @@ -323,7 +323,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies
run: yarn install
- name: Generate package tarballs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies for master
run: yarn install
- name: Basic Tests
Expand All @@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 12.x
node-version: 14.x
- name: Install dependencies for master
run: yarn install
- name: Basic Tests
Expand Down
26 changes: 14 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
"devDependencies": {
"@babel/plugin-transform-typescript": "^7.13.0",
"@ember/edition-utils": "^1.2.0",
"@ember/optional-features": "^1.3.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.2.5",
"@glimmer/component": "^1.0.0",
"@types/ember": "^3.16.5",
"@types/ember-qunit": "^3.4.13",
Expand Down Expand Up @@ -73,6 +74,7 @@
"command-line-args": "^5.1.1",
"common-tags": "^1.8.0",
"debug": "^4.1.1",
"ember-auto-import": "^2.0.0",
"ember-cli": "~3.26.1",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.6",
Expand All @@ -81,7 +83,6 @@
"ember-cli-htmlbars": "^5.1.2",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-path-utils": "^1.0.0",
"ember-cli-pretender": "^4.0.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-string-utils": "^1.1.0",
"ember-cli-template-lint": "^2.0.2",
Expand All @@ -97,10 +98,10 @@
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.6.0",
"ember-qunit": "^5.1.4",
"ember-resolver": "^8.0.0",
"ember-source": "~3.26.0",
"ember-source-channel-url": "^2.0.1",
"ember-source": "~3.27.1",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^1.4.0",
"eslint": "^7.23.0",
"eslint-config-prettier": "^8.2.0",
Expand All @@ -111,28 +112,29 @@
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-qunit": "^6.1.0",
"eslint-plugin-simple-import-sort": "^5.0.3",
"eslint-plugin-simple-import-sort": "^7.0.0",
"execa": "^5.0.0",
"fromentries": "^1.2.0",
"fs-extra": "^9.0.0",
"git-repo-info": "^2.1.1",
"glob": "^7.1.6",
"json-typescript": "^1.1.2",
"lerna": "^4.0.0",
"lerna-changelog": "^1.0.1",
"loader.js": "^4.7.0",
"mocha": "^7.1.2",
"mocha": "^8.4.0",
"npm-git-info": "^1.0.3",
"pre-commit": "^1.2.2",
"pretender": "^3.4.3",
"prettier": "^2.2.1",
"qunit": "^2.10.0",
"qunit-dom": "^1.2.0",
"qunit": "^2.15.0",
"qunit-dom": "^1.6.0",
"rimraf": "^3.0.2",
"rsvp": "^4.8.5",
"semver": "^7.1.3",
"silent-error": "^1.1.1",
"typescript": "~4.2.4",
"url": "^0.11.0",
"webpack": "^5.37.1",
"zlib": "1.0.5"
},
"bin": {
Expand All @@ -142,10 +144,10 @@
},
"dependencies": {},
"engines": {
"node": "10.* || >= 12.*"
"node": "12.* || >= 14.*"
},
"volta": {
"node": "12.16.2",
"node": "14.17.0",
"yarn": "1.22.4"
},
"changelog": {
Expand Down
26 changes: 14 additions & 12 deletions packages/-ember-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"devDependencies": {
"@babel/plugin-transform-typescript": "^7.9.6",
"@ember-data/unpublished-test-infra": "3.29.0-alpha.4",
"@ember/optional-features": "^1.3.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.2.5",
"@glimmer/component": "^1.0.0",
"@types/ember": "^3.16.5",
"@types/ember-qunit": "^3.4.13",
Expand All @@ -56,12 +57,12 @@
"broccoli-string-replace": "^0.1.2",
"broccoli-test-helper": "^2.0.0",
"broccoli-uglify-sourcemap": "^4.0.0",
"ember-auto-import": "^2.0.0",
"ember-cli": "~3.26.1",
"ember-cli-app-version": "^5.0.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^5.1.2",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-pretender": "^4.0.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "~4.0.1",
"ember-cli-test-loader": "^3.0.0",
Expand All @@ -73,20 +74,21 @@
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.6.0",
"ember-qunit": "^5.1.4",
"ember-resolver": "^8.0.0",
"ember-source": "~3.26.0",
"ember-source-channel-url": "^2.0.1",
"ember-source": "~3.27.1",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^1.4.0",
"github": "^1.1.1",
"json-typescript": "^1.1.0",
"loader.js": "^4.7.0",
"qunit": "^2.10.0",
"qunit-dom": "^1.2.0",
"typescript": "~4.2.4"
"pretender": "^3.4.3",
"qunit": "^2.15.0",
"qunit-dom": "^1.6.0",
"typescript": "~4.2.4",
"webpack": "^5.37.1"
},
"engines": {
"node": "10.* || >= 12.*"
"node": "12.* || >= 14.*"
},
"keywords": [
"ember-addon"
Expand All @@ -95,7 +97,7 @@
"configPath": "tests/dummy/config"
},
"volta": {
"node": "12.16.2",
"node": "14.17.0",
"yarn": "1.22.4"
}
}
}
1 change: 1 addition & 0 deletions packages/-ember-data/tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module.exports = function (environment) {
EmberENV: {
RAISE_ON_DEPRECATION: false,
},
ASSERT_ALL_DEPRECATIONS: process.env.ASSERT_ALL_DEPRECATIONS === 'true',

APP: {
// Here you can pass flags/options to your application instance
Expand Down
1 change: 1 addition & 0 deletions packages/-ember-data/tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ if (targetIsIE11) {

module.exports = {
browsers,
node: 'current',
};
14 changes: 7 additions & 7 deletions packages/-ember-data/tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>

<script>
// Handle testing feature flags
if (QUnit.urlParams.enableoptionalfeatures) {
window.EmberDataENV = { ENABLE_OPTIONAL_FEATURES: true };
}
</script>

<script src="{{rootURL}}assets/dummy.js"></script>
<script src="{{rootURL}}assets/tests.js"></script>

{{content-for "body-footer"}}
{{content-for "test-body-footer"}}

<div id="qunit"></div>
<div id="qunit-fixture">
<div id="ember-testing-container">
<div id="ember-testing"></div>
</div>
</div>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import Store, {
import { identifierCacheFor } from '@ember-data/store/-private';

type StableRecordIdentifier = import('@ember-data/store/-private/ts-interfaces/identifier').StableRecordIdentifier;
type ExistingResourceObject = import('@ember-data/store/-private/ts-interfaces/ember-data-json-api').ExistingResourceObject;
type ExistingResourceObject =
import('@ember-data/store/-private/ts-interfaces/ember-data-json-api').ExistingResourceObject;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in-range updates to lint and prettier enforce the max-line-length for these type declarations now (they didn't before) which is why some of them now split lines.

module('Integration | Identifiers - configuration', function (hooks) {
setupTest(hooks);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import { identifierCacheFor } from '@ember-data/store/-private';

type StableRecordIdentifier = import('@ember-data/store/-private/ts-interfaces/identifier').StableRecordIdentifier;
type ConfidentDict<T> = import('@ember-data/store/-private/ts-interfaces/utils').ConfidentDict<T>;
type ExistingResourceObject = import('@ember-data/store/-private/ts-interfaces/ember-data-json-api').ExistingResourceObject;
type ExistingResourceObject =
import('@ember-data/store/-private/ts-interfaces/ember-data-json-api').ExistingResourceObject;

function isNonEmptyString(str: any): str is string {
return typeof str === 'string' && str.length > 0;
Expand Down
4 changes: 2 additions & 2 deletions packages/-ember-data/tests/integration/model-errors-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { module, test } from 'qunit';

import { hbs } from 'ember-cli-htmlbars';
import { setupRenderingTest } from 'ember-qunit';
import { TestContext } from 'ember-test-helpers';

import Model, { attr } from '@ember-data/model';

Expand All @@ -34,8 +33,9 @@ const template = hbs`
</ul>
`;

interface CurrentTestContext extends TestContext {
interface CurrentTestContext {
tag: Tag;
owner: any;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was typed as any already, and there is no import for it yet in ember-qunit 5 (ember-test-helpers is not available in the ember-qunit 5 world)

}

module('integration/model.errors', function (hooks) {
Expand Down
Loading