Skip to content

Commit

Permalink
fix(deps): update ember to 3.16.5
Browse files Browse the repository at this point in the history
  • Loading branch information
fkm-adfinis authored and Jonas Metzener committed Mar 24, 2020
1 parent 6de4a2b commit 02b5d65
Show file tree
Hide file tree
Showing 15 changed files with 593 additions and 158 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Expand Up @@ -4,7 +4,6 @@

root = true


[*]
end_of_line = lf
charset = utf-8
Expand Down
2 changes: 2 additions & 0 deletions .eslintrc.js
@@ -1,3 +1,5 @@
"use strict";

module.exports = {
root: true,
parser: "babel-eslint",
Expand Down
20 changes: 15 additions & 5 deletions .travis.yml
Expand Up @@ -5,7 +5,6 @@ node_js:
# Ember CLI so that your addon works for all apps
- "10"

sudo: false
dist: trusty

addons:
Expand All @@ -27,16 +26,24 @@ branches:
- /^v\d+\.\d+\.\d+/

jobs:
fail_fast: true
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary

include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
script:
- yarn lint:hbs
- yarn lint:js
- yarn test

- stage: "Additional Tests"
name: "Floating Dependencies"
install:
- yarn install --no-lockfile --non-interactive
script:
- commitlint-travis
- npm run lint:hbs
Expand All @@ -45,13 +52,13 @@ jobs:

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-3.8
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
- env: EMBER_TRY_SCENARIO=ember-classic

- stage: "Release"
if: branch = release and type = push
Expand All @@ -72,6 +79,9 @@ before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

install:
- yarn install --non-interactive

script:
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

Expand Down
23 changes: 19 additions & 4 deletions config/ember-try.js
Expand Up @@ -7,18 +7,18 @@ module.exports = async function() {
useYarn: true,
scenarios: [
{
name: "ember-lts-3.8",
name: "ember-lts-3.12",
npm: {
devDependencies: {
"ember-source": "~3.8.0"
"ember-source": "~3.12.0"
}
}
},
{
name: "ember-lts-3.12",
name: "ember-lts-3.16",
npm: {
devDependencies: {
"ember-source": "~3.12.0"
"ember-source": "~3.16.0"
}
}
},
Expand Down Expand Up @@ -68,6 +68,21 @@ module.exports = async function() {
"@ember/jquery": "^0.5.1"
}
}
},
{
name: "ember-classic",
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
"application-template-wrapper": true,
"default-async-observers": false,
"template-only-glimmer-components": false
})
},
npm: {
ember: {
edition: "classic"
}
}
}
]
};
Expand Down
12 changes: 7 additions & 5 deletions package.json
Expand Up @@ -26,7 +26,7 @@
"url": "https://github.com/adfinis-sygroup/ember-uikit/issues"
},
"scripts": {
"build": "ember build",
"build": "ember build --environment=production",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"start": "ember server",
Expand All @@ -49,9 +49,11 @@
"devDependencies": {
"@adfinis-sygroup/semantic-release-config": "2.1.4",
"@ember/optional-features": "1.3.0",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"babel-eslint": "10.0.3",
"broccoli-asset-rev": "3.0.0",
"ember-cli": "3.14.0",
"ember-cli": "~3.16.1",
"ember-cli-app-version": "3.2.0",
"ember-cli-code-coverage": "0.4.2",
"ember-cli-dependency-checker": "3.2.0",
Expand All @@ -75,7 +77,7 @@
"ember-prism": "0.5.0",
"ember-qunit": "4.6.0",
"ember-resolver": "7.0.0",
"ember-source": "3.14.3",
"ember-source": "~3.16.5",
"ember-source-channel-url": "2.0.1",
"ember-truth-helpers": "2.1.0",
"ember-try": "1.4.0",
Expand All @@ -88,11 +90,11 @@
"lint-staged": "10.0.7",
"loader.js": "4.7.0",
"prettier": "1.19.1",
"qunit-dom": "0.9.2",
"qunit-dom": "^1.0.0",
"sass": "1.25.0"
},
"engines": {
"node": "10.* || >= 12.*"
"node": "10.* || >= 12"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
3 changes: 3 additions & 0 deletions testem.js
@@ -1,8 +1,11 @@
"use strict";

module.exports = {
test_page: "tests/index.html?hidepassed",
disable_watching: true,
launch_in_ci: ["Chrome"],
launch_in_dev: ["Chrome"],
browser_start_timeout: 120,
browser_args: {
Chrome: {
ci: [
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/app.js
@@ -1,5 +1,5 @@
import Application from "@ember/application";
import Resolver from "./resolver";
import Resolver from "ember-resolver";
import loadInitializers from "ember-load-initializers";
import config from "./config/environment";

Expand Down
3 changes: 0 additions & 3 deletions tests/dummy/app/resolver.js

This file was deleted.

Empty file.
21 changes: 21 additions & 0 deletions tests/dummy/config/ember-cli-update.json
@@ -0,0 +1,21 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.16.1",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--yarn",
"--no-welcome"
]
}
]
}
]
}
5 changes: 4 additions & 1 deletion tests/dummy/config/optional-features.json
@@ -1,3 +1,6 @@
{
"jquery-integration": false
"application-template-wrapper": false,
"default-async-observers": true,
"jquery-integration": false,
"template-only-glimmer-components": true
}
4 changes: 2 additions & 2 deletions tests/integration/components/uk-modal/body-test.js
Expand Up @@ -12,7 +12,7 @@ module("Integration | Component | uk-modal/body", function(hooks) {

await render(hbs`{{uk-modal/body}}`);

assert.equal(this.element.textContent.trim(), "");
assert.dom(this.element).hasText("");

// Template block usage:
await render(hbs`
Expand All @@ -21,6 +21,6 @@ module("Integration | Component | uk-modal/body", function(hooks) {
{{/uk-modal/body}}
`);

assert.equal(this.element.textContent.trim(), "template block text");
assert.dom(this.element).hasText("template block text");
});
});
4 changes: 2 additions & 2 deletions tests/integration/components/uk-modal/footer-test.js
Expand Up @@ -12,7 +12,7 @@ module("Integration | Component | uk-modal/header", function(hooks) {

await render(hbs`{{uk-modal/footer}}`);

assert.equal(this.element.textContent.trim(), "");
assert.dom(this.element).hasText("");

// Template block usage:
await render(hbs`
Expand All @@ -21,6 +21,6 @@ module("Integration | Component | uk-modal/header", function(hooks) {
{{/uk-modal/footer}}
`);

assert.equal(this.element.textContent.trim(), "template block text");
assert.dom(this.element).hasText("template block text");
});
});
4 changes: 2 additions & 2 deletions tests/integration/components/uk-modal/header-test.js
Expand Up @@ -12,7 +12,7 @@ module("Integration | Component | uk-modal/footer", function(hooks) {

await render(hbs`{{uk-modal/header}}`);

assert.equal(this.element.textContent.trim(), "");
assert.dom(this.element).hasText("");

// Template block usage:
await render(hbs`
Expand All @@ -21,6 +21,6 @@ module("Integration | Component | uk-modal/footer", function(hooks) {
{{/uk-modal/header}}
`);

assert.equal(this.element.textContent.trim(), "template block text");
assert.dom(this.element).hasText("template block text");
});
});

0 comments on commit 02b5d65

Please sign in to comment.