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

[BUGFIX beta] Use Ember.guidFor to set InternalModel's guid. #4559

Merged
merged 1 commit into from
Sep 30, 2016

Conversation

rwjblue
Copy link
Member

@rwjblue rwjblue commented Sep 29, 2016

In future versions of Ember, the Ember.GUID_KEY property may not be the place that guids are stored per object (may be moving to a WeakMap). This change keeps this[GUID_KEY] around for easier debugging (though it isn't required per-se), and uses Ember.guidFor to get the guid and setup the object.

Related to conversation in emberjs/ember.js#14383.

@rwjblue
Copy link
Member Author

rwjblue commented Sep 29, 2016

/cc @runspired

@rwjblue
Copy link
Member Author

rwjblue commented Sep 29, 2016

Build will be fixed by #4560.

@runspired
Copy link
Contributor

Only failure in these failures is the thing fixed by #4560

@rwjblue
Copy link
Member Author

rwjblue commented Sep 29, 2016

I'll rebase now that that is fixed

In future versions of Ember, the `Ember.GUID_KEY` property may not be the place that guids are stored per object (may be moving to a `WeakMap`).  This change keeps `this[GUID_KEY]` around for easier debugging (though it isn't _required_ per-se), and uses `Ember.guidFor` to get the guid and setup the object.
@rwjblue
Copy link
Member Author

rwjblue commented Sep 29, 2016

After rebase, I get a super whacky error:

Error: Cannot find module 'source-map/' from '/home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/eslint/node_modules/js-yaml/node_modules/argparse/node_modules/istanbul/node_modules/escodegen/'
    at Function.module.exports [as sync] (/home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/node_modules/resolve/lib/sync.js:33:11)
    at resolvePkg (/home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/resolve-pkg.js:20:18)
    at pkg (/home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/pkg.js:17:20)
    at again (/home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/deps-for.js:18:22)
    at /home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/deps-for.js:27:7
    at Array.forEach (native)
    at again (/home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/deps-for.js:26:55)
    at /home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/deps-for.js:27:7
    at Array.forEach (native)
    at again (/home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/deps-for.js:26:55)
    at /home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/deps-for.js:27:7
    at Array.forEach (native)
    at again (/home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/deps-for.js:26:55)
    at /home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/deps-for.js:27:7
    at Array.forEach (native)
    at again (/home/travis/build/emberjs/data/node_modules/ember-cli-eslint/node_modules/broccoli-lint-eslint/node_modules/broccoli-persistent-filter/node_modules/hash-for-dep/lib/deps-for.js:26:55)

@rwjblue
Copy link
Member Author

rwjblue commented Sep 29, 2016

Finally passing (for Travis builds).

@bmac bmac merged commit 6dce4e8 into master Sep 30, 2016
@bmac bmac deleted the use-guid-for branch September 30, 2016 12:54
@bmac
Copy link
Member

bmac commented Sep 30, 2016

Thanks @rwjblue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants