Skip to content

Commit 55574c5

Browse files
committed
plugin changes
1 parent c515f97 commit 55574c5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

misc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ https://www.rapidtables.com/web/color/gray-color.html
1414
git remote add upstream https://github.com/sencha/ext-allshared.git
1515
git fetch upstream
1616
git merge upstream/master
17-
git merge upstream/ext-allshared-7.1.1
17+
git merge upstream/ext-allshared-7.2.x
1818

1919

2020
generators/ext-angular/src/*.*

packages/ext-webpack-plugin/src/pluginUtil.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ export async function _emit(compiler, compilation, vars, options, callback) {
209209
var verbose = options.verbose
210210
var emit = options.emit
211211
var framework = options.framework
212+
vars.callback = callback
212213
logv(verbose,'FUNCTION _emit')
213214
if (emit == 'yes') {
214215
if (vars.buildstep == '1 of 1' || vars.buildstep == '1 of 2') {
@@ -475,7 +476,8 @@ export async function _executeAsync (app, command, parms, opts, compilation, var
475476
vars.child.stdout.on('data', (data) => {
476477
var str = data.toString().replace(/\r?\n|\r/g, " ").trim()
477478
logv(verbose, `${str}`)
478-
if (data && data.toString().match(/Fashion waiting for changes\.\.\./)) {
479+
//if (data && data.toString().match(/Fashion waiting for changes\.\.\./)) {
480+
if (data && data.toString().match(/aiting for changes\.\.\./)) {
479481

480482
// const fs = require('fs');
481483
// var filename = process.cwd() + vars.touchFile;
@@ -488,7 +490,7 @@ export async function _executeAsync (app, command, parms, opts, compilation, var
488490
// catch(e) {
489491
// logv(app, `NOT touching ${filename}`);
490492
// }
491-
493+
vars.callback()
492494
resolve(0)
493495
}
494496
else {

0 commit comments

Comments
 (0)