Merge pull request #17 from tkhtechnology/MX002-8368_clean

chore: Mitigate production vulnerabilities
Meteor-Community-Packages · May 7, 2023 · 038dbb3 · 038dbb3
2 parents 6f1390b + 7c64e3e
commit 038dbb3
Show file tree

Hide file tree

Showing 9 changed files with 1,718 additions and 1,115 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -29,7 +29,7 @@ jobs:
       - checkout
       - run:
           name: Update npm
-          command: 'sudo npm install -g npm@latest'
+          command: 'sudo npm install -g npm@6'
       - restore_cache:
           key: dependency-cache-{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
       - run:

diff --git a/lib/electronApp.js b/lib/electronApp.js
@@ -1,6 +1,6 @@
 // eslint-disable-next-line no-unused-vars
 import regeneratorRuntime from 'regenerator-runtime/runtime';
-import asar from 'asar';
+import asar from '@electron/asar';
 import assignIn from 'lodash/assignIn';
 import _ from 'lodash';
 import { LocalInstaller, progress } from 'install-local';
@@ -70,8 +70,9 @@ export default class ElectronApp {
             this.log.debug('packing');
             asar.createPackage(
                 this.$.env.paths.electronApp.appRoot,
-                this.$.env.paths.electronApp.appAsar,
-                () => {
+                this.$.env.paths.electronApp.appAsar
+            )
+                .then(() => {
                     // Lets move the node_modules back.
                     this.log.debug('moving node_modules back from app dir');
 
@@ -116,8 +117,7 @@ export default class ElectronApp {
                         { force: true }
                     );
                     resolve();
-                }
-            );
+                });
         });
     }
 
@@ -621,8 +621,7 @@ export default class ElectronApp {
                             undefined,
                             this.$.env.paths.electronApp.root
                         )
-                    )
-                );
+                    ));
             }
         }
         await Promise.all(promises);
@@ -812,8 +811,9 @@ export default class ElectronApp {
         return new Promise((resolve, reject) => {
             asar.createPackage(
                 this.$.env.paths.desktopTmp.root,
-                this.$.env.paths.electronApp.desktopAsar,
-                () => {
+                this.$.env.paths.electronApp.desktopAsar
+            )
+                .then(() => {
                     this.log.verbose('clearing temporary .desktop');
                     this.$.utils
                         .rmWithRetries('-rf', this.$.env.paths.desktopTmp.root)
@@ -824,8 +824,7 @@ export default class ElectronApp {
                             reject(e);
                         });
                     resolve();
-                }
-            );
+                });
         });
     }
 

diff --git a/lib/meteorApp.js b/lib/meteorApp.js
@@ -6,7 +6,7 @@ import semver from 'semver';
 import shell from 'shelljs';
 import path from 'path';
 import singleLineLog from 'single-line-log';
-import asar from 'asar';
+import asar from '@electron/asar';
 import fetch from 'node-fetch';
 
 import IsDesktopInjector from '../skeleton/modules/autoupdate/isDesktopInjector';
@@ -892,8 +892,9 @@ export default class MeteorApp {
         return new Promise((resolve, reject) =>
             asar.createPackage(
                 this.$.env.paths.electronApp.meteorApp,
-                path.join(this.$.env.paths.electronApp.root, 'meteor.asar'),
-                () => {
+                path.join(this.$.env.paths.electronApp.root, 'meteor.asar')
+            )
+                .then(() => {
                     // On Windows some files might still be blocked. Giving a tick for them to be
                     // ready for deletion.
                     setImmediate(() => {
@@ -907,8 +908,7 @@ export default class MeteorApp {
                                 reject(e);
                             });
                     });
-                }
-            ));
+                }));
     }
 
     /**