Merge pull request #2816 from appirio-tech/dev

Production Release - Connect 2.4.9

Author: vikasrohit

.circleci/config.yml

@@ -34,8 +34,8 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - dist            
-            
+            - dist
+
   # Just tests commited code.
   deployDev:
     docker:
@@ -88,7 +88,7 @@ jobs:
       - attach_workspace:
           at: ./workspace
       - run: ./deploy.sh DISCOURSE
-   
+
 
 workflows:
   version: 2
@@ -100,7 +100,7 @@ workflows:
             - test
           filters:
             branches:
-              only: ['dev', 'dev-msinteg']
+              only: ['dev', 'dev-msinteg', 'feature/attachmentPermissions']
       - deployTest02:
           requires:
             - test

config/constants/dev.js

@@ -48,5 +48,4 @@ module.exports = {
   TC_SYSTEM_USERID: process.env.DEV_TC_SYSTEM_USERID,
   MAINTENANCE_MODE: process.env.DEV_MAINTENANCE_MODE,
 
-  RESET_PASSWORD_URL: 'https://accounts.topcoder-dev.com/connect/reset-password'
 }

config/constants/master.js

@@ -48,5 +48,4 @@ module.exports = {
   TC_SYSTEM_USERID: process.env.PROD_TC_SYSTEM_USERID,
   MAINTENANCE_MODE: process.env.PROD_MAINTENANCE_MODE,
 
-  RESET_PASSWORD_URL: 'https://accounts.topcoder.com/connect/reset-password'
 }

config/webpack/development.js

@@ -42,9 +42,12 @@ combinedConfig.plugins.splice(hotReloadPluginIndex, 1)
 /*
   Remove 'webpack-hot-middleware/client?reload=true' as we use webpack-dev-server, not middleware
  */
-combinedConfig.entry.main = combinedConfig.entry.main.filter((entry) => (
-  entry !== 'webpack-hot-middleware/client?reload=true'
-))
+// NOTE: looks like after some minor dependency version update, combined config doesn't keep `main` property anymore
+if (combinedConfig.entry.main) {
+  combinedConfig.entry.main = combinedConfig.entry.main.filter((entry) => (
+    entry !== 'webpack-hot-middleware/client?reload=true'
+  ))
+}
 
 /*
   Remove ExtractTextPlugin, because we want hot reload when editing styles

config/webpack/production.js

@@ -4,6 +4,7 @@
 const path = require('path')
 const webpackMerge = require('webpack-merge')
 const CompressionPlugin = require('compression-webpack-plugin')
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 
 const dirname = path.resolve(__dirname, '../..')
 
@@ -52,5 +53,10 @@ combinedConfig.plugins.push(
     minRatio: 0.8
   })
 )
+combinedConfig.plugins = combinedConfig.plugins.map((plugin) => {
+  // console.log(/UglifyJsPlugin/.test(plugin.constructor.toString()))
+  if (/UglifyJsPlugin/.test(plugin.constructor.toString())) return new UglifyJsPlugin()
+  return plugin
+})
 
 module.exports = combinedConfig