diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 8ff9dfcdbdc..85b1914d141 100644
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -14,6 +14,7 @@
     "prebuild": "npm run build:clean",
     "build": "rollup -c",
     "build:clean": "rimraf admin/dist",
+    "build:watch": "rollup -c -v",
     "start": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/cross-env NODE_ENV=development PLUGIN=true node ./node_modules/strapi-helper-plugin/lib/server",
     "generate": "node ./node_modules/strapi-helper-plugin/node_modules/plop --plopfile ./node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
     "prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
@@ -95,4 +96,4 @@
     "npm": ">= 6.0.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index 52c43e9cfb6..b919c2b5643 100644
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -14,6 +14,7 @@
     "prebuild": "npm run build:clean",
     "build": "rollup -c",
     "build:clean": "rimraf admin/dist",
+    "build:watch": "rollup -c -v",
     "start": "cross-env NODE_ENV=development ./node_modules/strapi-helper-plugin/lib/server",
     "generate": "node ./node_modules/strapi-helper-plugin/node_modules/plop --plopfile ./node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
     "prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
@@ -94,4 +95,4 @@
     "npm": ">= 6.0.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-documentation/package.json b/packages/strapi-plugin-documentation/package.json
index 467e2080e83..be8511459f1 100755
--- a/packages/strapi-plugin-documentation/package.json
+++ b/packages/strapi-plugin-documentation/package.json
@@ -13,6 +13,7 @@
     "analyze": "node ./node_modules/strapi-helper-plugin/lib/internals/scripts/analyze.js",
     "prebuild": "npm run build:clean",
     "build": "rollup -c",
+    "build:watch": "rollup -c -v",
     "build:clean": "rimraf admin/dist",
     "lint": "node ./node_modules/strapi-lint/node_modules/.bin/eslint --ignore-path .gitignore --ignore-pattern '/admin/build/' --config ./node_modules/strapi-lint/lib/internals/eslint/.eslintrc.json admin",
     "prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
@@ -112,4 +113,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json
index 940c518ee44..092be56fdd2 100644
--- a/packages/strapi-plugin-email/package.json
+++ b/packages/strapi-plugin-email/package.json
@@ -13,6 +13,7 @@
     "analyze": "node ./node_modules/strapi-helper-plugin/lib/internals/scripts/analyze.js",
     "prebuild": "npm run build:clean",
     "build": "rollup -c",
+    "build:watch": "rollup -c -w",
     "build:clean": "rimraf admin/dist",
     "start": "cross-env NODE_ENV=development ./node_modules/strapi-helper-plugin/lib/server",
     "generate": "node ./node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
@@ -88,4 +89,4 @@
     "npm": ">= 6.0.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js b/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js
index ef41b7d4dbe..0494e807016 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js
@@ -72,12 +72,6 @@ import saga from './sagas';
 import styles from './styles.scss';
 import config from './config.json';
 
-// export class HomePage extends React.Component {
-//   render() {
-//     return null;
-//   }
-// }
-
 /* eslint-disable react/require-default-props  */
 export class HomePage extends React.Component {
   // eslint-disable-line react/prefer-stateless-function
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index db738851295..95f1e163bb9 100644
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -13,6 +13,7 @@
     "analyze": "node ./node_modules/strapi-helper-plugin/lib/internals/scripts/analyze.js",
     "prebuild": "npm run build:clean",
     "build": "rollup -c",
+    "build:watch": "rollup -c -w",
     "build:clean": "rimraf admin/build",
     "start": "cross-env NODE_ENV=development ./node_modules/strapi-helper-plugin/lib/server",
     "generate": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/plop --plopfile ./node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
@@ -91,4 +92,4 @@
     "npm": ">= 6.0.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json
index 0aa85309fd4..57634758e75 100644
--- a/packages/strapi-plugin-upload/package.json
+++ b/packages/strapi-plugin-upload/package.json
@@ -12,10 +12,9 @@
     "preanalyze": "npm run analyze:clean",
     "analyze": "node ./node_modules/strapi-helper-plugin/lib/internals/scripts/analyze.js",
     "prebuild": "npm run build:clean",
-    "build:dev": "cross-env NODE_ENV=development ./node_modules/strapi-helper-plugin/node_modules/.bin/webpack --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress",
     "build": "rollup -c",
     "build:clean": "rimraf admin/dist",
-    "start": "cross-env NODE_ENV=development ./node_modules/strapi-helper-plugin/lib/server",
+    "build:watch": "rollup -c -w",
     "generate": "node ./node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
     "prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
     "test": "echo \"no tests yet\"",
@@ -85,4 +84,4 @@
     "npm": ">= 6.0.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json
index f5e4ec01aed..01ef6d67607 100644
--- a/packages/strapi-plugin-users-permissions/package.json
+++ b/packages/strapi-plugin-users-permissions/package.json
@@ -12,11 +12,9 @@
     "preanalyze": "npm run analyze:clean",
     "analyze": "node ./node_modules/strapi-helper-plugin/lib/internals/scripts/analyze.js",
     "prebuild": "npm run build:clean",
-    "build:rollup": "rollup -c",
     "build": "rollup -c",
+    "build:watch": "rollup -c -w",
     "build:clean": "rimraf admin/dist",
-    "start": "cross-env NODE_ENV=development ./node_modules/strapi-helper-plugin/lib/server",
-    "generate": "node ./node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
     "prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
     "test": "echo \"no tests yet\"",
     "prepublishOnly": "IS_MONOREPO=true npm run build"
@@ -95,4 +93,4 @@
     "npm": ">= 6.0.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-users-permissions/rollup.config.js b/packages/strapi-plugin-users-permissions/rollup.config.js
index a24dfbf9507..93d63b42224 100644
--- a/packages/strapi-plugin-users-permissions/rollup.config.js
+++ b/packages/strapi-plugin-users-permissions/rollup.config.js
@@ -52,7 +52,7 @@ export default {
 
     svg(),
     require('rollup-plugin-sizes')(),
-    // terser(),
+    terser(),
   ],
 
   external: [