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 devDependencies to latest. #772

Merged
merged 2 commits into from
Jun 14, 2022
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
2 changes: 2 additions & 0 deletions addon/resolvers/classic/container-debug-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ function getPod(type, key, prefix) {
* support for resolving from modules.
*
*/

/* eslint-disable ember/no-classic-classes */
export default ContainerDebugAdapter.extend({
_moduleRegistry: null,

Expand Down
44 changes: 22 additions & 22 deletions addon/resolvers/classic/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* globals requirejs, require */

/* eslint-disable ember/no-classic-classes */

import Ember from 'ember';
import { assert, deprecate, warn } from '@ember/debug';
import EmberObject, { get, computed } from '@ember/object';
import EmberObject from '@ember/object';
import { dasherize, classify, underscore } from '@ember/string';
import { DEBUG } from '@glimmer/env';
import classFactory from '../../utils/class-factory';
Expand Down Expand Up @@ -93,7 +95,7 @@ function parseName(fullName) {
}

let fullNameWithoutType = name;
let namespace = get(this, 'namespace');
let namespace = this.namespace;
let root = namespace;

return {
Expand Down Expand Up @@ -158,6 +160,23 @@ const Resolver = EmberObject.extend({
this.pluralizedTypes.config = 'config';
}
this._deprecatedPodModulePrefix = false;

/**

A listing of functions to test for moduleName's based on the provided
`parsedName`. This allows easy customization of additional module based
lookup patterns.

@property moduleNameLookupPatterns
@returns {Ember.Array}
*/
this.moduleNameLookupPatterns = [
this.podBasedModuleName,
this.podBasedComponentsInSubdir,
this.mainModuleName,
this.defaultModuleName,
this.nestedColocationComponentModuleName,
];
},

normalize(fullName) {
Expand Down Expand Up @@ -295,27 +314,8 @@ const Resolver = EmberObject.extend({
return tmpPrefix;
},

/**

A listing of functions to test for moduleName's based on the provided
`parsedName`. This allows easy customization of additional module based
lookup patterns.

@property moduleNameLookupPatterns
@returns {Ember.Array}
*/
moduleNameLookupPatterns: computed(function(){
return [
this.podBasedModuleName,
this.podBasedComponentsInSubdir,
this.mainModuleName,
this.defaultModuleName,
this.nestedColocationComponentModuleName,
];
}).readOnly(),

findModuleName(parsedName, loggingDisabled){
let moduleNameLookupPatterns = this.get('moduleNameLookupPatterns');
let moduleNameLookupPatterns = this.moduleNameLookupPatterns;
let moduleName;

for (let index = 0, length = moduleNameLookupPatterns.length; index < length; index++) {
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,32 +43,32 @@
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.2.5",
"@ember/test-helpers": "^2.8.1",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.4.2",
"ember-cli": "~3.27.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^5.7.1",
"ember-cli": "~4.4.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^5.1.4",
"ember-qunit": "^5.1.5",
"ember-source": "~4.4.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.4.2",
"ember-try": "^1.4.0",
"ember-template-lint": "^3.16.0",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-plugin-ember": "^7.8.1",
"eslint-plugin-ember": "^10.6.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-qunit": "^6.1.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.3.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.0",
"qunit": "^2.17.1",
"qunit-dom": "^1.6.0",
"release-it": "^14.10.1",
"prettier": "^2.7.0",
"qunit": "^2.19.1",
"qunit-dom": "^2.0.0",
"release-it": "^14.14.3",
"release-it-lerna-changelog": "^3.1.0",
"webpack": "^5.73.0"
},
Expand Down
2 changes: 2 additions & 0 deletions tests/unit/container-debug-adapter-test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable ember/no-classic-classes */

import { run } from '@ember/runloop';
import Application from '@ember/application';
import { module, test } from 'qunit';
Expand Down
Loading