Merge pull request #252 from wojtkowiak/v2.1.0

v2.1.0
wojtkowiak · Jan 21, 2020 · 4b4dfdd · 4b4dfdd
2 parents d106a83 + e449b4d
commit 4b4dfdd
Show file tree

Hide file tree

Showing 11 changed files with 245 additions and 4,107 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v2.1.0 <sup>xx.xx.2019</sup>
+## v2.1.0 <sup>21.01.2020</sup>
 
 * Update some dependencies and fixes some vulnerabilities
 * Added support for Electron 5 (by [`KoenLav`](https://github.com/KoenLav) in [`#227`](https://github.com/wojtkowiak/meteor-desktop/pull/227))

diff --git a/appveyor.yml b/appveyor.yml
@@ -12,12 +12,6 @@ environment:
     - nodejs_version: "10"
       test: "integration"
       platform: x64
-    - nodejs_version: "10"
-      test: "integration"
-      platform: x64
-    - nodejs_version: "10"
-      test: "normal"
-      platform: x64
 
 cache:
   - node_modules -> appveyor.yml

diff --git a/devEnvSetup.js b/devEnvSetup.js
@@ -62,7 +62,7 @@ function finish() {
 var cloneMeteorDesktop = false;
 var forks = false;
 var username = '';
-var projects = [ 'meteor-desktop-test-suite', 'meteor-desktop-splash-screen', 'meteor-desktop-localstorage' ];
+var projects = [ 'meteor-desktop-test-suite', 'meteor-desktop-splash-screen' ];
 
 question('Do you want to use another path (yes/no)? ')
     .then(function(answer) {
@@ -116,7 +116,7 @@ question('Do you want to use another path (yes/no)? ')
             });
         }
         console.log('\nCreating meteor-desktop-test-app');
-        exec('meteor create meteor-desktop-test-app --release=METEOR@1.6');
+        exec('meteor create meteor-desktop-test-app --release=METEOR@1.8');
 
         console.log('Installing deps in meteor-desktop...\n');
         return spawn(npm, ['install'], path.join(resolvedPath, 'meteor-desktop'));
@@ -138,15 +138,6 @@ question('Do you want to use another path (yes/no)? ')
         cd(resolvedPath);
         return spawn(npm, ['install'], path.join(resolvedPath, 'meteor-desktop-splash-screen'));
     })
-    .then(function() {
-        console.log('Installing deps in meteor-desktop-localstorage...\n');
-        cd(path.join(resolvedPath, 'meteor-desktop-localstorage'));
-        console.log('Linking...');
-        exec(npm + ' link meteor-desktop-test-suite');
-        exec(npm + ' link');
-        cd(resolvedPath);
-        return spawn(npm, ['install'], path.join(resolvedPath, 'meteor-desktop-localstorage'));
-    })
     .then(function() {
         console.log('Adding meteor-desktop to test project...\n\n');
         return spawn(npm, ['install', '--save-dev', '../meteor-desktop'], path.join(resolvedPath, 'meteor-desktop-test-app'));
@@ -157,7 +148,7 @@ question('Do you want to use another path (yes/no)? ')
         exec(npm + ' link meteor-desktop-test-suite');
         console.log('Installing cross-env, babel-runtime');
         exec(npm + ' install --save-dev cross-env');
-        exec(npm + ' install --save babel-runtime');
+        exec(npm + ' install --save @babel/runtime');
         cd(resolvedPath);
         var packageJsonPath = path.join(resolvedPath, 'meteor-desktop-test-app', 'package.json');
         var packageJson = JSON.parse(fs.readFileSync(packageJsonPath), 'utf8');
@@ -170,7 +161,7 @@ question('Do you want to use another path (yes/no)? ')
 
         var settingsJsonPath = path.join(resolvedPath, 'meteor-desktop-test-app', '.desktop', 'settings.json');
         var settingsJson = JSON.parse(fs.readFileSync(settingsJsonPath), 'utf8');
-        settingsJson.linkPackages = ['meteor-desktop-splash-screen', 'meteor-desktop-localstorage'];
+        settingsJson.linkPackages = ['meteor-desktop-splash-screen'];
         fs.writeFileSync(settingsJsonPath, JSON.stringify(settingsJson, null, 2));
 
         return spawn(npm, ['run', 'desktop', '--', 'init-tests-support'], path.join(resolvedPath, 'meteor-desktop-test-app'));
@@ -201,4 +192,4 @@ question('Do you want to use another path (yes/no)? ')
     .then(function() {
       finish();
     })
-    .catch(function(e) { console.log(e); e.trace(); });
+    .catch(function(e) { console.log(e); });
diff --git a/lib/electronApp.js b/lib/electronApp.js
@@ -112,7 +112,8 @@ export default class ElectronApp {
                     del.sync(
                         [`${this.$.env.paths.electronApp.root}${path.sep}*`].concat(
                             exclude.map(pathToExclude => `!${pathToExclude}`)
-                        )
+                        ),
+                        { force: true }
                     );
                     resolve();
                 }
@@ -837,7 +838,7 @@ export default class ElectronApp {
         // Remove test files.
         del.sync([
             path.join(this.$.env.paths.desktopTmp.root, '**', '*.test.js')
-        ]);
+        ], { force: true });
     }
 
 

diff --git a/lib/electronAppScaffold.js b/lib/electronAppScaffold.js
@@ -57,7 +57,7 @@ export default class ElectronAppScaffold {
         return del([
             `${this.$.env.paths.electronApp.root}${path.sep}*`,
             `!${this.$.env.paths.electronApp.nodeModules}`
-        ]);
+        ], { force: true });
     }
 
     /**