yeoman-environment 4.1.1 → 4.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/environment-base.js +8 -1
- package/package.json +1 -1
package/dist/environment-base.js
CHANGED
|
@@ -611,7 +611,14 @@ export default class EnvironmentBase extends EventEmitter {
|
|
|
611
611
|
this.queueTask('environment:conflicts', async () => {
|
|
612
612
|
debug('Adding queueCommit listener');
|
|
613
613
|
// Conflicter can change files add listener before commit task.
|
|
614
|
-
|
|
614
|
+
const changedFileHandler = (filePath) => {
|
|
615
|
+
const file = this.sharedFs.get(filePath);
|
|
616
|
+
if (isFilePending(file)) {
|
|
617
|
+
queueCommit();
|
|
618
|
+
this.sharedFs.removeListener('change', changedFileHandler);
|
|
619
|
+
}
|
|
620
|
+
};
|
|
621
|
+
this.sharedFs.on('change', changedFileHandler);
|
|
615
622
|
debug('Running conflicts');
|
|
616
623
|
const { customCommitTask = async () => commitSharedFsTask(this) } = this.composedStore;
|
|
617
624
|
if (typeof customCommitTask === 'function') {
|