From a68c9769e1e392a3c7776274ac218aed75e15377 Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Tue, 7 Sep 2021 11:58:37 -0600 Subject: [PATCH] Upgrade to latest ember-cli --- packages/compat/src/get-real-addon.ts | 2 +- packages/router/package.json | 2 +- packages/util/package.json | 4 +- test-packages/fastboot-addon/package.json | 2 +- test-packages/sample-transforms/package.json | 2 +- test-packages/support/package.json | 2 +- tests/addon-template/package.json | 2 +- tests/app-template/package.json | 2 +- yarn.lock | 54 +++++++++++++++++--- 9 files changed, 55 insertions(+), 17 deletions(-) diff --git a/packages/compat/src/get-real-addon.ts b/packages/compat/src/get-real-addon.ts index 55080b35d..50dcd7e9c 100644 --- a/packages/compat/src/get-real-addon.ts +++ b/packages/compat/src/get-real-addon.ts @@ -7,7 +7,7 @@ let TARGET_INSTANCE_SYMBOL: any; try { - // eslint-disable-next-line @typescript-eslint/no-require-imports + // eslint-disable-next-line @typescript-eslint/no-require-imports, import/no-extraneous-dependencies const targetInstanceModule = require('ember-cli/lib/models/per-bundle-addon-cache/target-instance'); if (targetInstanceModule) { diff --git a/packages/router/package.json b/packages/router/package.json index 48b993a47..99dc0a6fa 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -45,7 +45,7 @@ "broccoli-asset-rev": "^3.0.0", "cross-env": "^7.0.3", "ember-auto-import": "^1.11.2", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-dependency-checker": "^3.1.0", "ember-cli-htmlbars": "^4.3.1", "ember-cli-htmlbars-inline-precompile": "^2.1.0", diff --git a/packages/util/package.json b/packages/util/package.json index 2e5fb7826..fe506dada 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -48,7 +48,7 @@ "broccoli-asset-rev": "^3.0.0", "cross-env": "^7.0.3", "ember-auto-import": "^2.2.0", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-htmlbars": "^5.3.2", "ember-cli-inject-live-reload": "^2.0.2", @@ -61,7 +61,7 @@ "ember-page-title": "^6.2.1", "ember-qunit": "^5.1.2", "ember-resolver": "^8.0.2", - "ember-source": "~3.26", + "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/release/shas/f243a4f0947a0be1d324b5250c4e2327c6bd7a5f.tgz", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^2.18.1", "ember-try": "^1.4.0", diff --git a/test-packages/fastboot-addon/package.json b/test-packages/fastboot-addon/package.json index 2fe59cc6d..29fce734d 100644 --- a/test-packages/fastboot-addon/package.json +++ b/test-packages/fastboot-addon/package.json @@ -33,7 +33,7 @@ "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", diff --git a/test-packages/sample-transforms/package.json b/test-packages/sample-transforms/package.json index 3ed396f51..2e108698f 100644 --- a/test-packages/sample-transforms/package.json +++ b/test-packages/sample-transforms/package.json @@ -28,7 +28,7 @@ "@embroider/test-support": "0.36.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-dependency-checker": "^3.1.0", "ember-cli-eslint": "^5.1.0", "ember-cli-htmlbars": "^4.3.1", diff --git a/test-packages/support/package.json b/test-packages/support/package.json index ba991a80d..06851e2fc 100644 --- a/test-packages/support/package.json +++ b/test-packages/support/package.json @@ -14,7 +14,7 @@ "broccoli": "^3.4.2", "console-ui": "^3.0.0", "ember-auto-import": "^2.2.0", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-babel": "^7.20.5", "ember-cli-htmlbars": "^4.2.0", "ember-resolver": "^7.0.0", diff --git a/tests/addon-template/package.json b/tests/addon-template/package.json index bf6cc7050..25980315b 100644 --- a/tests/addon-template/package.json +++ b/tests/addon-template/package.json @@ -38,7 +38,7 @@ "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", diff --git a/tests/app-template/package.json b/tests/app-template/package.json index e57c16b28..f01cc52d8 100644 --- a/tests/app-template/package.json +++ b/tests/app-template/package.json @@ -35,7 +35,7 @@ "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-app-version": "^5.0.0", "ember-cli-babel": "^7.26.3", "ember-cli-dependency-checker": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index 9588c6b76..8b1a51869 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2060,6 +2060,13 @@ dependencies: babel-plugin-debug-macros "^0.3.4" +"@glimmer/vm-babel-plugins@0.80.0": + version "0.80.0" + resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.0.tgz#e9a6b496501eed367b94c928dc48a954830af3b5" + integrity sha512-ZW6+L+FzjDZngGj87zn3MRRA/MrchC7Con33mCcI36v8u48maheB351uhQe+fBVU300IfyzNMvAdwdVKS5VIFw== + dependencies: + babel-plugin-debug-macros "^0.3.4" + "@glimmer/vm@^0.42.2": version "0.42.2" resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.42.2.tgz#492a4f05eac587c3a37371b3c62593f20bef553d" @@ -8147,10 +8154,10 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2: semver "^7.3.4" silent-error "^1.1.1" -ember-cli@~3.27.0: - version "3.27.0" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.27.0.tgz#8ccf9db51d7b462f86210b853d086a4543605c34" - integrity sha512-vFLPFkplXn5v005fattHdOcs5AbSp7RG4w1wpHDWHzOSYpl2Dr+5zzZtqLS7V5IVaLf3XK4l24XwhSW9HpMfsQ== +ember-cli@~3.28.0: + version "3.28.0" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.0.tgz#0a0374c9a1d08386ddf56e8098a38b71dd4453bc" + integrity sha512-CrMs5edFQ2ingO2xfT33T4nUEl8SlvBQ7q+XO9L/GFTvFU07slHxYSvGur0cwgQfOiLnkSTnIaVF1oqBnEmfPQ== dependencies: "@babel/core" "^7.13.8" "@babel/plugin-transform-modules-amd" "^7.12.1" @@ -8166,7 +8173,7 @@ ember-cli@~3.27.0: broccoli-config-loader "^1.0.1" broccoli-config-replace "^1.1.2" broccoli-debug "^0.6.5" - broccoli-funnel "^2.0.2" + broccoli-funnel "^3.0.5" broccoli-funnel-reducer "^1.0.0" broccoli-merge-trees "^3.0.2" broccoli-middleware "^2.1.1" @@ -8232,7 +8239,7 @@ ember-cli@~3.27.0: sane "^4.1.0" semver "^7.3.4" silent-error "^1.1.1" - sort-package-json "^1.48.0" + sort-package-json "^1.49.0" symlink-or-copy "^1.3.1" temp "0.9.4" testem "^3.2.0" @@ -8241,7 +8248,7 @@ ember-cli@~3.27.0: uuid "^8.3.2" walk-sync "^2.2.0" watch-detector "^1.0.0" - workerpool "^6.0.3" + workerpool "^6.1.4" yam "^1.0.0" ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.2, ember-compatibility-helpers@^1.2.4: @@ -8877,6 +8884,37 @@ ember-source-channel-url@^3.0.0: semver "^7.3.4" silent-error "^1.1.1" +"ember-source@https://s3.amazonaws.com/builds.emberjs.com/release/shas/f243a4f0947a0be1d324b5250c4e2327c6bd7a5f.tgz": + version "3.28.0-release" + resolved "https://s3.amazonaws.com/builds.emberjs.com/release/shas/f243a4f0947a0be1d324b5250c4e2327c6bd7a5f.tgz#83db5d57cde6579de7de1a9b8705cc0000c3a8fb" + dependencies: + "@babel/helper-module-imports" "^7.8.3" + "@babel/plugin-transform-block-scoping" "^7.8.3" + "@babel/plugin-transform-object-assign" "^7.8.3" + "@ember/edition-utils" "^1.2.0" + "@glimmer/vm-babel-plugins" "0.80.0" + babel-plugin-debug-macros "^0.3.3" + babel-plugin-filter-imports "^4.0.0" + broccoli-concat "^4.2.4" + broccoli-debug "^0.6.4" + broccoli-file-creator "^2.1.1" + broccoli-funnel "^2.0.2" + broccoli-merge-trees "^4.2.0" + chalk "^4.0.0" + ember-cli-babel "^7.23.0" + ember-cli-get-component-path-option "^1.0.0" + ember-cli-is-package-missing "^1.0.0" + ember-cli-normalize-entity-name "^1.0.0" + ember-cli-path-utils "^1.0.0" + ember-cli-string-utils "^1.1.0" + ember-cli-version-checker "^5.1.1" + ember-router-generator "^2.0.0" + inflection "^1.12.0" + jquery "^3.5.1" + resolve "^1.17.0" + semver "^7.3.4" + silent-error "^1.1.1" + ember-source@~3.26: version "3.26.1" resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.26.1.tgz#8c9e8a314fb0da447b944d64f9d92a80a628d7b5" @@ -16276,7 +16314,7 @@ sort-object-keys@^1.1.3: resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45" integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg== -sort-package-json@^1.39.1, sort-package-json@^1.44.0, sort-package-json@^1.48.0: +sort-package-json@^1.39.1, sort-package-json@^1.44.0, sort-package-json@^1.48.0, sort-package-json@^1.49.0: version "1.50.0" resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.50.0.tgz#19fc109fe23bd157bd03c8e572fa3251a52467d8" integrity sha512-qZpqhMU9XTntebgAgc4hv/D6Fzhh7kFnwvV6a7+q8y8J5JoaDqPYQnvXPf7BBqG95tdE8X6JVNo7/jDzcbdfUg==