Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

Import libsass 3.3 code #1040

Merged
merged 1 commit into from
Sep 18, 2015
Merged

Import libsass 3.3 code #1040

merged 1 commit into from
Sep 18, 2015

Conversation

saper
Copy link
Member

@saper saper commented Jul 21, 2015

From now on, use includes from
src/libsass/include and the sources from
src/libsass/src

This is to be included when merging newer libsass.

@xzyfer xzyfer mentioned this pull request Aug 11, 2015
Merged
@saper saper added this to the next.libsass milestone Aug 20, 2015
@xzyfer
Copy link
Contributor

xzyfer commented Aug 30, 2015

@saper can you please get this up to date with sass/libsass@ab86285. This will likely be out next release.

@saper
Copy link
Member Author

saper commented Aug 31, 2015

This is now updated. It looks like we are getting test failures here - most probably those are some fixed bugs?

My slow VM tests on Windows bring even more failures - mostly timeouts though.

@saper saper mentioned this pull request Aug 31, 2015
Merged
@saper
Copy link
Member Author

saper commented Sep 1, 2015

(I just noticed I have used the current libsass master, not sass/libsass@ab86285 - but the libsass.gyp changes are the same.

@saper
Copy link
Member Author

saper commented Sep 2, 2015

Last commit does not work atm because I haven't told git how to git submodule update from a branch.

@saper saper mentioned this pull request Sep 2, 2015
Closed
@saper saper force-pushed the libsass3.3src branch 4 times, most recently from 830b450 to 884c508 Compare September 2, 2015 23:12
@saper
Copy link
Member Author

saper commented Sep 3, 2015

With sass/libsass#1521 merged we can remove /EH parameters from libsass.gyp.

@saper saper mentioned this pull request Sep 6, 2015
Closed
@saper saper force-pushed the libsass3.3src branch 10 times, most recently from 9ecb144 to 010205f Compare September 7, 2015 08:40
@saper
Copy link
Member Author

saper commented Sep 16, 2015

Moved ready-to-merge tests and libsass.gyp changes to #1146. Here is the actual layout change/import.

@saper saper force-pushed the libsass3.3src branch 2 times, most recently from eef1db1 to 99a21e3 Compare September 16, 2015 11:07
@saper saper changed the title libsass 3.3+ source layout has changed Import libsass 3.3 code Sep 16, 2015
@xzyfer
Copy link
Contributor

xzyfer commented Sep 16, 2015

xzyfer
xzyfer reviewed Sep 16, 2015
View reviewed changes
package.json
@@ -1,7 +1,7 @@
{
"name": "node-sass",
"version": "3.3.2",
"libsass": "3.2.5",
"libsass": "3.3.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

3.3.0-beta1

Copy link
Member Author

Choose a reason for hiding this comment

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

On Wed, 16 Sep 2015, Michael Mifsud wrote:

@@ -1,7 +1,7 @@
{
"name": "node-sass",
"version": "3.3.2",

  • "libsass": "3.2.5",
  • "libsass": "3.3.0",

3.3.0-beta1

We are already one merge above :)
We can adjust as we are close to merge this.

Copy link
Contributor

Choose a reason for hiding this comment

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

I want to merge this now :)

https://github.com/sass/libsass/releases/tag/3.3.0-beta2

Copy link
Member Author

Choose a reason for hiding this comment

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

On Wed, 16 Sep 2015, Michael Mifsud wrote:

@@ -1,7 +1,7 @@
{
"name": "node-sass",
"version": "3.3.2",

  • "libsass": "3.2.5",
  • "libsass": "3.3.0",

I want to merge this now :)

Holy...

Copy link
Contributor

Choose a reason for hiding this comment

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

LibSass 3.3.0 can't go stable until atleast one RC has hit node-sass. This is because the vast majority of LibSass usage happens via node-sass and we use node-sass@beta release to weed out regressions.

@xzyfer
Copy link
Contributor

xzyfer commented Sep 16, 2015

I want to merge this now

More accurately, I want to release v3.3.3 with the changes currently on master. Then I want to release this as beta dist-tag. It might even make sense to do the tag/release from this branch.

@saper
Copy link
Member Author

saper commented Sep 16, 2015

So we can ask our dear readers to re-test all https://github.com/sass/node-sass/milestones/next.libsass issues with npm install node-sass@beta ?

@xzyfer
Copy link
Contributor

xzyfer commented Sep 16, 2015

At the very least. Once we let people know they can get their hands on the new super fast LibSass we'll see good rapid adoption.

@xzyfer
Copy link
Contributor

xzyfer commented Sep 16, 2015

@saper I see that test failure randomly on Travis as well. This is good to go as far as I'm concerned.

@saper
Copy link
Member Author

saper commented Sep 16, 2015 via email

@xzyfer
Copy link
Contributor

xzyfer commented Sep 16, 2015

Agreed. Luckily Travis lets you build a single job and it only takes 2-3mins.

@saper saper force-pushed the libsass3.3src branch 4 times, most recently from eef1db1 to 84332a1 Compare September 16, 2015 19:25
@saper
Import libsass 3.3.0-beta2
3f0ef90 
- New source layout
- New header names for #include
- No need for exception handling in pure C code
xzyfer added a commit that referenced this pull request Sep 18, 2015
@xzyfer
Merge pull request #1040 from saper/libsass3.3src
9336a1d 
Import libsass 3.3 code
@xzyfer xzyfer merged commit 9336a1d into sass:master Sep 18, 2015
@xzyfer xzyfer modified the milestone: next.libsass Oct 25, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@saper saper

Labels
Dev - Reviewed External - LibSass Module - Binding
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@saper @xzyfer