Merge pull request #7353 from RocketChat/require-css-plugins

[FIX] Use regular require() for postcss plugins
RocketChat · Jun 29, 2017 · 8912879 · 8912879
2 parents cc782cc + 9afe9d1
commit 8912879
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/app.json b/app.json
@@ -6,7 +6,6 @@
   "keywords": ["meteor", "social", "community", "chat"],
   "website": "https://rocket.chat",
   "env": {
-    "NODE_ENV": "production",
     "BUILDPACK_URL": "https://github.com/RocketChat/meteor-buildpack-horse.git",
     "HEROKU_APP_NAME": {
       "description": "Please re-enter your App Name from the top.",

diff --git a/packages/rocketchat-postcss/plugin/minify-css.js b/packages/rocketchat-postcss/plugin/minify-css.js
@@ -17,7 +17,7 @@ const getPostCSSPlugins = () => {
 	const plugins = [];
 	if (postCSSConfig.plugins) {
 		Object.keys(postCSSConfig.plugins).forEach((pluginName) => {
-			const postCSSPlugin = Npm.require(pluginName);
+			const postCSSPlugin = require(pluginName);
 			if (postCSSPlugin && postCSSPlugin.name === 'creator' && postCSSPlugin().postcssPlugin) {
 				plugins.push(postCSSPlugin(postCSSConfig.plugins ? postCSSConfig.plugins[pluginName] : {}));
 			}
@@ -27,14 +27,6 @@ const getPostCSSPlugins = () => {
 	return plugins;
 };
 
-const getPostCSSParser = () => {
-	if (postCSSConfig.parser) {
-		return Npm.require(postCSSConfig.parser);
-	}
-
-	return false;
-};
-
 const getExcludedPackages = () => {
 	if (postCSSConfig.excludedPackages && postCSSConfig.excludedPackages instanceof Array) {
 		return postCSSConfig.excludedPackages;
@@ -72,8 +64,7 @@ const mergeCss = css => {
 
 		postCSS(isFileForPostCSS ? getPostCSSPlugins() : [])
 			.process(file.getContentsAsString(), {
-				from: process.cwd() + file._source.url.replace('_', '-'),
-				parser: getPostCSSParser()
+				from: process.cwd() + file._source.url.replace('_', '-')
 			})
 			.then(result => {
 				result.warnings().forEach(warn => {