Skip to content

Commit

Permalink
Merge pull request #496 from babel/update-dev-deps
Browse files Browse the repository at this point in the history
Update development dependencies
  • Loading branch information
kategengler committed Aug 18, 2023
2 parents c343860 + b17cf14 commit fdc667c
Show file tree
Hide file tree
Showing 11 changed files with 3,602 additions and 5,027 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/blueprints/*/files/**/*.js
/dist/
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module.exports = {
// node files
{
files: [
'.eslintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/bower_components

# misc
/.eslintcache
/.sass-cache
/connect.lock
/coverage/*
Expand Down
10 changes: 5 additions & 5 deletions node-tests/addon-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const createTempDir = BroccoliTestHelper.createTempDir;
const terminateWorkerPool = require('./utils/terminate-workers');
const path = require('path');
const fs = require('fs');
const rimraf = require('rimraf');
const { rimraf } = require('rimraf');
const {
_shouldHandleTypeScript,
_shouldIncludeHelpers,
Expand Down Expand Up @@ -1035,7 +1035,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `define(\"foo\", [], function () {\n \"use strict\";\n\n Ember.String.camelize('stuff-here');\n});`
"foo.js": `define("foo", [], function () {\n "use strict";\n\n Ember.String.camelize('stuff-here');\n});`
});
}));
});
Expand Down Expand Up @@ -1242,7 +1242,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
'foo.js': `define("foo", [], function () {\n "use strict";\n\n var foo = "hi";\n});`
'foo.js': `define("foo", [], function () {\n "use strict";\n\n let foo = "hi";\n});`
});
}));

Expand Down Expand Up @@ -2048,7 +2048,7 @@ describe('EmberData Packages Polyfill', function() {
assembleLines([
`Object.defineProperty(_exports, "default", {`,
` enumerable: true,`,
` get: function get() {`,
` get: function () {`,
` return _emberData.default;`,
` }`,
`});`
Expand Down Expand Up @@ -2282,7 +2282,7 @@ describe('babel config file', function() {
yield output.build();

expect(output.read()).to.deep.equal({
"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});`,
"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});`,
});
}));

Expand Down
48 changes: 23 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
},
"scripts": {
"build": "ember build",
"changelog": "lerna-changelog",
"lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support",
"lint:js": "eslint . --cache",
"release": "release-it",
"start": "ember serve",
"test": "mocha node-tests && ember test",
Expand Down Expand Up @@ -72,44 +71,43 @@
"semver": "^7.3.8"
},
"devDependencies": {
"@babel/core": "^7.20.12",
"@babel/core": "^7.22.10",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@release-it-plugins/lerna-changelog": "^5.0.0",
"@release-it-plugins/lerna-changelog": "^6.0.0",
"babel-eslint": "^10.1.0",
"broccoli-test-helper": "^2.0.0",
"chai": "^4.3.7",
"co": "^4.6.0",
"common-tags": "^1.8.0",
"console-ui": "^3.1.2",
"core-js": "^3.27.2",
"core-js": "^3.32.0",
"core-object": "^3.1.5",
"ember-auto-import": "^2.6.0",
"ember-cli": "~3.5.0",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-htmlbars": "^6.2.0",
"ember-auto-import": "^2.6.3",
"ember-cli": "~5.1.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-load-initializers": "^2.1.1",
"ember-qunit": "^6.1.1",
"ember-resolver": "^10.0.0",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^1.1.0",
"eslint": "^4.0.0",
"eslint-plugin-ember": "^5.2.0",
"eslint-plugin-node": "^7.0.1",
"fixturify-project": "^5.2.0",
"lerna-changelog": "^0.8.0",
"ember-qunit": "^7.0.0",
"ember-resolver": "^11.0.1",
"ember-source": "~5.2.0",
"ember-source-channel-url": "^3.0.0",
"eslint": "^7.32.0",
"eslint-plugin-ember": "^11.10.0",
"eslint-plugin-node": "^11.1.0",
"fixturify-project": "^6.0.0",
"loader.js": "^4.7.0",
"mocha": "^10.2.0",
"qunit": "^2.19.4",
"regenerator-runtime": "^0.13.11",
"release-it": "^15.6.0",
"resolve": "^1.8.1",
"rimraf": "^4.1.2",
"webpack": "^5.75.0"
"regenerator-runtime": "^0.14.0",
"release-it": "^16.1.5",
"resolve": "^1.22.4",
"rimraf": "^5.0.1",
"webpack": "^5.88.2"
},
"engines": {
"node": "16.* || 18.* || >= 20"
Expand Down
2 changes: 2 additions & 0 deletions tests/dummy/app/app.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable ember/no-classic-classes */

import 'core-js/stable';
import 'regenerator-runtime/runtime';

Expand Down
7 changes: 5 additions & 2 deletions tests/dummy/app/controllers/application.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* eslint-disable ember/no-computed-properties-in-native-classes */

import { set } from '@ember/object';
import Controller from '@ember/controller';
import { computed } from '@ember/object';
import { A } from '@ember/array';
Expand All @@ -7,10 +10,10 @@ export default class ApplicationController extends Controller {
constructor() {
super(...arguments);

this.animal = new Animal('dog');
set(this, 'animal', new Animal('dog'));
}

@computed({
@computed('animal.name', {
get() {
return this.animal.name;
},
Expand Down
2 changes: 2 additions & 0 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable ember/no-classic-classes */

import EmberRouter from '@ember/routing/router';
import config from './config/environment';

Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function(environment) {
modulePrefix: 'dummy',
environment,
rootURL: '/',
locationType: 'auto',
locationType: 'history',
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
Expand Down
7 changes: 0 additions & 7 deletions tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ const browsers = [
'last 1 Safari versions'
];

const isCI = !!process.env.CI;
const isProduction = process.env.EMBER_ENV === 'production';

if (isCI || isProduction) {
browsers.push('ie 11');
}

module.exports = {
browsers
};

0 comments on commit fdc667c

Please sign in to comment.