Introduced a simpler initialization syntax, deprecating the old

Author: agronkabashi

Diff for: CHANGELOG.md

@@ -1,3 +1,32 @@
+# Version 1.1.0
+* Simplified the syntax for initializing conditional. The older syntax is now deprecated.
+
+```
+// Before
+plugins: [
+  conditional({
+    condition: process.env.buildTarget === "PROD",
+    plugins: [
+      plugin1(),
+      plugin2(),
+      ...
+    ]
+  })
+]
+
+// After
+plugins: [
+  conditional(process.env.buildTarget === "PROD", [
+    plugin1(),
+    plugin2(),
+    ...
+  ])
+]
+```
+
+# Version 1.0.1
+* Minor hotpatch that updates the build files
+
 # Version 1.0.0
 * `plugin` property is replaced with `plugins` to simplify the setup where you need to run many plugins based on the same condition
 ```

Diff for: README.md

@@ -22,23 +22,17 @@ export default {
   ...
   plugins: [
     ...
-    conditional({
-      condition: isProduction,
-      plugins: [
-        licence(),
-        strip(),
-        uglify(),
-        gzip()
-      ]
-    })
-
-    conditional({
-      condition: !isProduction,
-      plugins: [
-        filesize(),
-        watch()
-      ]
-    })
+    conditional(isProduction, [
+      licence(),
+      strip(),
+      uglify(),
+      gzip()
+    ]),
+
+    conditional(!isProduction, [
+      filesize(),
+      watch()
+    ])
   ]
 })
 ```

Diff for: build/rollup-plugin-conditional.es.js

@@ -22,12 +22,24 @@ function getFirstExecutablePlugin(apiName, plugins, ...args) {
   return plugins.reduce((result, plugin) => result || plugin[apiName] && plugin[apiName](...args), undefined);
 }
 
-var index = (options = {}) => {
-  if (!options.condition || !Array.isArray(options.plugins) || options.plugins.length === 0) {
-    return {};
+var index = (arg1 = {}, arg2) => {
+  let condition = false;
+  let plugins = [];
+
+  if (Array.isArray(arg2)) {
+    condition = !!arg1;
+    plugins = arg2;
+  }
+  // Deprecated in 1.1.0
+  else if (typeof arg1 === "object") {
+    console.warn("This syntax is deprecated, please use conditional(condition, plugins) instead.");
+    condition = !!arg1.condition;
+    plugins = arg1.plugins;
   }
 
-  const { plugins } = options;
+  if (!condition || !Array.isArray(plugins) || plugins.length === 0) {
+    return {};
+  }
 
   const constructedApi = {};
 

Diff for: build/rollup-plugin-conditional.js

@@ -24,12 +24,24 @@ function getFirstExecutablePlugin(apiName, plugins, ...args) {
   return plugins.reduce((result, plugin) => result || plugin[apiName] && plugin[apiName](...args), undefined);
 }
 
-var index = (options = {}) => {
-  if (!options.condition || !Array.isArray(options.plugins) || options.plugins.length === 0) {
-    return {};
+var index = (arg1 = {}, arg2) => {
+  let condition = false;
+  let plugins = [];
+
+  if (Array.isArray(arg2)) {
+    condition = !!arg1;
+    plugins = arg2;
+  }
+  // Deprecated in 1.1.0
+  else if (typeof arg1 === "object") {
+    console.warn("This syntax is deprecated, please use conditional(condition, plugins) instead.");
+    condition = !!arg1.condition;
+    plugins = arg1.plugins;
   }
 
-  const { plugins } = options;
+  if (!condition || !Array.isArray(plugins) || plugins.length === 0) {
+    return {};
+  }
 
   const constructedApi = {};
 

Diff for: package.json

@@ -1,13 +1,14 @@
 {
   "name": "rollup-plugin-conditional",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "A proxy plugin for conditionally executing rollup plugins",
   "main": "build/rollup-plugin-conditional.js",
   "jsnext:main": "build/rollup-plugin-conditional.es.js",
   "homepage": "https://github.com/AgronKAbashi/rollup-plugin-conditional",
   "scripts": {
     "clean": "rm -rf build",
     "build": "rollup -c",
+    "publish": "npm run build && npm publish",
     "start": "npm run clean -s && npm run build -s",
     "test": "mocha --compilers js:babel-core/register"
   },

Diff for: src/index.js

@@ -5,12 +5,24 @@ function getFirstExecutablePlugin(apiName, plugins, ...args) {
   return plugins.reduce((result, plugin) => result || plugin[apiName] && plugin[apiName](...args), undefined);
 }
 
-export default (options = {}) => {
-  if (!options.condition || !Array.isArray(options.plugins) || options.plugins.length === 0) {
-    return {};
+export default (arg1 = {}, arg2) => {
+  let condition = false;
+  let plugins = [];
+
+  if (Array.isArray(arg2)) {
+    condition = !!arg1;
+    plugins = arg2;
+  }
+  // Deprecated in 1.1.0
+  else if (typeof arg1 === "object") {
+    console.warn("This syntax is deprecated, please use conditional(condition, plugins) instead.")
+    condition = !!arg1.condition
+    plugins = arg1.plugins
   }
 
-  const { plugins } = options;
+  if (!condition || !Array.isArray(plugins) || plugins.length === 0) {
+    return {};
+  }
 
   const constructedApi = {};
 

Diff for: test/index.js

@@ -8,14 +8,11 @@ describe("rollup-plugin-conditional", () => {
   let plugins;
   let spies;
 
-  const createRollup = (condition, config) => {
+  const createRollup = (condition, plugins) => {
     return rollup({
       entry: "./test/fixtures/sourcecode",
       plugins: [
-        conditional({
-          condition,
-          ...config
-        })
+        conditional(condition, plugins)
       ]
     });
   };
@@ -33,7 +30,7 @@ describe("rollup-plugin-conditional", () => {
     });
 
     it("should run all the plugins if condition evaluates to true", () => {
-      return createRollup(true, {plugins}).then(() => {
+      return createRollup(true, plugins).then(() => {
         assert(calculateSpyCallCount(spies) === plugins.length);
       });
     });
@@ -60,7 +57,7 @@ describe("rollup-plugin-conditional", () => {
     });
 
     it("should only execute the first plugin", () => {
-      return createRollup(true, {plugins}).then((args) => {
+      return createRollup(true, plugins).then((args) => {
         assert(args.modules[0].code === "var transform1variable = true;")
       });
     })