Skip to content

Commit fdc667c

Browse files
authored
Merge pull request #496 from babel/update-dev-deps
Update development dependencies
2 parents c343860 + b17cf14 commit fdc667c

File tree

11 files changed

+3602
-5027
lines changed

11 files changed

+3602
-5027
lines changed

.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/blueprints/*/files/**/*.js
1+
/dist/

.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ module.exports = {
2121
// node files
2222
{
2323
files: [
24+
'.eslintrc.js',
2425
'ember-cli-build.js',
2526
'index.js',
2627
'testem.js',

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/bower_components
1010

1111
# misc
12+
/.eslintcache
1213
/.sass-cache
1314
/connect.lock
1415
/coverage/*

node-tests/addon-test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const createTempDir = BroccoliTestHelper.createTempDir;
1818
const terminateWorkerPool = require('./utils/terminate-workers');
1919
const path = require('path');
2020
const fs = require('fs');
21-
const rimraf = require('rimraf');
21+
const { rimraf } = require('rimraf');
2222
const {
2323
_shouldHandleTypeScript,
2424
_shouldIncludeHelpers,
@@ -1035,7 +1035,7 @@ describe('ember-cli-babel', function() {
10351035
expect(
10361036
output.read()
10371037
).to.deep.equal({
1038-
"foo.js": `define(\"foo\", [], function () {\n \"use strict\";\n\n Ember.String.camelize('stuff-here');\n});`
1038+
"foo.js": `define("foo", [], function () {\n "use strict";\n\n Ember.String.camelize('stuff-here');\n});`
10391039
});
10401040
}));
10411041
});
@@ -1242,7 +1242,7 @@ describe('ember-cli-babel', function() {
12421242
expect(
12431243
output.read()
12441244
).to.deep.equal({
1245-
'foo.js': `define("foo", [], function () {\n "use strict";\n\n var foo = "hi";\n});`
1245+
'foo.js': `define("foo", [], function () {\n "use strict";\n\n let foo = "hi";\n});`
12461246
});
12471247
}));
12481248

@@ -2048,7 +2048,7 @@ describe('EmberData Packages Polyfill', function() {
20482048
assembleLines([
20492049
`Object.defineProperty(_exports, "default", {`,
20502050
` enumerable: true,`,
2051-
` get: function get() {`,
2051+
` get: function () {`,
20522052
` return _emberData.default;`,
20532053
` }`,
20542054
`});`
@@ -2282,7 +2282,7 @@ describe('babel config file', function() {
22822282
yield output.build();
22832283

22842284
expect(output.read()).to.deep.equal({
2285-
"foo.js": `define(\"foo\", [\"exports\"], function (_exports) {\n \"use strict\";\n\n Object.defineProperty(_exports, \"__esModule\", {\n value: true\n });\n _exports.default = void 0;\n var _default = {};\n _exports.default = _default;\n});`,
2285+
"foo.js": `define("foo", ["exports"], function (_exports) {\n "use strict";\n\n Object.defineProperty(_exports, "__esModule", {\n value: true\n });\n _exports.default = void 0;\n var _default = {};\n _exports.default = _default;\n});`,
22862286
});
22872287
}));
22882288

package.json

+23-25
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
},
3131
"scripts": {
3232
"build": "ember build",
33-
"changelog": "lerna-changelog",
34-
"lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support",
33+
"lint:js": "eslint . --cache",
3534
"release": "release-it",
3635
"start": "ember serve",
3736
"test": "mocha node-tests && ember test",
@@ -72,44 +71,43 @@
7271
"semver": "^7.3.8"
7372
},
7473
"devDependencies": {
75-
"@babel/core": "^7.20.12",
74+
"@babel/core": "^7.22.10",
7675
"@ember/optional-features": "^2.0.0",
77-
"@ember/string": "^3.0.1",
78-
"@ember/test-helpers": "^2.9.3",
76+
"@ember/string": "^3.1.1",
77+
"@ember/test-helpers": "^3.2.0",
7978
"@glimmer/component": "^1.0.4",
8079
"@glimmer/tracking": "^1.0.4",
81-
"@release-it-plugins/lerna-changelog": "^5.0.0",
80+
"@release-it-plugins/lerna-changelog": "^6.0.0",
8281
"babel-eslint": "^10.1.0",
8382
"broccoli-test-helper": "^2.0.0",
8483
"chai": "^4.3.7",
8584
"co": "^4.6.0",
8685
"common-tags": "^1.8.0",
8786
"console-ui": "^3.1.2",
88-
"core-js": "^3.27.2",
87+
"core-js": "^3.32.0",
8988
"core-object": "^3.1.5",
90-
"ember-auto-import": "^2.6.0",
91-
"ember-cli": "~3.5.0",
92-
"ember-cli-dependency-checker": "^3.0.0",
93-
"ember-cli-htmlbars": "^6.2.0",
89+
"ember-auto-import": "^2.6.3",
90+
"ember-cli": "~5.1.0",
91+
"ember-cli-dependency-checker": "^3.3.2",
92+
"ember-cli-htmlbars": "^6.3.0",
9493
"ember-cli-inject-live-reload": "^2.1.0",
9594
"ember-load-initializers": "^2.1.1",
96-
"ember-qunit": "^6.1.1",
97-
"ember-resolver": "^10.0.0",
98-
"ember-source": "~3.28.8",
99-
"ember-source-channel-url": "^1.1.0",
100-
"eslint": "^4.0.0",
101-
"eslint-plugin-ember": "^5.2.0",
102-
"eslint-plugin-node": "^7.0.1",
103-
"fixturify-project": "^5.2.0",
104-
"lerna-changelog": "^0.8.0",
95+
"ember-qunit": "^7.0.0",
96+
"ember-resolver": "^11.0.1",
97+
"ember-source": "~5.2.0",
98+
"ember-source-channel-url": "^3.0.0",
99+
"eslint": "^7.32.0",
100+
"eslint-plugin-ember": "^11.10.0",
101+
"eslint-plugin-node": "^11.1.0",
102+
"fixturify-project": "^6.0.0",
105103
"loader.js": "^4.7.0",
106104
"mocha": "^10.2.0",
107105
"qunit": "^2.19.4",
108-
"regenerator-runtime": "^0.13.11",
109-
"release-it": "^15.6.0",
110-
"resolve": "^1.8.1",
111-
"rimraf": "^4.1.2",
112-
"webpack": "^5.75.0"
106+
"regenerator-runtime": "^0.14.0",
107+
"release-it": "^16.1.5",
108+
"resolve": "^1.22.4",
109+
"rimraf": "^5.0.1",
110+
"webpack": "^5.88.2"
113111
},
114112
"engines": {
115113
"node": "16.* || 18.* || >= 20"

tests/dummy/app/app.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable ember/no-classic-classes */
2+
13
import 'core-js/stable';
24
import 'regenerator-runtime/runtime';
35

tests/dummy/app/controllers/application.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* eslint-disable ember/no-computed-properties-in-native-classes */
2+
3+
import { set } from '@ember/object';
14
import Controller from '@ember/controller';
25
import { computed } from '@ember/object';
36
import { A } from '@ember/array';
@@ -7,10 +10,10 @@ export default class ApplicationController extends Controller {
710
constructor() {
811
super(...arguments);
912

10-
this.animal = new Animal('dog');
13+
set(this, 'animal', new Animal('dog'));
1114
}
1215

13-
@computed({
16+
@computed('animal.name', {
1417
get() {
1518
return this.animal.name;
1619
},

tests/dummy/app/router.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable ember/no-classic-classes */
2+
13
import EmberRouter from '@ember/routing/router';
24
import config from './config/environment';
35

tests/dummy/config/environment.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function(environment) {
55
modulePrefix: 'dummy',
66
environment,
77
rootURL: '/',
8-
locationType: 'auto',
8+
locationType: 'history',
99
EmberENV: {
1010
FEATURES: {
1111
// Here you can enable experimental features on an ember canary build

tests/dummy/config/targets.js

-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ const browsers = [
66
'last 1 Safari versions'
77
];
88

9-
const isCI = !!process.env.CI;
10-
const isProduction = process.env.EMBER_ENV === 'production';
11-
12-
if (isCI || isProduction) {
13-
browsers.push('ie 11');
14-
}
15-
169
module.exports = {
1710
browsers
1811
};

0 commit comments

Comments
 (0)