Revert ".embark/versions modules"

lib/pipeline/webpackProcess.js

@@ -6,7 +6,6 @@ const constants = require('../constants');
 const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
 const ProcessWrapper = require('../core/processes/processWrapper');
 const path = require('path');
-const glob = require('glob');
 
 let webpackProcess;
 
@@ -43,14 +42,6 @@ class WebpackProcess extends ProcessWrapper {
 
   webpackRun(filename, options, includeModules, importsList, detectErrors, realCwd, callback) {
     const self = this;
-    glob(fs.dappPath('.embark/versions') + '/*/*', (err, files) => {
-      let versions;
-      if (err) {
-        console.error(err);
-        versions = [];
-      } else {
-        versions = files;
-      }
     let defaultOptions = {
       mode: self.env === 'production' ? 'production' : 'none',
       // devtool: self.env === 'development' ? 'source-map' : false,
@@ -71,9 +62,8 @@ class WebpackProcess extends ProcessWrapper {
       resolve: {
         alias: importsList,
         modules: [
-            fs.dappPath('node_modules'),
-            ...versions,
-            fs.embarkPath('node_modules')
+          fs.embarkPath('node_modules'),
+          fs.dappPath('node_modules')
         ]
       },
       plugins: [
@@ -110,7 +100,7 @@ class WebpackProcess extends ProcessWrapper {
           {
             test: /\.js$/,
             loader: "babel-loader",
-              exclude: /(node_modules|bower_components|\.embark\/versions)/,
+            exclude: /(node_modules|bower_components)/,
             options: {
               presets: [
                 [
@@ -132,8 +122,8 @@ class WebpackProcess extends ProcessWrapper {
                 }
               }),
               plugins: [
-                  "babel-plugin-webpack-aliases",
-                  "@babel/plugin-transform-runtime"
+                "@babel/plugin-transform-runtime",
+                "babel-plugin-webpack-aliases"
               ].map(require.resolve),
               compact: false
             }
@@ -190,7 +180,6 @@ class WebpackProcess extends ProcessWrapper {
         callback(err);
       });
     });
-    });
   }
 }
 

package.json

@@ -48,7 +48,6 @@
     "follow-redirects": "^1.2.4",
     "fs-extra": "^2.0.0",
     "ganache-cli": "6.1.0",
-    "glob": "^7.1.2",
     "globule": "^1.1.0",
     "hard-source-webpack-plugin": "^0.11.1",
     "http-proxy": "^1.17.0",

test_apps/test_app/package.json

@@ -10,7 +10,7 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "@babel/code-frame": "^7.0.0-beta.54"
+    "babel-code-frame": "^6.26.0"
   },
   "dependencies": {
     "bootstrap": "^3.3.6",