@cloudbase/lowcode-builder 1.1.6 → 1.1.7

package/lib/builder/service/webpack.js

@@ -456,10 +456,13 @@ async function installDependencies(targetDir, options = {}) {
         }
     }
     catch (e) { }
-    // 如果generatedFileContents[path.resolve(targetDir, 'package.json')]不存在，说明是不存在缓存文件，isPkgModify必须是true，才不会忽略install
-    const isPkgModify = !generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')]
-        ? true
-        : generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')].modify;
+    const packageJsonPath = path_1.default.resolve(targetDir, 'package.json');
+    /**
+     * 无 cacheMeta 或 cacheMeta.once 时 遵循 options?.ignoreInstall 配置
+     * 否则认为文件发生了更改，应该忽略参数强制安装
+     */
+    const cacheMeta = generateFiles_1.generatedFileContents[packageJsonPath];
+    const isPkgModify = !cacheMeta || cacheMeta.once ? false : generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')].modify;
     if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) && fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules')) && !isPkgModify) {
         console.log(`ignore install dependencies in ${targetDir}`);
         return;

package/lib/builder/util/generateFiles.js

@@ -67,8 +67,16 @@ async function generateFiles(appFileData, srcDir, dstDir, ctx) {
 }
 exports.default = generateFiles;
 async function writeFile(outFile, content) {
-    var _a;
-    const generated = (_a = exports.generatedFileContents[outFile]) === null || _a === void 0 ? void 0 : _a.content;
+    if (!exports.generatedFileContents[outFile]) {
+        exports.generatedFileContents[outFile] = {
+            once: true,
+        };
+    }
+    else {
+        exports.generatedFileContents[outFile].once = false;
+    }
+    const meta = exports.generatedFileContents[outFile];
+    const generated = meta.content;
     if (generated === content && fs_extra_1.default.existsSync(outFile)) {
         exports.generatedFileContents[outFile].modify = false;
         return false;
@@ -76,7 +84,7 @@ async function writeFile(outFile, content) {
     // console.log(outFile);
     await fs_extra_1.default.ensureFile(outFile);
     await fs_extra_1.default.writeFile(outFile, content);
-    exports.generatedFileContents[outFile] = { content, modify: true };
+    exports.generatedFileContents[outFile] = { ...meta, content, modify: true };
     return true;
 }
 exports.writeFile = writeFile;