Skip to content

Commit

Permalink
chore(deps): bump broccoli-rollup from 4.1.1 to 5.0.0 (#7559) (#7762)
Browse files Browse the repository at this point in the history 
* chore(deps): bump broccoli-rollup from 4.1.1 to 5.0.0 (#7559)

Bumps [broccoli-rollup](https://github.com/chadhietala/broccoli-rollup) from 4.1.1 to 5.0.0.
- [Release notes](https://github.com/chadhietala/broccoli-rollup/releases)
- [Changelog](https://github.com/chadhietala/broccoli-rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chadhietala/broccoli-rollup/commits/v5.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CI timeouts testing bump (#7734)

* Fix hanging store.destroy testt (#7703)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
@snewcomer @dependabot
snewcomer and dependabot[bot] authored Nov 23, 2021
1 parent 362ae1a commit b13399a
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 47 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: yarn problems

test-infra:
timeout-minutes: 8
timeout-minutes: 10
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -138,12 +138,12 @@ jobs:
- name: Install dependencies
run: yarn install --frozen-lockfile --network-timeout=300000
- name: Fastboot Test ${{ matrix.scenario }}
timeout-minutes: 6
timeout-minutes: 12
run: yarn test:fastboot ${{ matrix.scenario }}

browser-tests:
needs: [lint]
timeout-minutes: 20
timeout-minutes: 20
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -175,15 +175,15 @@ jobs:
run: |
yarn run testem launchers
- name: Run Production Test
timeout-minutes: 8
timeout-minutes: 10
env:
TESTEM_CI_LAUNCHER: ${{ matrix.launcher }}
CI: true
run:
yarn test:production

floating-dependencies:
timeout-minutes: 6
timeout-minutes: 10
needs: [lint, basic-tests]
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -211,13 +211,13 @@ jobs:
- name: Install dependencies
run: yarn install
- name: Basic tests with ${{ matrix.scenario }}
timeout-minutes: 6
timeout-minutes: 10
env:
CI: true
run: yarn test:try-one ${{ matrix.scenario }}

releases:
timeout-minutes: 6
timeout-minutes: 10
needs: [lint, basic-tests]
if: |
github.event_name == 'pull_request' && (
Expand All @@ -243,7 +243,7 @@ jobs:
run: yarn test:try-one ${{ matrix.scenario }}

additional-scenarios:
timeout-minutes: 7
timeout-minutes: 8
needs: [lint, basic-tests]
strategy:
matrix:
Expand All @@ -270,7 +270,7 @@ jobs:

node-version-test:
name: Use Node.js ${{ matrix.node-version }}
timeout-minutes: 6
timeout-minutes: 8
needs: [lint, basic-tests]
runs-on: ubuntu-latest
strategy:
Expand Down
7 changes: 5 additions & 2 deletions packages/-ember-data/tests/integration/store-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,11 @@ module('integration/store - destroy', function (hooks) {
// to flush, potentially pushing data into the store
await settled();
assert.ok(true, 'we made it to the end');
await requestPromise;
assert.ok(false, 'we should never make it here');
requestPromise.then(() => {
assert.ok(false, 'we should never make it here');
});

await settled();
});

test('destroying the store correctly cleans everything up', async function (assert) {
Expand Down
2 changes: 1 addition & 1 deletion packages/private-build-infra/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"broccoli-file-creator": "^2.1.1",
"broccoli-funnel": "^3.0.3",
"broccoli-merge-trees": "^4.2.0",
"broccoli-rollup": "^4.1.1",
"broccoli-rollup": "^5.0.0",
"calculate-cache-key-for-tree": "^2.0.0",
"chalk": "^4.0.0",
"ember-cli-babel": "^7.26.6",
Expand Down
70 changes: 35 additions & 35 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2195,10 +2195,12 @@
"@types/connect" "*"
"@types/node" "*"

"@types/broccoli-plugin@^1.3.0":
version "1.3.0"
resolved "https://registry.npmjs.org/@types/broccoli-plugin/-/broccoli-plugin-1.3.0.tgz#38f8462fecaebc4e09a32e4d4ed1b9808f75bbca"
integrity sha512-SLk4/hFc2kGvgwNFrpn2O1juxFOllcHAywvlo7VwxfExLzoz1GGJ0oIZCwj5fwSpvHw4AWpZjJ1fUvb62PDayQ==
"@types/broccoli-plugin@^3.0.0":
version "3.0.0"
resolved "https://registry.npmjs.org/@types/broccoli-plugin/-/broccoli-plugin-3.0.0.tgz#290fda2270c47a568edfd0cefab8bb840d8bb7b2"
integrity sha512-f+TcsARR2PovfFRKFdCX0kfH/QoM3ZVD2h1rl2mNvrKO0fq2uBNCBsTU3JanfU4COCt5cXpTfARyUsERlC8vIw==
dependencies:
broccoli-plugin "*"

"@types/chai-as-promised@^7.1.2":
version "7.1.4"
Expand Down Expand Up @@ -2970,7 +2972,7 @@ acorn@^6.4.1:
resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==

acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
acorn@^7.1.1, acorn@^7.4.0:
version "7.4.1"
resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
Expand Down Expand Up @@ -4781,6 +4783,19 @@ broccoli-persistent-filter@^3.1.2:
symlink-or-copy "^1.0.1"
sync-disk-cache "^2.0.0"

broccoli-plugin@*, broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3, broccoli-plugin@^4.0.7:
version "4.0.7"
resolved "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz#dd176a85efe915ed557d913744b181abe05047db"
integrity sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==
dependencies:
broccoli-node-api "^1.7.0"
broccoli-output-wrapper "^3.2.5"
fs-merger "^3.2.1"
promise-map-series "^0.3.0"
quick-temp "^0.1.8"
rimraf "^3.0.2"
symlink-or-copy "^1.3.1"

broccoli-plugin@1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
Expand All @@ -4801,7 +4816,7 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli
rimraf "^2.3.4"
symlink-or-copy "^1.1.8"

broccoli-plugin@^2.0.0, broccoli-plugin@^2.1.0:
broccoli-plugin@^2.1.0:
version "2.1.0"
resolved "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-2.1.0.tgz#2fab6c578219cfcc64f773e9616073313fc8b334"
integrity sha512-ElE4caljW4slapyEhSD9jU9Uayc8SoSABWdmY9SqbV8DHNxU6xg1jJsPcMm+cXOvggR3+G+OXAYQeFjWVnznaw==
Expand All @@ -4824,33 +4839,20 @@ broccoli-plugin@^3.1.0:
rimraf "^2.3.4"
symlink-or-copy "^1.1.8"

broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3, broccoli-plugin@^4.0.7:
version "4.0.7"
resolved "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz#dd176a85efe915ed557d913744b181abe05047db"
integrity sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==
dependencies:
broccoli-node-api "^1.7.0"
broccoli-output-wrapper "^3.2.5"
fs-merger "^3.2.1"
promise-map-series "^0.3.0"
quick-temp "^0.1.8"
rimraf "^3.0.2"
symlink-or-copy "^1.3.1"

broccoli-rollup@^4.1.1:
version "4.1.1"
resolved "https://registry.npmjs.org/broccoli-rollup/-/broccoli-rollup-4.1.1.tgz#7531a24d88ddab9f1bace1c6ee6e6ca74a38d36f"
integrity sha512-hkp0dB5chiemi32t6hLe5bJvxuTOm1TU+SryFlZIs95KT9+94uj0C8w6k6CsZ2HuIdIZg6D252t4gwOlcTXrpA==
broccoli-rollup@^5.0.0:
version "5.0.0"
resolved "https://registry.npmjs.org/broccoli-rollup/-/broccoli-rollup-5.0.0.tgz#a77b53bcef1b70e988913fee82265c0a4ca530da"
integrity sha512-QdMuXHwsdz/LOS8zu4HP91Sfi4ofimrOXoYP/lrPdRh7lJYD87Lfq4WzzUhGHsxMfzANIEvl/7qVHKD3cFJ4tA==
dependencies:
"@types/broccoli-plugin" "^1.3.0"
broccoli-plugin "^2.0.0"
"@types/broccoli-plugin" "^3.0.0"
broccoli-plugin "^4.0.7"
fs-tree-diff "^2.0.1"
heimdalljs "^0.2.6"
node-modules-path "^1.0.1"
rollup "^1.12.0"
rollup "^2.50.0"
rollup-pluginutils "^2.8.1"
symlink-or-copy "^1.2.0"
walk-sync "^1.1.3"
walk-sync "^2.2.0"

broccoli-slow-trees@^3.0.1, broccoli-slow-trees@^3.1.0:
version "3.1.0"
Expand Down Expand Up @@ -13890,14 +13892,12 @@ rollup-pluginutils@^2.8.1:
dependencies:
estree-walker "^0.6.1"

rollup@^1.12.0:
version "1.32.1"
resolved "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4"
integrity sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==
dependencies:
"@types/estree" "*"
"@types/node" "*"
acorn "^7.1.0"
rollup@^2.50.0:
version "2.50.2"
resolved "https://registry.npmjs.org/rollup/-/rollup-2.50.2.tgz#640c500c68c698f62efb01857e0ff06fcd18181f"
integrity sha512-Ra5JkxSiZPZZFnvE68KWtlrLnZGg5LNaV1n1esq4ch69P7ReeoRVlrTuL/k+L/GJfcowA5An0BEhEq2Hfzwl6w==
optionalDependencies:
fsevents "~2.3.1"

route-recognizer@^0.3.3:
version "0.3.4"
Expand Down

0 comments on commit b13399a

Please sign in to comment.