Skip to content

Commit

Permalink
Merge pull request #15 from josemarluedke/jl-upgrade-to-ember-v3.13
Browse files Browse the repository at this point in the history
Upgrade to latest Ember 3.13 and move away from htmlbars-inline-precompile
  • Loading branch information
josemarluedke authored Oct 11, 2019
2 parents 2da0c85 + 9f0c170 commit 12b63e3
Show file tree
Hide file tree
Showing 4 changed files with 969 additions and 788 deletions.
33 changes: 16 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,24 @@
},
"dependencies": {
"ember-auto-import": "^1.4.1",
"ember-cli-babel": "^7.11.0",
"ember-modifier-manager-polyfill": "^1.1.0",
"ember-cli-babel": "^7.12.0",
"ember-modifier-manager-polyfill": "^1.2.0",
"focus-trap": "^5.0.1"
},
"devDependencies": {
"@ember/optional-features": "^0.7.0",
"@ember/optional-features": "^1.0.0",
"babel-eslint": "^10.0.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.12.0",
"ember-cli": "~3.13.1",
"ember-cli-addon-docs": "^0.6.13",
"ember-cli-addon-docs-yuidoc": "^0.2.1",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-deploy": "^1.0.2",
"ember-cli-deploy-build": "^2.0.0",
"ember-cli-deploy-git": "^1.3.3",
"ember-cli-deploy-git": "^1.3.4",
"ember-cli-deploy-git-ci": "^1.0.1",
"ember-cli-htmlbars": "^3.1.0",
"ember-cli-htmlbars-inline-precompile": "^3.0.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-htmlbars": "^4.0.5",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-sass": "^10.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^3.0.0",
Expand All @@ -50,21 +49,21 @@
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.4.1",
"ember-resolver": "^5.0.1",
"ember-sinon": "^4.0.0",
"ember-source": "~3.12.0",
"ember-resolver": "^5.3.0",
"ember-sinon": "^4.1.1",
"ember-source": "~3.13.3",
"ember-source-channel-url": "^2.0.1",
"ember-template-lint": "^1.3.0",
"ember-try": "^1.2.1",
"eslint": "^6.0.1",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-ember": "^7.0.0",
"eslint-plugin-node": "^9.1.0",
"eslint-plugin-prettier": "^3.1.0",
"eslint": "^6.5.1",
"eslint-config-prettier": "^6.4.0",
"eslint-plugin-ember": "^7.1.0",
"eslint-plugin-node": "^10.0.0",
"eslint-plugin-prettier": "^3.1.1",
"loader.js": "^4.7.0",
"prettier": "^1.18.2",
"qunit-dom": "^0.9.0",
"sass": "^1.22.1"
"sass": "^1.23.0"
},
"engines": {
"node": "8.* || >= 10.*"
Expand Down
8 changes: 8 additions & 0 deletions tests/dummy/app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ $brand-secondary: #ffd723;
--brand-primary: #{$brand-primary};
}

.docs-bg-brand {
background-color: $brand-primary !important;
}

.docs-text-brand {
color: $brand-primary !important;
}

.button {
background-color: #3d4852;
color: white;
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/modifiers/focus-trap-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { hbs } from 'ember-cli-htmlbars';
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render, find } from '@ember/test-helpers';
import hbs from 'htmlbars-inline-precompile';
import sinon from 'sinon';
let noop = () => {};

Expand Down
Loading

0 comments on commit 12b63e3

Please sign in to comment.