diff --git a/.eslintignore b/.eslintignore index 60d7a106f35..9a21332a5b5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -9,6 +9,8 @@ **/tmp/ /packages/-ember-data/docs/ +**/DEBUG/ + # dependencies **/bower_components/ **/node_modules/ diff --git a/.eslintrc.js b/.eslintrc.js index 94d981e5fe4..c77d286792a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -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', diff --git a/.github/workflows/alpha-release.yml b/.github/workflows/alpha-release.yml index 731e1f0082a..8f0400f5336 100644 --- a/.github/workflows/alpha-release.yml +++ b/.github/workflows/alpha-release.yml @@ -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 @@ -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 diff --git a/.github/workflows/asset-size-check.yml b/.github/workflows/asset-size-check.yml index 667c047d775..d25dedfd883 100644 --- a/.github/workflows/asset-size-check.yml +++ b/.github/workflows/asset-size-check.yml @@ -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) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2fb8ac1264..6d81aa2d88e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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 @@ -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 @@ -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 }} @@ -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 @@ -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 @@ -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 }} @@ -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 }} @@ -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 }} @@ -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 @@ -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 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2611f3bdab8..f92eef6d7ff 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -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 @@ -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 diff --git a/package.json b/package.json index 60c27cc8b36..271a42a3afc 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -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", @@ -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", @@ -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": { @@ -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": { diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json index ce6ce216898..7d24fc84b6c 100644 --- a/packages/-ember-data/package.json +++ b/packages/-ember-data/package.json @@ -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", @@ -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", @@ -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" @@ -95,7 +97,7 @@ "configPath": "tests/dummy/config" }, "volta": { - "node": "12.16.2", + "node": "14.17.0", "yarn": "1.22.4" } -} +} \ No newline at end of file diff --git a/packages/-ember-data/tests/dummy/config/environment.js b/packages/-ember-data/tests/dummy/config/environment.js index 93328de4a55..38a6f15b85f 100644 --- a/packages/-ember-data/tests/dummy/config/environment.js +++ b/packages/-ember-data/tests/dummy/config/environment.js @@ -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 diff --git a/packages/-ember-data/tests/dummy/config/targets.js b/packages/-ember-data/tests/dummy/config/targets.js index c0df8dd5445..4fd3ea66e38 100644 --- a/packages/-ember-data/tests/dummy/config/targets.js +++ b/packages/-ember-data/tests/dummy/config/targets.js @@ -9,4 +9,5 @@ if (targetIsIE11) { module.exports = { browsers, + node: 'current', }; diff --git a/packages/-ember-data/tests/index.html b/packages/-ember-data/tests/index.html index fd15b0f6ab8..d64703d988e 100644 --- a/packages/-ember-data/tests/index.html +++ b/packages/-ember-data/tests/index.html @@ -25,17 +25,17 @@ - - {{content-for "body-footer"}} {{content-for "test-body-footer"}} + +
+