Merge pull request #3134 from LLK/hotfix/upgrade-dependencies

Upgrade file-loader, url-loader and async packages, add package-lock.json

.travis.yml

@@ -98,10 +98,16 @@ addons:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.8
+before_install:
+# package-lock.json was introduced in npm@5
+- '[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest' # skipped when using node 9
+- npm install -g greenkeeper-lockfile
 install:
   - sudo -H pip install -r requirements.txt
   - npm --production=false install
   - npm --production=false update
+before_script: greenkeeper-lockfile-update
+after_script: greenkeeper-lockfile-upload
 jobs:
   include:
   - stage: test

bin/configure-fastly.js

@@ -37,11 +37,11 @@ async.auto({
             }
         });
     },
-    recvCustomVCL: ['version', function (cb, results) {
+    recvCustomVCL: ['version', function (results, cb) {
         // For all the routes in routes.json, construct a varnish-style regex that matches
         // on any of those route conditions.
         var notPassStatement = fastlyConfig.getAppRouteCondition('../build/*', routes, extraAppRoutes, __dirname);
-        
+
         // For a non-pass condition, point backend at s3
         var recvCondition = '' +
             'if (' + notPassStatement + ') {\n' +
@@ -74,7 +74,7 @@ async.auto({
             '        return(pass);\n' +
             '    }\n' +
             '}\n';
- 
+
 
         fastly.setCustomVCL(
             results.version,
@@ -83,14 +83,14 @@ async.auto({
             cb
         );
     }],
-    fetchCustomVCL: ['version', function (cb, results) {
+    fetchCustomVCL: ['version', function (results, cb) {
         var passStatement = fastlyConfig.negateConditionStatement(
             fastlyConfig.getAppRouteCondition('../build/*', routes, extraAppRoutes, __dirname)
         );
         var ttlCondition = fastlyConfig.setResponseTTL(passStatement);
         fastly.setCustomVCL(results.version, 'fetch-condition', ttlCondition, cb);
     }],
-    appRouteRequestConditions: ['version', function (cb, results) {
+    appRouteRequestConditions: ['version', function (results, cb) {
         var conditions = {};
         async.forEachOf(routes, function (route, id, cb2) {
             var condition = {
@@ -110,7 +110,7 @@ async.auto({
             cb(null, conditions);
         });
     }],
-    appRouteHeaders: ['version', 'appRouteRequestConditions', function (cb, results) {
+    appRouteHeaders: ['version', 'appRouteRequestConditions', function (results, cb) {
         var headers = {};
         async.forEachOf(routes, function (route, id, cb2) {
             if (route.redirect) {
@@ -133,7 +133,7 @@ async.auto({
                         };
                         fastly.setResponseObject(results.version, responseObject, cb3);
                     },
-                    redirectHeader: ['responseCondition', function (cb3, redirectResults) {
+                    redirectHeader: ['responseCondition', function (redirectResults, cb3) {
                         var header = {
                             name: fastlyConfig.getHeaderNameForRoute(route),
                             action: 'set',
@@ -172,7 +172,7 @@ async.auto({
             cb(null, headers);
         });
     }],
-    tipbarRedirectHeaders: ['version', function (cb, results) {
+    tipbarRedirectHeaders: ['version', function (results, cb) {
         async.auto({
             requestCondition: function (cb2) {
                 var condition = {
@@ -192,7 +192,7 @@ async.auto({
                 };
                 fastly.setCondition(results.version, condition, cb2);
             },
-            responseObject: ['requestCondition', function (cb2, redirectResults) {
+            responseObject: ['requestCondition', function (redirectResults, cb2) {
                 var responseObject = {
                     name: 'redirects/?tip_bar=',
                     status: 301,
@@ -201,7 +201,7 @@ async.auto({
                 };
                 fastly.setResponseObject(results.version, responseObject, cb2);
             }],
-            redirectHeader: ['responseCondition', function (cb2, redirectResults) {
+            redirectHeader: ['responseCondition', function (redirectResults, cb2) {
                 var header = {
                     name: 'redirects/?tip_bar=',
                     action: 'set',
@@ -218,7 +218,7 @@ async.auto({
             cb(null, redirectResults);
         });
     }],
-    embedRedirectHeaders: ['version', function (cb, results) {
+    embedRedirectHeaders: ['version', function (results, cb) {
         async.auto({
             requestCondition: function (cb2) {
                 var condition = {
@@ -238,7 +238,7 @@ async.auto({
                 };
                 fastly.setCondition(results.version, condition, cb2);
             },
-            responseObject: ['requestCondition', function (cb2, redirectResults) {
+            responseObject: ['requestCondition', function (redirectResults, cb2) {
                 var responseObject = {
                     name: 'redirects/projects/embed',
                     status: 301,
@@ -247,7 +247,7 @@ async.auto({
                 };
                 fastly.setResponseObject(results.version, responseObject, cb2);
             }],
-            redirectHeader: ['responseCondition', function (cb2, redirectResults) {
+            redirectHeader: ['responseCondition', function (redirectResults, cb2) {
                 var header = {
                     name: 'redirects/projects/embed',
                     action: 'set',

package.json

@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "ajv": "6.4.0",
-    "async": "1.5.2",
+    "async": "3.1.0",
     "autoprefixer": "6.3.6",
     "babel-cli": "6.26.0",
     "babel-core": "6.23.1",
@@ -65,7 +65,7 @@
     "eslint-plugin-react": "7.4.0",
     "exenv": "1.2.0",
     "fastly": "1.2.1",
-    "file-loader": "0.8.4",
+    "file-loader": "4.0.0",
     "formik": "1.5.4",
     "formsy-react": "1.1.4",
     "formsy-react-components": "1.0.0",
@@ -112,7 +112,7 @@
     "source-map-support": "0.3.2",
     "style-loader": "0.12.3",
     "tap": "14.2.0",
-    "url-loader": "0.5.6",
+    "url-loader": "2.0.1",
     "watch": "0.16.0",
     "webpack": "2.7.0",
     "webpack-dev-middleware": "2.0.4",

src/redux/preview.js

@@ -1,6 +1,6 @@
 const defaults = require('lodash.defaults');
 const keyMirror = require('keymirror');
-const async = require('async');
+const eachLimit = require('async/eachLimit');
 const mergeWith = require('lodash.mergewith');
 const uniqBy = require('lodash.uniqby');
 
@@ -524,7 +524,7 @@ module.exports.getCommentById = (projectId, commentId, ownerUsername, isAdmin, t
 module.exports.getReplies = (projectId, commentIds, offset, ownerUsername, isAdmin, token) => (dispatch => {
     dispatch(module.exports.setFetchStatus('replies', module.exports.Status.FETCHING));
     const fetchedReplies = {};
-    async.eachLimit(commentIds, 10, (parentId, callback) => {
+    eachLimit(commentIds, 10, (parentId, callback) => {
         api({
             uri: `${isAdmin ? '/admin' : `/users/${ownerUsername}`}/projects/${projectId}/comments/${parentId}/replies`,
             authentication: token ? token : null,

webpack.config.js

@@ -81,7 +81,8 @@ module.exports = {
                 include: [
                     path.resolve(__dirname, 'src'),
                     /node_modules[\\/]scratch-[^\\/]+[\\/]src/,
-                    /node_modules[\\/]pify/
+                    /node_modules[\\/]pify/,
+                    /node_modules[\\/]async/
                 ]
             },
             {