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

Glimmer packages #12772

Merged
merged 15 commits into from
Jan 29, 2016
Merged

Glimmer packages #12772

merged 15 commits into from
Jan 29, 2016

Conversation

stefanpenner
Copy link
Member

this is the "quickest" way to import glimmer into ember.... This is to allow work to begin, that being said. I plan to actually have them unify build-pipelines, as this should allow a much better development experience.

@stefanpenner
Copy link
Member Author

this will basically keep failing until we publish glimmer with dist built etc.

'glimmer-util': glimmerPackage('glimmer-util'),
'glimmer-wire-format': glimmerPackage('glimmer-wire-format'),
'glimmer': glimmerPackage('glimmer'),
'simple-html-tokenizer': glimmerPackage('simple-html-tokenizer')
Copy link
Member

Choose a reason for hiding this comment

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

This is duplicated. Do we need two different versions of SHT? If not, then removing the duplicate should be fine, if we do need different ones then we need to figure out how to namespace them to prevent clobbering.

Copy link
Member Author

Choose a reason for hiding this comment

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

This is duplicated. Do we need two different versions of SHT? If not, then removing the duplicate should be fine, if we do need different ones then we need to figure out how to namespace them to prevent clobbering.

this is a @chancancode question :P

Copy link
Member

Choose a reason for hiding this comment

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

Looks like we did some import changes in SHT: https://github.com/tildeio/simple-html-tokenizer/commits/master (htmlbars uses c4787e3 and glimmer uses 8b09fc2). If we can change htmlbars to work with the new structure then we can just release a new SHT version and use that in htmlbars (and do another htmlbars release?).

Copy link
Member

Choose a reason for hiding this comment

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

Looking at the changes, it seems like it might Just Work™ in htmlbars too?

@stefanpenner stefanpenner reopened this Jan 7, 2016
@stefanpenner
Copy link
Member Author

oops

@rwjblue
Copy link
Member

rwjblue commented Jan 25, 2016

OK, just pushed a few changes:

Once glimmerjs/glimmer-vm#49 is landed, this is ready to merge (after confirming Travis is passing).

@rwjblue rwjblue force-pushed the glimmer-packages branch 2 times, most recently from fc6051a to 5bf5bf6 Compare January 25, 2016 20:02
'amd/glimmer-compiler.amd.js',
/*'amd/glimmer-runtime.amd.js', */
'amd/tests.amd.js'
]
Copy link
Member

Choose a reason for hiding this comment

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

This should be:

'amd/glimmer-common.amd.js', // stuff shared between runtime and compiler, e.g. utils
'amd/glimmer-compiler.amd.js', // for "server compilation", depends on common
'amd/glimmer-runtime.amd.js', // runtime stuff, depends on common
'amd/glimmer-tests.amd.js' // tests, depends on common, compiler and runtime

@stefanpenner
Copy link
Member Author

LGTM

@rwjblue
Copy link
Member

rwjblue commented Jan 28, 2016

Restarted sauce labs tests...

@chancancode chancancode force-pushed the glimmer-packages branch 2 times, most recently from 41e9bc3 to cc15887 Compare January 28, 2016 21:13
chancancode added a commit that referenced this pull request Jan 29, 2016
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

3 participants