Commit 2fdd4caa by Kevin Martensson

Move sass.js into lib/index.js

parent 49da284f
...@@ -5,9 +5,9 @@ var assign = require('object-assign'); ...@@ -5,9 +5,9 @@ var assign = require('object-assign');
function requireBinding() { function requireBinding() {
var v8 = 'v8-' + /[0-9]+\.[0-9]+/.exec(process.versions.v8)[0]; var v8 = 'v8-' + /[0-9]+\.[0-9]+/.exec(process.versions.v8)[0];
var candidates = [ var candidates = [
[__dirname, 'build', 'Release', 'binding.node'], [__dirname, '..', 'build', 'Release', 'binding.node'],
[__dirname, 'build', 'Debug', 'binding.node'], [__dirname, '..', 'build', 'Debug', 'binding.node'],
[__dirname, 'bin', process.platform + '-' + process.arch + '-' + v8, 'binding.node'] [__dirname, '..', 'bin', process.platform + '-' + process.arch + '-' + v8, 'binding.node']
]; ];
var candidate; var candidate;
......
var fs = require('fs'), var fs = require('fs'),
chalk = require('chalk'), chalk = require('chalk'),
sass = require('../sass'); sass = require('./');
/** /**
* Render * Render
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"url": "https://github.com/sass/node-sass/blob/master/LICENSE" "url": "https://github.com/sass/node-sass/blob/master/LICENSE"
} }
], ],
"main": "./sass.js", "main": "lib/index.js",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/sass/node-sass.git" "url": "git://github.com/sass/node-sass.git"
......
...@@ -11,7 +11,6 @@ var COVERALLS_BIN = ["node_modules", ".bin", "coveralls"].join(path.sep); ...@@ -11,7 +11,6 @@ var COVERALLS_BIN = ["node_modules", ".bin", "coveralls"].join(path.sep);
var MOCHA_BIN = ["node_modules", ".bin", "mocha"].join(path.sep); var MOCHA_BIN = ["node_modules", ".bin", "mocha"].join(path.sep);
echo("Creating coverage files"); echo("Creating coverage files");
exec(JSCOVERAGE_BIN + " sass.js sass-coverage.js");
exec(JSCOVERAGE_BIN + " lib lib-coverage"); exec(JSCOVERAGE_BIN + " lib lib-coverage");
echo("Piping mocha to coveralls"); echo("Piping mocha to coveralls");
...@@ -23,6 +22,5 @@ exec(MOCHA_BIN + " test -R mocha-lcov-reporter | " + COVERALLS_BIN, {async: fals ...@@ -23,6 +22,5 @@ exec(MOCHA_BIN + " test -R mocha-lcov-reporter | " + COVERALLS_BIN, {async: fals
console.log('Program output:', output); console.log('Program output:', output);
echo("Cleanup coverage files"); echo("Cleanup coverage files");
rm("sass-coverage.js");
rm("-R", "lib-coverage"); rm("-R", "lib-coverage");
}); });
...@@ -2,7 +2,7 @@ var assert = require('assert'), ...@@ -2,7 +2,7 @@ var assert = require('assert'),
fs = require('fs'), fs = require('fs'),
path = require('path'), path = require('path'),
read = fs.readFileSync, read = fs.readFileSync,
sass = require('../sass'), sass = require('../lib'),
fixture = path.join.bind(null, __dirname, 'fixtures'), fixture = path.join.bind(null, __dirname, 'fixtures'),
resolveFixture = path.resolve.bind(null, __dirname, 'fixtures'); resolveFixture = path.resolve.bind(null, __dirname, 'fixtures');
......
...@@ -3,7 +3,7 @@ var assert = require('assert'), ...@@ -3,7 +3,7 @@ var assert = require('assert'),
exists = fs.existsSync, exists = fs.existsSync,
path = require('path'), path = require('path'),
read = fs.readFileSync, read = fs.readFileSync,
sass = require('../sass'), sass = require('../lib'),
util = require('./util'); util = require('./util');
describe('spec', function () { describe('spec', function () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment