Skip to content

Commit

Permalink
Merge branch 'master' into v2-addon
Browse files Browse the repository at this point in the history
  • Loading branch information
BobrImperator committed Aug 18, 2023
2 parents 2bb0c57 + 5565f68 commit 5c768c8
Show file tree
Hide file tree
Showing 5 changed files with 274 additions and 147 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
- uses: actions/setup-node@bea5baf987ba7aa777a8a0b4ace377a21c45c381 # v3
with:
node-version: 16.x
registry-url: 'https://registry.npmjs.org'
Expand Down
8 changes: 4 additions & 4 deletions packages/classic-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"test:fastboot": "ember fastboot:test"
},
"devDependencies": {
"@babel/eslint-parser": "7.22.9",
"@babel/eslint-parser": "7.22.10",
"@ember/legacy-built-in-components": "0.4.2",
"@ember/optional-features": "2.0.0",
"@ember/string": "3.1.1",
Expand All @@ -35,7 +35,7 @@
"ember-cli-content-security-policy": "1.1.1",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-fastboot": "4.1.1",
"ember-cli-htmlbars": "6.2.0",
"ember-cli-htmlbars": "6.3.0",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
Expand All @@ -48,10 +48,10 @@
"ember-qunit": "7.0.0",
"ember-resolver": "11.0.0",
"ember-simple-auth": "6.0.0-rc.1",
"ember-source": "5.1.2",
"ember-source": "5.2.0",
"ember-source-channel-url": "3.0.0",
"ember-try": "3.0.0-beta.1",
"eslint": "8.46.0",
"eslint": "8.47.0",
"eslint-config-simplabs": "0.4.0",
"eslint-plugin-ember": "11.10.0",
"eslint-plugin-node": "11.1.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"test:fastboot": "ember fastboot:test"
},
"devDependencies": {
"@babel/eslint-parser": "7.22.9",
"@babel/eslint-parser": "7.22.10",
"@ember/legacy-built-in-components": "0.4.2",
"@ember/optional-features": "2.0.0",
"@ember/string": "3.1.1",
Expand All @@ -36,7 +36,7 @@
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-fastboot": "4.1.1",
"ember-cli-fastboot-testing": "0.6.1",
"ember-cli-htmlbars": "6.2.0",
"ember-cli-htmlbars": "6.3.0",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
Expand All @@ -49,10 +49,10 @@
"ember-qunit": "7.0.0",
"ember-resolver": "11.0.0",
"ember-simple-auth": "6.0.0-rc.1",
"ember-source": "5.1.2",
"ember-source": "5.2.0",
"ember-source-channel-url": "3.0.0",
"ember-try": "3.0.0-beta.1",
"eslint": "8.46.0",
"eslint": "8.47.0",
"eslint-config-simplabs": "0.4.0",
"eslint-plugin-ember": "11.10.0",
"eslint-plugin-node": "11.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/test-esa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"ember-qunit": "7.0.0",
"ember-resolver": "11.0.0",
"ember-simple-auth": "6.0.0-rc.1",
"ember-source": "5.1.2",
"ember-source": "5.2.0",
"ember-source-channel-url": "3.0.0",
"ember-try": "3.0.0-beta.1",
"eslint": "8.45.0",
Expand Down
Loading

0 comments on commit 5c768c8

Please sign in to comment.