Skip to content

update to 3.28 with ember-cli-update #860

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

Merged
merged 6 commits into from
May 19, 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
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
Expand Down
28 changes: 17 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,18 @@ module.exports = {
// node files
{
files: [
'.eslintrc.js',
'.prettierrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'run-tests.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/**/*.js',
'bin/*',
'server/**/*.js',
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./lib/*/index.js',
'./server/**/*.js',
'./run-tests.js',
'./bin/*',
'./prember-urls.js',
],
excludedFiles: ['config/deprecation-workflow.js'],
parserOptions: {
Expand All @@ -62,5 +63,10 @@ module.exports = {
'node/no-unpublished-require': 'off',
},
},
{
// Test files:
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
12 changes: 1 addition & 11 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,5 @@
'use strict';

module.exports = {
extends: 'octane',
rules: {
'attribute-indentation': false,
'no-unnecessary-concat': false,
'no-inline-styles': false,
'no-curly-component-invocation': false,
'no-action': false,
quotes: false,
'no-link-to-positional-params': false,
'require-input-label': false,
},
extends: 'recommended',
};
1 change: 1 addition & 0 deletions app/components/search-input.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-action }}
<div class='search-input'>
<input
id='search-input'
Expand Down
4 changes: 3 additions & 1 deletion app/controllers/project-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ export default class ProjectVersionController extends Controller {
@computed('metaStore.availableProjectVersions', 'model.project.id')
get projectVersions() {
const projectVersions =
this.metaStore.availableProjectVersions[this.model.project.get('id')];
this.metaStore.availableProjectVersions[
this.model.belongsTo('project').id()
];
let versions = projectVersions.sort((a, b) => semverCompare(b, a));

versions = versions.map((version) => {
Expand Down
7 changes: 2 additions & 5 deletions app/models/missing.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import Model, { attr } from '@ember-data/model';
import Class from './class';

export default class Missing extends Model {
@attr()
name;
}
export default class Missing extends Class {}
1 change: 1 addition & 0 deletions app/templates/ember-cli.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-inline-styles }}
{{!-- Template is copied from project-version.hbs --}}
<aside class="sidebar">
<ol class="toc-level-0">
Expand Down
1 change: 1 addition & 0 deletions app/templates/methods.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-action }}
<EmberAnchor @a={{this.anchor}} />
<ApiIndexFilter @model={{this.model}} @filterData={{this.filterData}} as |filteredModel|>
{{#each filteredModel.methods as |method|}}
Expand Down
1 change: 1 addition & 0 deletions app/templates/project-version.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-inline-styles }}
<aside class="sidebar">
<ol class="toc-level-0">
<li class="toc-level-0" data-test-home>
Expand Down
1 change: 1 addition & 0 deletions app/templates/project-version/classes/class.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-action }}
<article class="chapter">
{{#if (is-latest [email protected] allVersions=this.allVersions)}}
<a data-tooltip="Edit on Github" class="heading__link__edit" href="{{github-link @model.project.id @model.projectVersion.version @model.file @model.line isEdit=true}}" target="_blank" rel="noopener noreferrer">{{svg-jar "fa-pencil"}}</a>
Expand Down
1 change: 1 addition & 0 deletions app/templates/properties.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-action }}
<EmberAnchor @a={{this.anchor}} />
<ApiIndexFilter @model={{this.model}} @filterData={{this.filterData}} as |filteredModel|>
{{#each filteredModel.properties as |property|}}
Expand Down
10 changes: 8 additions & 2 deletions config/deprecation-workflow.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
self.deprecationWorkflow = self.deprecationWorkflow || {};
self.deprecationWorkflow.config = {
workflow: [
{ handler: 'silence', matchId: 'ember.globals-resolver' },
{ handler: 'silence', matchId: 'ember-component.is-visible' },
{ handler: 'silence', matchId: 'ember-global' },
{ handler: 'silence', matchId: 'ember.component.reopen' },
{ handler: 'silence', matchId: 'implicit-injections' },
{ handler: 'silence', matchId: 'manager-capabilities.modifiers-3-13' },
{ handler: 'silence', matchId: 'this-property-fallback' },
{ handler: 'silence', matchId: 'ember-component.is-visible' },
{
handler: 'silence',
matchId: 'deprecated-run-loop-and-computed-dot-access',
},
],
};
2 changes: 1 addition & 1 deletion config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.26.1",
"version": "3.28.6",
"blueprints": [
{
"name": "app",
Expand Down
20 changes: 14 additions & 6 deletions config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@ const browsers = [
'last 1 Edge versions',
];

const isCI = Boolean(process.env.CI);
const isProduction = process.env.EMBER_ENV === 'production';

if (isCI || isProduction) {
browsers.push('ie 11');
}
// Ember's browser support policy is changing, and IE11 support will end in
// v4.0 onwards.
//
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
//
// If you need IE11 support on a version of Ember that still offers support
// for it, uncomment the code block below.
//
// const isCI = Boolean(process.env.CI);
// const isProduction = process.env.EMBER_ENV === 'production';
//
// if (isCI || isProduction) {
// browsers.push('ie 11');
// }

module.exports = {
browsers,
Expand Down
Loading