Bumped jest and fixed the feature storage.

weaveworks · Mar 26, 2019 · 0b1a1f4 · 0b1a1f4
1 parent 019ab0f
commit 0b1a1f4
Show file tree

Hide file tree

Showing 4 changed files with 1,165 additions and 675 deletions.
diff --git a/client/app/scripts/utils/feature-utils.js b/client/app/scripts/utils/feature-utils.js
@@ -14,7 +14,12 @@ const getKey = key => `${STORAGE_KEY_PREFIX}${key}`;
  * @return {Boolean}         True if feature is enabled
  */
 export function featureIsEnabled(feature) {
-  return storageGet(getKey(feature));
+  let enabled = storageGet(getKey(feature));
+  if (typeof enabled === 'string') {
+    // Convert back to boolean if stored as a string.
+    enabled = JSON.parse(enabled);
+  }
+  return enabled;
 }
 
 /**

diff --git a/client/package.json b/client/package.json
@@ -58,7 +58,7 @@
     "@fortawesome/fontawesome-free": "^5.5.0",
     "autoprefixer": "7.1.5",
     "babel-eslint": "8.2.1",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "24.5.0",
     "babel-loader": "^8.0.0",
     "babel-plugin-transform-class-properties": "6.24.1",
     "babel-plugin-transform-object-rest-spread": "6.26.0",
@@ -75,8 +75,8 @@
     "html-webpack-plugin": "3.2.0",
     "http-proxy": "1.16.2",
     "http-proxy-rules": "1.1.1",
-    "jest": "21.2.1",
-    "jest-cli": "21.2.1",
+    "jest": "24.5.0",
+    "jest-cli": "24.5.0",
     "json-loader": "0.5.7",
     "mockdate": "2.0.2",
     "node-sass": "^4.6.0",

diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
@@ -53,12 +53,6 @@ module.exports = {
     new webpack.DefinePlugin(GLOBALS),
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
     new webpack.IgnorePlugin(/.*\.map$/, /xterm\/lib\/addons/),
-    // new webpack.optimize.UglifyJsPlugin({
-    //   sourceMap: false,
-    //   compress: {
-    //     warnings: false
-    //   }
-    // }),
     new HtmlWebpackPlugin({
       chunks: ['vendors', 'terminal-app'],
       filename: 'terminal.html',