Skip to content

Commit

Permalink
Merge pull request #674 from Gaurav0/update_ember_To_3.8
Browse files Browse the repository at this point in the history
Update ember to 3.8
  • Loading branch information
Gaurav0 authored Feb 26, 2020
2 parents 700032d + c776b47 commit faa8f8f
Show file tree
Hide file tree
Showing 9 changed files with 573 additions and 307 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
/gatekeeper/
!.*

# ember-try
/.node_modules.ember-try/
Expand Down
4 changes: 3 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ module.exports = {
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js'
'lib/*/index.js',
'server/**/*.js'
],
parserOptions: {
sourceType: 'script',
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/connect.lock
/coverage/
Expand Down
11 changes: 10 additions & 1 deletion app/models/gist-revision.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
import DS from 'ember-data';
import GistModel from "./gist";

export default GistModel.extend();
const { attr } = DS;

export default GistModel.extend({
revId: attr('string'),

generateIdForRecord() {
return this.id + '+' + this.revId;
}
});
2 changes: 1 addition & 1 deletion app/routes/gist/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default GistRoute.extend({
model(params) {
run(() => pushDeleteAll(this.store, 'gist-file'));

return this.store.find('gist', params.gistId);
return this.store.findRecord('gist', params.gistId);
},

setupController() {
Expand Down
2 changes: 2 additions & 0 deletions config/deprecation-workflow.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
self.deprecationWorkflow = self.deprecationWorkflow || {};
self.deprecationWorkflow.config = {
workflow: [
{ handler: "silence", matchId: "deprecate-router-events" },
{ handler: "silence", matchId: "ember-runtime.deprecate-copy-copyable" },
{ handler: "silence", matchId: "ember-polyfills.deprecate-merge" },
{ handler: "silence", matchId: "ember-data:method-calls-on-destroyed-store" },
{ handler: "silence", matchId: "ember-component.send-action" }
]
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@
"browserify": "^16.2.0",
"compare-versions": "^3.2.1",
"dedent": "~0.7.0",
"ember-ajax": "^3.1.0",
"ember-ajax": "^5.0.0",
"ember-api-actions": "~0.1.8",
"ember-autoresize": "~0.6.1",
"ember-cli": "~3.4.4",
"ember-cli": "~3.8.3",
"ember-cli-app-version": "^3.2.0",
"ember-cli-babel": "^6.16.0",
"ember-cli-babel": "^7.1.2",
"ember-cli-bootstrap-sassy": "~0.5.8",
"ember-cli-build-notifications": "~0.4.0",
"ember-cli-cjs-transform": "^1.3.0",
"ember-cli-code-coverage": "~0.4.2 ",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-deploy": "^1.0.2",
"ember-cli-deploy-s3-pack": "^1.0.0-beta.2",
"ember-cli-deploy-slack": "^1.0.0",
Expand All @@ -62,7 +62,6 @@
"ember-cli-moment-shim": "^3.7.1",
"ember-cli-node-assets": "~0.2.2",
"ember-cli-preprocess-registry": "^3.1.1",
"ember-cli-qunit": "^4.4.0",
"ember-cli-release": "1.0.0-beta.2",
"ember-cli-sass": "^6.2.0",
"ember-cli-shims": "~1.1.0",
Expand All @@ -71,7 +70,7 @@
"ember-cli-test-loader": "^2.2.0",
"ember-cli-uglify": "^2.1.0",
"ember-concurrency": "~0.8.17",
"ember-data": "~3.4.0",
"ember-data": "~3.8.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^2.0.0",
"ember-git-version": "~0.1.2",
Expand All @@ -83,11 +82,12 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-moment": "^7.6.0",
"ember-notify": "^5.2.1",
"ember-qunit": "^3.4.1",
"ember-resolver": "^4.0.0",
"ember-responsive": "^2.0.8",
"ember-rfc176-data": "~0.3.2",
"ember-route-action-helper": "^2.0.6",
"ember-source": "~3.4.0",
"ember-source": "~3.8.0",
"eslint-plugin-ember": "^5.2.0",
"file-saver": "^2.0.2",
"ivy-codemirror": "IvyApp/ivy-codemirror#ff753f16557a7b222737575c66b3ae3ae7d484ce",
Expand Down
12 changes: 12 additions & 0 deletions tests/acceptance/git-revision-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ module('Acceptance | gist-revision', function(hooks) {
{
filename: "application.template.hbs",
content: "Hello, World!"
},
{
filename: "twiddle.json",
content: `{
"dependencies": {}
}`
}
];

Expand All @@ -89,6 +95,12 @@ module('Acceptance | gist-revision', function(hooks) {
{
filename: "application.template.hbs",
content: "Hello, ..."
},
{
filename: "twiddle.json",
content: `{
"dependencies": {}
}`
}
],
type: 'revision',
Expand Down
Loading

0 comments on commit faa8f8f

Please sign in to comment.