@tarojs/rn-runner 3.5.0-canary.1 → 3.5.0

package/dist/config/terminal-reporter.js

@@ -8,51 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TerminalReporter = void 0;
-var metro_core_1 = require("metro-core");
-var MetroTerminalReporter = require("metro/src/lib/TerminalReporter");
-var ModuleResolution = require("metro/src/node-haste/DependencyGraph/ModuleResolution");
-var TerminalReporter = /** @class */ (function () {
-    function TerminalReporter(entry, sourceRoot, conditionalFileStore, metroServerInstance) {
+const rn_supporter_1 = require("@tarojs/rn-supporter");
+const MetroTerminalReporter = require("metro/src/lib/TerminalReporter");
+const metro_core_1 = require("metro-core");
+class TerminalReporter {
+    constructor(entry, sourceRoot, conditionalFileStore, metroServerInstance) {
         this._reporter = new MetroTerminalReporter(new metro_core_1.Terminal(process.stdout));
         this._conditionalFileStore = conditionalFileStore;
         this.metroServerInstance = metroServerInstance;
@@ -60,112 +22,82 @@ var TerminalReporter = /** @class */ (function () {
         this._entry = entry;
         this._sourceRoot = sourceRoot;
     }
-    TerminalReporter.prototype.update = function (args) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, realEntryPath_1, incrementalBundler, deltaBundler_1, bundler, findEntryGraphId, entryGraphId, entryGraphVersion_1;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = args.type;
-                        switch (_a) {
-                            case 'initialize_started': return [3 /*break*/, 1];
-                            case 'bundle_build_started': return [3 /*break*/, 2];
-                            case 'bundle_build_done': return [3 /*break*/, 3];
-                        }
-                        return [3 /*break*/, 5];
-                    case 1:
-                        this._reporter.terminal.log("\n  #####   ##   #####   ####     #####  ######   ##    ####  #####    #    #   ##   ##### # #    # ######\n    #    #  #  #    # #    #    #    # #       #  #  #    #   #      ##   #  #  #    #   # #    # #\n    #   #    # #    # #    #    #    # #####  #    # #        #      # #  # #    #   #   # #    # #####\n    #   ###### #####  #    #    #####  #      ###### #        #      #  # # ######   #   # #    # #\n    #   #    # #   #  #    #    #   #  #      #    # #    #   #      #   ## #    #   #   #  #  #  #\n    #   #    # #    #  ####     #    # ###### #    #  ####    #      #    # #    #   #   #   ##   ######\n");
-                        return [3 /*break*/, 6];
-                    case 2:
-                        args.bundleDetails.entryFile = './index';
+    update(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 当依赖图加载之后，检测app和页面配置文件的变化
+            switch (args.type) {
+                case 'initialize_started':
+                    this._reporter.terminal.log(`
+  #####   ##   #####   ####     #####  ######   ##    ####  #####    #    #   ##   ##### # #    # ######
+    #    #  #  #    # #    #    #    # #       #  #  #    #   #      ##   #  #  #    #   # #    # #
+    #   #    # #    # #    #    #    # #####  #    # #        #      # #  # #    #   #   # #    # #####
+    #   ###### #####  #    #    #####  #      ###### #        #      #  # # ######   #   # #    # #
+    #   #    # #   #  #    #    #   #  #      #    # #    #   #      #   ## #    #   #   #  #  #  #
+    #   #    # #    #  ####     #    # ###### #    #  ####    #      #    # #    #   #   #   ##   ######
+`);
+                    break;
+                case 'bundle_build_started':
+                    args.bundleDetails.entryFile = './index';
+                    this._reporter.update(args);
+                    break;
+                case 'bundle_build_done':
+                    {
                         this._reporter.update(args);
-                        return [3 /*break*/, 6];
-                    case 3:
-                        this._reporter.update(args);
-                        realEntryPath_1 = ModuleResolution.ModuleResolver.EMPTY_MODULE;
+                        const realEntryPath = require.resolve(rn_supporter_1.emptyModulePath);
                         if (this._initialized) {
                             // 恢复入口页面的缓存
                             this._reporter.ignoreEntryFileCache = false;
-                            return [2 /*return*/];
+                            return;
                         }
                         this._initialized = true;
                         if (!this.metroServerInstance) {
-                            return [2 /*return*/];
+                            return;
                         }
-                        incrementalBundler = this.metroServerInstance.getBundler();
-                        deltaBundler_1 = incrementalBundler.getDeltaBundler();
-                        bundler = incrementalBundler.getBundler();
-                        findEntryGraphId = function (keys) {
-                            var e_1, _a;
-                            try {
-                                for (var keys_1 = __values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
-                                    var k = keys_1_1.value;
-                                    if (JSON.parse(k).entryFile === realEntryPath_1) {
-                                        return k;
-                                    }
+                        const incrementalBundler = this.metroServerInstance.getBundler();
+                        const deltaBundler = incrementalBundler.getDeltaBundler();
+                        const bundler = incrementalBundler.getBundler();
+                        const findEntryGraphId = keys => {
+                            for (const k of keys) {
+                                if (JSON.parse(k).entryFile === realEntryPath) {
+                                    return k;
                                 }
                             }
-                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                            finally {
-                                try {
-                                    if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
-                                }
-                                finally { if (e_1) throw e_1.error; }
-                            }
                             return null;
                         };
-                        entryGraphId = findEntryGraphId(incrementalBundler._revisionsByGraphId.keys());
-                        return [4 /*yield*/, incrementalBundler.getRevisionByGraphId(entryGraphId)
-                            // 监听DeltaCalculator的change事件，把入口文件也加入到_modifiedFiles集合中
-                        ];
-                    case 4:
-                        entryGraphVersion_1 = _b.sent();
+                        // 获取入口文件的graph
+                        const entryGraphId = findEntryGraphId(incrementalBundler._revisionsByGraphId.keys());
+                        const entryGraphVersion = yield incrementalBundler.getRevisionByGraphId(entryGraphId);
                         // 监听DeltaCalculator的change事件，把入口文件也加入到_modifiedFiles集合中
-                        bundler.getDependencyGraph().then(function (dependencyGraph) {
-                            dependencyGraph.getWatcher().on('change', function (_a) {
-                                var eventsQueue = _a.eventsQueue;
-                                var changedFiles = eventsQueue.map(function (item) { return item.filePath; });
+                        bundler.getDependencyGraph().then(dependencyGraph => {
+                            dependencyGraph.getWatcher().on('change', ({ eventsQueue }) => {
+                                const changedFiles = eventsQueue.map(item => item.filePath);
                                 // 如果配置文件修改之后，把入口文件添加到修改列表中
-                                var deltaCalculator = deltaBundler_1._deltaCalculators.get(entryGraphVersion_1.graph);
-                                var isConfigurationModified = function (keys) {
-                                    var e_2, _a;
-                                    try {
-                                        for (var keys_2 = __values(keys), keys_2_1 = keys_2.next(); !keys_2_1.done; keys_2_1 = keys_2.next()) {
-                                            var k = keys_2_1.value;
-                                            if (k.includes('.config') && k.includes(_this._sourceRoot)) {
-                                                return true;
-                                            }
-                                        }
-                                    }
-                                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                                    finally {
-                                        try {
-                                            if (keys_2_1 && !keys_2_1.done && (_a = keys_2.return)) _a.call(keys_2);
+                                const deltaCalculator = deltaBundler._deltaCalculators.get(entryGraphVersion.graph);
+                                const isConfigurationModified = keys => {
+                                    for (const k of keys) {
+                                        if (k.includes('.config') && k.includes(this._sourceRoot)) {
+                                            return true;
                                         }
-                                        finally { if (e_2) throw e_2.error; }
                                     }
                                     return false;
                                 };
                                 if (isConfigurationModified(changedFiles)) {
                                     // 忽略入口文件的转译结果缓存
-                                    _this._conditionalFileStore.ignoreEntryFileCache = true;
-                                    deltaCalculator._modifiedFiles.add(realEntryPath_1);
-                                    _this._reporter.terminal.flush();
+                                    this._conditionalFileStore.ignoreEntryFileCache = true;
+                                    deltaCalculator._modifiedFiles.add(realEntryPath);
+                                    this._reporter.terminal.flush();
                                     console.log('\nConfiguration(s) are changed.');
                                 }
                             });
                         });
-                        return [3 /*break*/, 6];
-                    case 5:
-                        this._reporter.update(args);
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/];
-                }
-            });
+                    }
+                    break;
+                default:
+                    this._reporter.update(args);
+                    break;
+            }
         });
-    };
-    return TerminalReporter;
-}());
+    }
+}
 exports.TerminalReporter = TerminalReporter;
 //# sourceMappingURL=terminal-reporter.js.map

package/dist/config/terminal-reporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-reporter.js","sourceRoot":"","sources":["../../src/config/terminal-reporter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-reporter.js","sourceRoot":"","sources":["../../src/config/terminal-reporter.ts"],"names":[],"mappings":"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"}