@itera-web/cli 1.1.58 → 1.1.60

package/dist/config/webpack.common.js

@@ -68,7 +68,7 @@ module.exports = {
     plugins: [
         new html_webpack_plugin_1.default({
             filename: 'index.html',
-            template: resolve('public/base.html'),
+            template: resolve('public/index.html'),
             hash: true,
             minify: {
                 removeAttributeQuotes: true,

package/dist/plugins/sortSrciptTag.js

@@ -4,70 +4,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var cheerio_1 = __importDefault(require("cheerio"));
-var fs_1 = __importDefault(require("fs"));
-var path_1 = __importDefault(require("path"));
-var Console = require('../public/log').Console;
+var webpack_1 = require("webpack");
 var SortScriptTagPlugin = (function () {
     function SortScriptTagPlugin() {
     }
     SortScriptTagPlugin.prototype.apply = function (compiler) {
-        compiler.hooks.compile.tap('SortScriptTagPlugin', function () {
-            Console.cyan('编译开始...');
-        });
-        compiler.hooks.emit.tapAsync('SortScriptTagPlugin', function (compilation, callback) {
-            Console.cyan('emit 阶段开始...');
-            callback();
-        });
-        compiler.hooks.afterEmit.tapAsync('SortScriptTagPlugin', function (compilation, callback) {
-            Console.cyan('afterEmit 阶段开始...');
-            callback();
-        });
-        compiler.hooks.done.tap('SortScriptTagPlugin', function (stats) {
-            Console.success('构建完毕');
-            var outputPath = compiler.options.output.path;
-            var baseHtmlPath = path_1.default.join(outputPath, 'base.html');
-            if (fs_1.default.existsSync(baseHtmlPath)) {
-                Console.cyan('开始引入排序');
-                var baseHtmlContent = fs_1.default.readFileSync(baseHtmlPath, 'utf8');
-                var $_1 = cheerio_1.default.load(baseHtmlContent, { decodeEntities: false });
-                var srcTag = $_1('script');
+        compiler.hooks.thisCompilation.tap('SortScriptTagPlugin', function (compilation) {
+            compilation.hooks.processAssets.tap({
+                name: 'SortScriptTagPlugin',
+                stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE,
+            }, function (assets) {
+                var htmlName = 'index.html';
+                var asset = compilation.getAsset(htmlName);
+                if (!asset)
+                    return;
+                var html = asset.source.source().toString();
+                var $ = cheerio_1.default.load(html, { decodeEntities: false });
+                var srcTag = $('script');
                 var scripts = srcTag.toArray().reverse();
-                var priorityList_1 = ['react', 'main'];
-                var priorityScripts_1 = {};
-                priorityList_1.forEach(function (key) {
-                    priorityScripts_1[key] = null;
-                });
-                var otherScripts_1 = [];
+                var priorityList = ['react', 'main'];
+                var priorityScripts = {};
+                priorityList.forEach(function (k) { return (priorityScripts[k] = null); });
+                var otherScripts = [];
                 scripts.forEach(function (script) {
-                    var src = $_1(script).attr('src') || '';
+                    var src = $(script).attr('src') || '';
                     var matched = false;
-                    for (var _i = 0, priorityList_2 = priorityList_1; _i < priorityList_2.length; _i++) {
-                        var key = priorityList_2[_i];
-                        if (src.includes("js/".concat(key, ".")) && !priorityScripts_1[key]) {
-                            priorityScripts_1[key] = script;
+                    for (var _i = 0, priorityList_1 = priorityList; _i < priorityList_1.length; _i++) {
+                        var key = priorityList_1[_i];
+                        if (src.includes("js/".concat(key, ".")) && !priorityScripts[key]) {
+                            priorityScripts[key] = script;
                             matched = true;
                             break;
                         }
                     }
                     if (!matched)
-                        otherScripts_1.push(script);
+                        otherScripts.push(script);
                 });
                 srcTag.remove();
-                priorityList_1.forEach(function (key) {
-                    if (priorityScripts_1[key]) {
-                        $_1('body').append(priorityScripts_1[key]);
-                    }
+                priorityList.forEach(function (key) {
+                    if (priorityScripts[key])
+                        $('body').append(priorityScripts[key]);
                 });
-                otherScripts_1.forEach(function (script) {
-                    $_1('body').append(script);
+                otherScripts.forEach(function (script) {
+                    $('body').append(script);
                 });
-                var modifiedHtml = $_1.html();
-                fs_1.default.writeFileSync(baseHtmlPath, modifiedHtml, 'utf8');
-                Console.success('引入排序完毕');
-            }
-        });
-        compiler.hooks.failed.tap('SortScriptTagPlugin', function (err) {
-            Console.error('构建失败:', err);
+                var newHtml = $.html();
+                compilation.updateAsset(htmlName, new webpack_1.sources.RawSource(newHtml));
+            });
         });
     };
     return SortScriptTagPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itera-web/cli",
-  "version": "1.1.58",
+  "version": "1.1.60",
   "bin": {
     "itera-cli": "./bin/index.js"
   },