Merge branch 'release/v0.1.0-alpha.3'

TheNeuronProject · Jan 1, 2018 · 7068867 · 7068867
2 parents b57334e + 3909725
commit 7068867
Show file tree

Hide file tree

Showing 8 changed files with 2,354 additions and 1,365 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -5,7 +5,7 @@
         "es6": true
     },
     "globals": {
-        "ENV": true
+        "process": true
     },
     "extends": "eslint:recommended",
     "parserOptions": {
@@ -165,7 +165,7 @@
                 "allowForLoopAfterthoughts": true
             }
         ],
-        "no-process-env": "error",
+        "no-process-env": "off",
         "no-process-exit": "error",
         "no-proto": "error",
         "no-prototype-builtins": "error",

diff --git a/config/rollup.base.js b/config/rollup.base.js
@@ -40,27 +40,15 @@ const {
 console.log('Target:', chalk.bold.green(process.env.NODE_ENV || 'development'))
 switch (process.env.BUILD_ENV) {
 	case 'DEMO': {
-		console.log(chalk.cyan`
-+------------+
-| DEMO BUILD |
-+------------+
-`)
+		console.log(chalk.cyan('+----=+| DEMO BUILD |+=----+'))
 		break
 	}
 	case 'CI': {
-		console.log(chalk.green`
-+----------+
-| CI BUILD |
-+----------+
-`)
+		console.log(chalk.green('+----=+| CI BUILD |+=----+'))
 		break
 	}
 	default: {
-		console.log(chalk.yellow`
-+--------------+
-| NORMAL BUILD |
-+--------------+
-`)
+		console.log(chalk.yellow('+----=+| NORMAL BUILD |+=----+'))
 	}
 }
 
@@ -105,8 +93,7 @@ export default {
 			combineStyleTags
 		}),
 		replace({
-			ENV: `'${process.env.NODE_ENV || 'development'}'`,
-			'// DEMO_BUILD_UNCOMMENT ': process.env.BUILD_ENV === 'DEMO' ? '' : '// '
+			'process.env.NODE_ENV': `'${process.env.NODE_ENV || 'development'}'`
 		}),
 		buble({
 			transforms: {

diff --git a/config/rollup.dev.js b/config/rollup.dev.js
@@ -10,6 +10,7 @@ const {input, name, plugins, devPath, bundle} = base
 // Add browser-sync plugin
 plugins.push(browsersync(bsConfig))
 
+
 const config = {
 	input,
 	output: {
@@ -25,4 +26,11 @@ const config = {
 	}
 }
 
+// Load demo script
+if (process.env.BUILD_ENV === 'DEMO') config.input = 'src/demo/loader.js'
+
+delete base.bundle
+delete base.devPath
+delete base.proPath
+
 export default config
diff --git a/config/rollup.prod.js b/config/rollup.prod.js
@@ -18,4 +18,11 @@ const config = {
 	}
 }
 
+// Load demo script
+if (process.env.BUILD_ENV === 'DEMO') config.input = 'src/demo/loader.js'
+
+delete base.bundle
+delete base.devPath
+delete base.proPath
+
 export default config