Fix node-sass watcher #71
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| var converter = require('./converter'); | ||
|
|
||
| module.exports = function ($logger) { | ||
| var watcher = converter.getWatcher(); | ||
| if (watcher) { | ||
| $logger.info("Stopping nativescript-dev-sass watcher"); | ||
| watcher.close(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,138 @@ | ||
| exports.convert = convert; | ||
| exports.getWatcher = getWatcher; | ||
|
|
||
| var spawn = require('child_process').spawn; | ||
| var fs = require('fs'); | ||
| var path = require('path'); | ||
| var choki = require('chokidar'); | ||
| var watcher = null; | ||
|
|
||
| function convert(logger, projectDir, appDir, options) { | ||
| options = options || {}; | ||
| var sassPath = getSassPath(); | ||
| var data = { | ||
| sassPath: sassPath, | ||
| projectDir: projectDir, | ||
| appDir: appDir, | ||
| logger: logger, | ||
| options: options | ||
| }; | ||
|
|
||
| if (options.watch) { | ||
| createWatcher(data); | ||
| } | ||
|
|
||
| return spawnNodeSass(data); | ||
| } | ||
|
|
||
| function getWatcher() { | ||
| return watcher; | ||
| } | ||
|
|
||
| function createWatcher(data) { | ||
| var appDir = data.appDir; | ||
| var watcherOptions = { | ||
| ignoreInitial: true, | ||
| cwd: appDir, | ||
| awaitWriteFinish: { | ||
| pollInterval: 100, | ||
| stabilityThreshold: 500 | ||
|
There was a problem hiding this comment. isn't it way too long, maybe 300 ? |
||
| }, | ||
| ignored: ['**/.*', '.*'] // hidden files | ||
| }; | ||
|
|
||
| watcher = choki.watch(['**/*.scss', '**/*.sass'], watcherOptions) | ||
| .on('all', (event, filePath) => { | ||
| spawnNodeSass(data); | ||
|
There was a problem hiding this comment. In case you apply several changes and save them one-by-one, you'll receive multiple events and several processes will be spawned. This is a problem, so I suggest chaining the calls to var watchPromisesChain = Promise.resolve();
watcher = choki.watch(['**/*.scss', '**/*.sass'], watcherOptions)
.on('all', (event, filePath) => {
watchPromiseChain = watchPromiseChain.then( () => spawnNodeSass(data) );
}); |
||
| }); | ||
| } | ||
|
|
||
| function getSassPath() { | ||
| var sassPath = require.resolve('node-sass/bin/node-sass'); | ||
| if (fs.existsSync(sassPath)) { | ||
| try { | ||
| logger.info('Found peer node-sass'); | ||
| } catch (err) { } | ||
|
There was a problem hiding this comment. When will the |
||
| } else { | ||
| throw Error('node-sass installation local to project was not found. Install by executing `npm install node-sass`.'); | ||
|
|
||
| } | ||
|
|
||
| return sassPath; | ||
| } | ||
|
|
||
| function spawnNodeSass(data) { | ||
| return new Promise(function (resolve, reject) { | ||
| var sassPath = data.sassPath, | ||
| projectDir = data.projectDir, | ||
| appDir = data.appDir, | ||
| logger = data.logger, | ||
| options = data.options; | ||
|
|
||
| var importerPath = path.join(__dirname, "importer.js"); | ||
|
|
||
| // Node SASS Command Line Args (https://github.com/sass/node-sass#command-line-interface) | ||
| // --ouput : Output directory | ||
| // --output-style : CSS output style (nested | expanded | compact | compresed) | ||
| // -q : Supress log output except on error | ||
| // --follow : Follow symlinked directories | ||
| // -r : Recursively watch directories or files | ||
| // --watch : Watch a directory or file | ||
| var nodeArgs = [sassPath, appDir, '--output', appDir, '--output-style', 'compressed', '-q', '--follow', '--importer', importerPath]; | ||
| logger.trace(process.execPath, nodeArgs.join(' ')); | ||
|
|
||
| var env = Object.create( process.env ); | ||
| env.PROJECT_DIR = projectDir; | ||
| env.APP_DIR = appDir; | ||
|
|
||
| var currentSassProcess = spawn(process.execPath, nodeArgs, { env: env }); | ||
|
|
||
| var isResolved = false; | ||
| var watchResolveTimeout; | ||
|
There was a problem hiding this comment. this variable is not used |
||
|
|
||
| currentSassProcess.stdout.on('data', function (data) { | ||
| var stringData = data.toString(); | ||
| logger.info(stringData); | ||
| }); | ||
|
|
||
| currentSassProcess.stderr.on('data', function (err) { | ||
| var message = ''; | ||
| var stringData = err.toString(); | ||
|
|
||
| try { | ||
| var parsed = JSON.parse(stringData); | ||
| message = parsed.formatted || parsed.message || stringData; | ||
| } catch (e) { | ||
| message = err.toString(); | ||
| } | ||
|
|
||
| logger.info(message); | ||
| }); | ||
|
|
||
| currentSassProcess.on('error', function (err) { | ||
| logger.info(err.message); | ||
| if (!isResolved) { | ||
| isResolved = true; | ||
| reject(err); | ||
| } | ||
| }); | ||
|
|
||
| // TODO: Consider using close event instead of exit | ||
| currentSassProcess.on('exit', function (code, signal) { | ||
| currentSassProcess = null; | ||
| if (!isResolved) { | ||
| isResolved = true; | ||
| if (code === 0) { | ||
| resolve(); | ||
| } else { | ||
| reject(Error('SASS compiler failed with exit code ' + code)); | ||
|
|
||
| } | ||
| } | ||
| }); | ||
|
|
||
| // SASS does not recompile on watch, so directly resolve. | ||
| if (options.watch && !isResolved) { | ||
|
There was a problem hiding this comment. I don't think you need the check for There was a problem hiding this comment. In fact the whole if and the call to |
||
| isResolved = true; | ||
| resolve(); | ||
| } | ||
| }); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can use short syntax for all properties: