Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ember-cli to v4.4 #373

Merged
merged 5 commits into from
May 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module.exports = {
extends: ['plugin:node/recommended'],
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
rules: {
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ on:
- master
pull_request: {}


concurrency:
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
test:
name: "Tests"
Expand Down Expand Up @@ -45,7 +50,7 @@ jobs:

try-scenarios:
name: ${{ matrix.try-scenario }}
needs: 'test'
needs: "test"
runs-on: ubuntu-latest
timeout-minutes: 10

Expand All @@ -57,19 +62,16 @@ jobs:
- ember-lts-3.20
- ember-lts-3.24
- ember-lts-3.28
- ember-lts-4
- ember-4
- ember-lts-4.4
- ember-lts-4.8
- ember-4.9
- ember-4.10
- ember-4.11
- ember-lts-4.12
- ember-release
# - ember-beta
# - ember-canary
- ember-default-with-jquery
- embroider-safe
# - embroider-optimized
- embroider-optimized

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,10 @@ data.json
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
4 changes: 4 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
/.prettierignore
/.prettierrc.js
Expand All @@ -36,4 +37,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
70 changes: 0 additions & 70 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ module('basic acceptance test', function(hooks) {

test('can visit /', async function(assert) {
await visit('/');
assert.equal(currentURL(), '/');
assert.strictEqual(currentURL(), '/');
});
});

Expand Down
45 changes: 1 addition & 44 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,12 @@ module.exports = async function () {
},
},
{
name: 'ember-lts-4',
name: 'ember-4',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.0.0',
'ember-source': '~4.0.0',
webpack: '^5.0.0',
},
},
},
Expand All @@ -61,7 +60,6 @@ module.exports = async function () {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.4.0',
'ember-source': '~4.4.0',
webpack: '^5.0.0',
},
},
},
Expand All @@ -72,29 +70,6 @@ module.exports = async function () {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.8.0',
'ember-source': '~4.8.0',
webpack: '^5.0.0',
},
},
},
{
name: 'ember-4.9',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.9.0',
'ember-source': '~4.9.0',
webpack: '^5.0.0',
},
},
},
{
name: 'ember-4.10',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.10.0',
'ember-source': '~4.10.0',
webpack: '^5.0.0',
},
},
},
Expand All @@ -105,7 +80,6 @@ module.exports = async function () {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.11.0',
'ember-source': '~4.11.0',
webpack: '^5.0.0',
},
},
},
Expand All @@ -116,7 +90,6 @@ module.exports = async function () {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.12.0',
'ember-source': '~4.12.0',
webpack: '^5.0.0',
},
},
},
Expand All @@ -127,7 +100,6 @@ module.exports = async function () {
'ember-auto-import': '^2.2.0',
'ember-data': 'latest',
'ember-source': await getChannelURL('release'),
webpack: '^5.0.0',
},
},
},
Expand All @@ -140,7 +112,6 @@ module.exports = async function () {
'ember-source': await getChannelURL('beta'),
'ember-resolver': '10.0.0',
'@ember/string': '3.0.1',
webpack: '^5.0.0',
},
},
},
Expand All @@ -153,20 +124,6 @@ module.exports = async function () {
'ember-source': await getChannelURL('canary'),
'ember-resolver': '10.0.0',
'@ember/string': '3.0.1',
webpack: '^5.0.0',
},
},
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true,
}),
},
npm: {
devDependencies: {
'@ember/jquery': '^1.1.0',
},
},
},
Expand Down
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,55 +40,55 @@
"broccoli-funnel": "^3.0.8",
"broccoli-merge-trees": "^4.2.0",
"broccoli-stew": "^3.0.0",
"ember-cli-babel": "^7.26.6",
"ember-cli-babel": "^7.26.11",
"ember-cli-string-utils": "^1.1.0",
"ember-cli-version-checker": "^5.1.2",
"ember-copy": "^2.0.1"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.4.2",
"@ember/render-modifiers": "^2.0.4",
"@embroider/test-setup": "^0.43.5",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@ember/test-helpers": "^2.7.0",
"@embroider/test-setup": "^1.6.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.11.3",
"ember-cli": "~3.28.1",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^5.7.1",
"ember-auto-import": "^2.4.1",
"ember-cli": "~4.4.1",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^10.0.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~3.28.0",
"ember-data": "~4.4.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-qunit": "^5.1.4",
"ember-resolver": "^8.0.2",
"ember-source": "~3.28.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.4.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.6.0",
"ember-try": "^1.4.0",
"ember-template-lint": "^4.8.0",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.4",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^10.6.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-qunit": "^6.2.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"highlight.js": "^11.6.0",
"inuitcss": "^6.0.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.2",
"qunit": "^2.16.0",
"qunit-dom": "^1.6.0",
"prettier": "^2.6.2",
"qunit": "^2.19.1",
"qunit-dom": "^2.0.0",
"release-it": "^14.2.1",
"release-it-lerna-changelog": "^3.1.0",
"sass": "^1.42.1"
"sass": "^1.42.1",
"webpack": "^5.72.1"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
Loading