Skip to content

Commit

Permalink
Merge branch 'emberjs:main' into fix-unknown-template-only
Browse files Browse the repository at this point in the history
  • Loading branch information
patricklx authored Jul 10, 2024
2 parents fc44c29 + f907531 commit bd03a66
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 10 deletions.
12 changes: 4 additions & 8 deletions .release-plan.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
{
"solution": {
"ember-inspector": {
"impact": "minor",
"oldVersion": "4.11.0",
"newVersion": "4.12.0",
"impact": "patch",
"oldVersion": "4.12.0",
"newVersion": "4.12.1",
"constraints": [
{
"impact": "minor",
"reason": "Appears in changelog section :rocket: Enhancement"
},
{
"impact": "patch",
"reason": "Appears in changelog section :house: Internal"
Expand All @@ -17,5 +13,5 @@
"pkgJSONPath": "./package.json"
}
},
"description": "## Release (2024-05-06)\n\nember-inspector 4.12.0 (minor)\n\n#### :rocket: Enhancement\n* `ember-inspector`\n * [#2553](https://github.com/emberjs/ember-inspector/pull/2553) Mark dependent keys that updated ([@patricklx](https://github.com/patricklx))\n * [#2548](https://github.com/emberjs/ember-inspector/pull/2548) add modifiers to render tree ([@patricklx](https://github.com/patricklx))\n * [#2443](https://github.com/emberjs/ember-inspector/pull/2443) Add ability to jump to source for functions and classes ([@patricklx](https://github.com/patricklx))\n * [#2536](https://github.com/emberjs/ember-inspector/pull/2536) improve route debug ([@patricklx](https://github.com/patricklx))\n\n#### :house: Internal\n* `ember-inspector`\n * [#2571](https://github.com/emberjs/ember-inspector/pull/2571) fix beta & canary tests ([@patricklx](https://github.com/patricklx))\n * [#2567](https://github.com/emberjs/ember-inspector/pull/2567) add internal to dependabot prs ([@patricklx](https://github.com/patricklx))\n * [#2563](https://github.com/emberjs/ember-inspector/pull/2563) add release plan ([@patricklx](https://github.com/patricklx))\n * [#2565](https://github.com/emberjs/ember-inspector/pull/2565) build(deps-dev): bump express from 4.18.2 to 4.19.2 ([@dependabot[bot]](https://github.com/apps/dependabot))\n * [#2564](https://github.com/emberjs/ember-inspector/pull/2564) build(deps-dev): bump follow-redirects from 1.15.4 to 1.15.6 ([@dependabot[bot]](https://github.com/apps/dependabot))\n * [#2560](https://github.com/emberjs/ember-inspector/pull/2560) build(deps-dev): bump ip from 1.1.8 to 1.1.9 ([@dependabot[bot]](https://github.com/apps/dependabot))\n * [#2498](https://github.com/emberjs/ember-inspector/pull/2498) Remove outdated code and unnecessary captureRenderTree patching ([@patricklx](https://github.com/patricklx))\n * [#2511](https://github.com/emberjs/ember-inspector/pull/2511) chore(deps): remove unused AWS SDK for JavaScript ([@trivikr](https://github.com/trivikr))\n * [#2556](https://github.com/emberjs/ember-inspector/pull/2556) build(deps-dev): bump @types/ember__routing from 4.0.12 to 4.0.21 ([@dependabot[bot]](https://github.com/apps/dependabot))\n\n#### Committers: 2\n- Patrick Pircher ([@patricklx](https://github.com/patricklx))\n- Trivikram Kamat ([@trivikr](https://github.com/trivikr))\n"
"description": "## Release (2024-07-10)\n\nember-inspector 4.12.1 (patch)\n\n#### :house: Internal\n* `ember-inspector`\n * [#2582](https://github.com/emberjs/ember-inspector/pull/2582) skip failing test ([@patricklx](https://github.com/patricklx))\n\n#### Committers: 1\n- Patrick Pircher ([@patricklx](https://github.com/patricklx))\n"
}
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## Release (2024-07-10)

ember-inspector 4.12.1 (patch)

#### :house: Internal
* `ember-inspector`
* [#2582](https://github.com/emberjs/ember-inspector/pull/2582) skip failing test ([@patricklx](https://github.com/patricklx))

#### Committers: 1
- Patrick Pircher ([@patricklx](https://github.com/patricklx))

## Release (2024-05-06)

ember-inspector 4.12.0 (minor)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-inspector",
"version": "4.12.0",
"version": "4.12.1",
"description": "Extends developer tools to allow you to better inspect your Ember.js apps.",
"repository": "https://github.com/emberjs/ember-inspector",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion tests/ember_debug/object-inspector-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ module('Ember Debug - Object Inspector', function (hooks) {
assert.strictEqual(nameProperty.value.inspect, inspect('My Object'));
});

test('An ES6 Class is correctly transformed into an inspection hash', async function (assert) {
test.skip('An ES6 Class is correctly transformed into an inspection hash', async function (assert) {
if (compareVersion(VERSION, '3.9.0') === -1) {
assert.expect(0);
return;
Expand Down

0 comments on commit bd03a66

Please sign in to comment.