Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/utilities/compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

const chokidar = require('chokidar');
const fs = require('fs-extra');
const escapeRegex = require('escape-string-regexp');
const debug = require('debug')('ember-cli-typescript:tsc:trace');

module.exports = function compile(project, tsOptions, callbacks) {
Expand All @@ -23,7 +24,7 @@ module.exports = function compile(project, tsOptions, callbacks) {
let host = ts.createWatchCompilerHost(
configPath,
fullOptions,
buildWatchHooks(ts.sys, callbacks),
buildWatchHooks(project, ts.sys, callbacks),
createProgram,
diagnosticCallback(callbacks.reportDiagnostic),
diagnosticCallback(callbacks.reportWatchStatus)
Expand All @@ -47,13 +48,17 @@ function diagnosticCallback(callback) {
}
}

function buildWatchHooks(sys, callbacks) {
function buildWatchHooks(project, sys, callbacks) {
let root = escapeRegex(project.root);
let sep = `[/\\\\]`;
let patterns = ['\\..*?', 'dist', 'node_modules', 'tmp'];
let ignored = new RegExp(`^${root}${sep}(${patterns.join('|')})${sep}`);

return Object.assign({}, sys, {
watchFile: null,
watchDirectory(dir, callback) {
if (!fs.existsSync(dir)) return;

let ignored = /\/(\..*?|dist|node_modules|tmp)\//;
let watcher = chokidar.watch(dir, { ignored, ignoreInitial: true });

watcher.on('all', (type, path) => {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"ember-cli-valid-component-name": "^1.0.0",
"ember-cli-version-checker": "^2.1.0",
"ember-router-generator": "^1.2.3",
"escape-string-regexp": "^1.0.5",
"execa": "^0.9.0",
"exists-sync": "^0.0.4",
"fs-extra": "^5.0.0",
Expand Down