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

3.15.x release backports #7002

Merged
merged 8 commits into from
Jan 25, 2020
Merged

3.15.x release backports #7002

merged 8 commits into from
Jan 25, 2020

Conversation

hjdivad
Copy link
Member

@hjdivad hjdivad commented Jan 24, 2020

backport #6960 #6985

@hjdivad hjdivad changed the base branch from master to release January 24, 2020 03:36
@hjdivad hjdivad force-pushed the hjdivad/release-backports branch from 9857ec9 to ba88806 Compare January 24, 2020 03:38
@hjdivad hjdivad changed the title Hjdivad/release backports 3.15.x release backports Jan 24, 2020
@hjdivad hjdivad force-pushed the hjdivad/release-backports branch from ba88806 to d83e3d5 Compare January 24, 2020 03:54
igorT and others added 2 commits January 23, 2020 21:25
Dividing Record Data into packages (#6513) configured the St ore class
inside of the `-ember-data` metapackage. This broke importing the Store directly from `@ember-da ta/store`,
which this commit fixes.

(cherry-picked from commit 3e3677f)
ignore other dist output dirs too

(cherry picked from commit 2a1c1e9)
@hjdivad hjdivad force-pushed the hjdivad/release-backports branch from ea7d796 to 8a0c220 Compare January 24, 2020 05:26
@hjdivad hjdivad added the backport-release PR targets the current release branch label Jan 24, 2020
@hjdivad hjdivad force-pushed the hjdivad/release-backports branch from bac6916 to 318915b Compare January 24, 2020 06:24
@hjdivad hjdivad requested a review from runspired January 24, 2020 06:32
Copy link
Contributor

@runspired runspired left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall this seems good and backports the needed fix (plus a prettier upgrade). There are three changes I am surprised got included in this but are overall harmless.

@runspired
Copy link
Contributor

The LTS failure here is due to ember-beta (because the current bug would affect all known versions of ember-data)

Copy link
Contributor

@runspired runspired left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After reviewing the failure log the Travis-web external partner test failure is unexpected. Likely because the fix being backported uses a typescript feature for which our ts dependencies need to be version bumped. This version bump should already have occurred on master (and I believe on beta as well).

@hjdivad hjdivad force-pushed the hjdivad/release-backports branch from 318915b to 0af31ab Compare January 24, 2020 18:51
runspired and others added 4 commits January 24, 2020 11:04
Co-Authored-By: David J. Hamilton <[email protected]>
(cherry picked from commit f95c2ba)
This is needed for the assertion function `assertInDebug`
@hjdivad hjdivad force-pushed the hjdivad/release-backports branch from 0af31ab to 2715efe Compare January 24, 2020 19:04
Test is automatically re-enabled for 3.17.x.  We can re-enable it once
the upstream failure (glimmerjs/glimmer-vm#1010) is resolved and into
ember-source.

(cherry picked from commit 10ad35f)
@hjdivad hjdivad force-pushed the hjdivad/release-backports branch from cf1f996 to 91e2db0 Compare January 24, 2020 20:51
This fixes an issue with the resolution of babel plugins when they're
added to the host addon, which could get us babel parse errors for
downstream consumers (eg travis-web) who have their own, older,
@babel/plugin-transform-typescript.
@hjdivad hjdivad merged commit b4fcee9 into release Jan 25, 2020
@hjdivad hjdivad deleted the hjdivad/release-backports branch January 25, 2020 01:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-release PR targets the current release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants