Skip to content

Commit b2666f9

Browse files
mydeamydea
committed
update ember dev dependencies to latest
1 parent 3e2a3d9 commit b2666f9

File tree

16 files changed

+2467
-1109
lines changed

16 files changed

+2467
-1109
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ jobs:
390390
runs-on: ubuntu-latest
391391
strategy:
392392
matrix:
393-
scenario: [ember-release, ember-beta, ember-classic, ember-lts-3.24]
393+
scenario: [ember-release, ember-beta, ember-classic, ember-4.0]
394394
steps:
395395
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
396396
uses: actions/checkout@v3

‎packages/ember/.ember-cli‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": true
915
}

‎packages/ember/.eslintignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/
1921
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2023
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

‎packages/ember/.eslintrc.js‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ module.exports = {
2727
// node files
2828
{
2929
files: [
30-
'.eslintrc.js',
31-
'.template-lintrc.js',
32-
'ember-cli-build.js',
33-
'index.js',
34-
'testem.js',
35-
'blueprints/*/index.js',
36-
'config/**/*.js',
37-
'tests/dummy/config/**/*.js',
30+
'./.eslintrc.js',
31+
'./.prettierrc.js',
32+
'./.template-lintrc.js',
33+
'./ember-cli-build.js',
34+
'./index.js',
35+
'./testem.js',
36+
'./blueprints/*/index.js',
37+
'./config/**/*.js',
38+
'./tests/dummy/config/**/*.js',
3839
],
39-
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
4040
parserOptions: {
4141
sourceType: 'script',
4242
},
@@ -47,5 +47,10 @@ module.exports = {
4747
plugins: ['node'],
4848
extends: ['plugin:node/recommended'],
4949
},
50+
{
51+
// test files
52+
files: ['tests/**/*-test.{js,ts}'],
53+
extends: ['plugin:qunit/recommended'],
54+
},
5055
],
5156
};

‎packages/ember/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,10 @@
2222
# ember-try
2323
/.node_modules.ember-try/
2424
/bower.json.ember-try
25+
/npm-shrinkwrap.json.ember-try
2526
/package.json.ember-try
27+
/package-lock.json.ember-try
28+
/yarn.lock.ember-try
29+
30+
# broccoli-debug
31+
/DEBUG/

‎packages/ember/.npmignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
/.eslintignore
1717
/.eslintrc.js
1818
/.git/
19+
/.github/
1920
/.gitignore
21+
/.prettierignore
22+
/.prettierrc.js
2023
/.template-lintrc.js
2124
/.travis.yml
2225
/.watchmanconfig
@@ -26,11 +29,15 @@
2629
/ember-cli-build.js
2730
/testem.js
2831
/tests/
32+
/yarn-error.log
2933
/yarn.lock
3034
/.npmignore
3135
.gitkeep
3236

3337
# ember-try
3438
/.node_modules.ember-try/
3539
/bower.json.ember-try
40+
/npm-shrinkwrap.json.ember-try
3641
/package.json.ember-try
42+
/package-lock.json.ember-try
43+
/yarn.lock.ember-try

‎packages/ember/.template-lintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
};

‎packages/ember/config/ember-try.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ module.exports = async function () {
2727
if (process.env.GITHUB_ACTIONS) {
2828
scenarios = scenarios.concat([
2929
{
30-
name: 'ember-lts-3.24',
30+
name: 'ember-4.0',
3131
npm: {
3232
devDependencies: {
33-
'ember-source': '~3.24.0',
33+
'ember-source': '~4.0.1',
3434
},
3535
},
3636
},

‎packages/ember/ember-cli-build.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function (defaults) {
6-
let app = new EmberAddon(defaults, {
6+
const app = new EmberAddon(defaults, {
77
// Add options here
88
});
99

@@ -13,6 +13,13 @@ module.exports = function (defaults) {
1313
This build file does *not* influence how the addon or the app using it
1414
behave. You most likely want to be modifying `./index.js` or app's build file
1515
*/
16+
1617
const { maybeEmbroider } = require('@embroider/test-setup');
17-
return maybeEmbroider(app);
18+
return maybeEmbroider(app, {
19+
skipBabel: [
20+
{
21+
package: 'qunit',
22+
},
23+
],
24+
});
1825
};

‎packages/ember/package.json‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
"build:extras": "yarn build",
2222
"build:npm": "ember ts:precompile && npm pack && ember ts:clean",
2323
"clean": "yarn rimraf sentry-ember-*.tgz",
24-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
24+
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
2525
"lint:hbs": "ember-template-lint .",
2626
"lint:js": "eslint . --cache --cache-location '../../eslintcache/'",
2727
"start": "ember serve",
28-
"test": "ember try:each",
28+
"test:ember": "ember test",
29+
"test:ember-all": "ember try:each",
30+
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
2931
"test:all": "node ./scripts/run-CI-tests.js"
3032
},
3133
"dependencies": {
@@ -34,51 +36,52 @@
3436
"@sentry/tracing": "7.16.0",
3537
"@sentry/types": "7.16.0",
3638
"@sentry/utils": "7.16.0",
37-
"ember-auto-import": "~1.12.1 || ~2.2.0",
38-
"ember-cli-babel": "~7.26.6",
39-
"ember-cli-htmlbars": "^6.0.1",
39+
"ember-auto-import": "^1.12.1 || ^2.4.3",
40+
"ember-cli-babel": "^7.26.11",
41+
"ember-cli-htmlbars": "^6.1.1",
4042
"ember-cli-typescript": "^4.2.1"
4143
},
4244
"devDependencies": {
4345
"@ember/optional-features": "~1.3.0",
46+
"@ember/test-helpers": "~2.8.1",
4447
"@embroider/test-setup": "~1.8.3",
45-
"@glimmer/component": "~1.0.0",
46-
"@glimmer/tracking": "~1.0.0",
47-
"@types/ember": "~3.16.5",
48-
"@types/ember-qunit": "~3.4.9",
49-
"@types/ember__debug": "^3.16.5",
50-
"@types/ember__test-helpers": "~1.7.0",
48+
"@glimmer/component": "~1.1.2",
49+
"@glimmer/tracking": "~1.1.2",
50+
"@types/ember": "~4.0.1",
51+
"@types/ember-qunit": "~5.0.2",
52+
"@types/ember__debug": "~4.0.1",
53+
"@types/ember__test-helpers": "~2.8.1",
5154
"@types/qunit": "~2.9.1",
5255
"@types/rsvp": "~4.0.3",
53-
"babel-eslint": "^10.1.0",
56+
"babel-eslint": "~10.1.0",
5457
"broccoli-asset-rev": "~3.0.0",
55-
"ember-cli": "~3.24.0",
56-
"ember-cli-dependency-checker": "~3.2.0",
57-
"ember-cli-inject-live-reload": "~2.0.2",
58+
"ember-cli": "~4.8.0",
59+
"ember-cli-dependency-checker": "~3.3.1",
60+
"ember-cli-inject-live-reload": "~2.1.0",
5861
"ember-cli-sri": "~2.1.1",
5962
"ember-cli-typescript-blueprints": "~3.0.0",
6063
"ember-cli-uglify": "~3.0.0",
6164
"ember-disable-prototype-extensions": "~1.1.3",
62-
"ember-export-application-global": "~2.0.1",
6365
"ember-load-initializers": "~2.1.1",
64-
"ember-maybe-import-regenerator": "~0.1.6",
65-
"ember-qunit": "~4.6.0",
66-
"ember-resolver": "~8.0.0",
67-
"ember-sinon-qunit": "~5.0.0",
68-
"ember-source": "~3.20.0",
66+
"ember-qunit": "~6.0.0",
67+
"ember-resolver": "~8.0.3",
68+
"ember-sinon-qunit": "~6.0.0",
69+
"ember-source": "~4.8.0",
6970
"ember-source-channel-url": "~2.0.1",
70-
"ember-template-lint": "~2.9.1",
71-
"ember-test-selectors": "~5.5.0",
72-
"ember-try": "~1.4.0",
73-
"ember-window-mock": "~0.7.1",
74-
"eslint-plugin-ember": "~8.6.0",
75-
"eslint-plugin-node": "^11.1.0",
71+
"ember-template-lint": "~4.16.1",
72+
"ember-test-selectors": "~6.0.0",
73+
"ember-try": "~2.0.0",
74+
"ember-window-mock": "~0.8.1",
75+
"eslint-plugin-ember": "~11.1.0",
76+
"eslint-plugin-node": "~11.1.0",
77+
"eslint-plugin-qunit": "~7.3.1",
7678
"loader.js": "~4.7.0",
77-
"qunit-dom": "~1.2.0",
78-
"webpack": "^5.65.0"
79+
"qunit": "~2.19.2",
80+
"qunit-dom": "~2.0.0",
81+
"webpack": "~5.74.0"
7982
},
8083
"engines": {
81-
"node": "10.* || >= 12"
84+
"node": "14.* || 16.* || >= 18"
8285
},
8386
"ember": {
8487
"edition": "octane"
@@ -87,7 +90,6 @@
8790
"configPath": "tests/dummy/config"
8891
},
8992
"volta": {
90-
"node": "14.15.4",
91-
"yarn": "1.22.5"
93+
"extends": "../../package.json"
9294
}
9395
}

0 commit comments

Comments
 (0)