Merge pull request #120 from xtremespb/core_240521_2

Fix: build process updated
xtremespb · May 24, 2021 · 45b9b6d · 45b9b6d
2 parents e99ce66 + 01e671d
commit 45b9b6d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 280 deletions.
diff --git a/dev/utils.js b/dev/utils.js
@@ -10,7 +10,6 @@ const {
 const minify = require("@node-minify/core");
 const htmlMinifier = require("@node-minify/html-minifier");
 const packageJson = require("../package.json");
-const packageLock = require("../package-lock.json");
 
 const cleanUpWeb = argv => {
     [argv.update ? "build/public/update_" : "build/public/zoia_", "build/scripts"].map(d => {
@@ -175,15 +174,21 @@ const installRequiredPackages = async (moduleDirs, argv) => {
             continue;
         }
         const cmd = Object.keys(npmData).map(m => {
-            if (!packageLock.dependencies[m] || packageLock.dependencies[m].version !== npmData[m].replace(/\^/gm, "")) {
+            if (!packageJsonCore.dependencies[m] || packageJsonCore.dependencies[m] !== npmData[m] || !packageJsonCore.devDependencies[m] || packageJsonCore.devDependencies[m] !== npmData[m]) {
+                try {
+                    require(m);
+                    return null;
+                } catch (e) {
+                    console.log(e.message);
+                }
                 return `${m}@${npmData[m]}`;
             }
         }).filter(i => i).join(" ");
         if (cmd && cmd.length) {
             try {
                 console.log(`Installing NPM packages for module "${dir}"...`);
                 // eslint-disable-next-line no-await-in-loop
-                execSync(`npm i ${cmd} --loglevel=error --save`);
+                execSync(`npm i ${cmd} --loglevel=error`);
             } catch (e) {
                 console.error(e);
                 process.exit(1);