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

build: update to ember 3.24 #112

Merged
merged 1 commit into from
Jul 20, 2021
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
/.node_modules.ember-try/
Expand Down
30 changes: 15 additions & 15 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,50 +7,50 @@ module.exports = {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
legacyDecorators: true,
},
},
plugins: [
'ember'
],
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true
browser: true,
},
rules: {
semi: ["error", "never"]
semi: ['error', 'never'],
},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.prettierrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
'tests/dummy/config/**/*.js',
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
'tests/dummy/app/**',
],
parserOptions: {
sourceType: 'script'
sourceType: 'script',
},
env: {
browser: false,
node: true
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended']
}
]
extends: ['plugin:node/recommended'],
},
],
}
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
with:
fetch-depth: 1

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '${{ env.NODE_VERSION }}'

Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
with:
fetch-depth: 1

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '${{ env.NODE_VERSION }}'

Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
with:
fetch-depth: 1

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '${{ env.NODE_VERSION }}'

Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
with:
fetch-depth: 1

- uses: actions/setup-node@v2-beta
- uses: actions/setup-node@v2
with:
node-version: '${{ env.NODE_VERSION }}'

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/.editorconfig
/.ember-cli
/.env*
/.eslintcache
/.eslintignore
/.eslintrc.js
/.git/
Expand Down
21 changes: 21 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
6 changes: 6 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
'use strict'

module.exports = {
semi: false,
singleQuote: true,
}
16 changes: 4 additions & 12 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
'use strict'

module.exports = {
extends: [
'octane',
'stylistic',
],
extends: ['octane', 'stylistic'],

rules: {
'attribute-indentation': {
'indentation': 2,
indentation: 2,
'open-invocation-max-len': 100,
},

Expand All @@ -33,18 +30,13 @@ module.exports = {

overrides: [
{
files: [
'**/tests/dummy/**/*.hbs',
'**/tests/**/*.{js,ts}',
],
files: ['**/tests/dummy/**/*.hbs', '**/tests/**/*.{js,ts}'],
rules: {
'no-bare-strings': 'off',
},
},
{
files: [
'**/tests/dummy/app/templates/**/*.hbs',
],
files: ['**/tests/dummy/app/templates/**/*.hbs'],

rules: {
'no-this-in-template-only-components': 'off',
Expand Down
12 changes: 6 additions & 6 deletions addon/metrics-adapters/pendo.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { assign } from "@ember/polyfills"
import { assert } from "@ember/debug"
import removeFromDOM from "ember-metrics/utils/remove-from-dom"
import classic from "ember-classic-decorator"
import BaseAdapter from "ember-metrics/metrics-adapters/base"
import { assign } from '@ember/polyfills'
import { assert } from '@ember/debug'
import removeFromDOM from 'ember-metrics/utils/remove-from-dom'
import classic from 'ember-classic-decorator'
import BaseAdapter from 'ember-metrics/metrics-adapters/base'

@classic
export default class PendoAdapter extends BaseAdapter {
toStringExtension() {
return "Pendo"
return 'Pendo'
}

init() {
Expand Down
2 changes: 1 addition & 1 deletion app/metrics-adapters/pendo.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from "ember-metrics-pendo/metrics-adapters/pendo"
export { default } from 'ember-metrics-pendo/metrics-adapters/pendo'
62 changes: 31 additions & 31 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,86 +2,86 @@

const getChannelURL = require('ember-source-channel-url')

module.exports = async function() {
module.exports = async function () {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.12.0'
}
}
'ember-source': '~3.12.0',
},
},
},
{
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.16.0'
}
}
'ember-source': '~3.16.0',
},
},
},
{
name: 'ember-lts-3.20',
npm: {
devDependencies: {
'ember-source': '~3.20.5'
}
}
'ember-source': '~3.20.5',
},
},
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': await getChannelURL('release')
}
}
'ember-source': await getChannelURL('release'),
},
},
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': await getChannelURL('beta')
}
}
'ember-source': await getChannelURL('beta'),
},
},
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': await getChannelURL('canary')
}
}
'ember-source': await getChannelURL('canary'),
},
},
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true
})
'jquery-integration': true,
}),
},
npm: {
devDependencies: {
'@ember/jquery': '^1.1.0'
}
}
'@ember/jquery': '^1.1.0',
},
},
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false
})
'template-only-glimmer-components': false,
}),
},
npm: {
ember: {
edition: 'classic'
}
}
}
]
edition: 'classic',
},
},
},
],
}
}
4 changes: 2 additions & 2 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'

module.exports = function(/* environment, appConfig */) {
return { }
module.exports = function (/* environment, appConfig */) {
return {}
}
14 changes: 2 additions & 12 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,9 @@

const EmberAddon = require('ember-cli/lib/broccoli/ember-addon')

module.exports = function(defaults) {
module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
// This fixes a test failure that began appearing after upgrading
// ember-auto-import, which stopped automatically enabling webpack
// polyfills in v1.4.0. See the URLs below for more details:
// https://github.com/ef4/ember-auto-import#i-upgraded-my-ember-auto-import-version-and-now-things-dont-import-what-changed
autoImport: {
webpack: {
node: {
global: true
}
}
}
// Add options here
})

/*
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'

module.exports = {
name: require('./package').name
name: require('./package').name,
}
Loading