Merge branch 'release/v0.6.0-beta.1'

TheNeuronProject · Dec 31, 2017 · 008b25e · 008b25e
2 parents ad88241 + a21da6a
commit 008b25e
Show file tree

Hide file tree

Showing 7 changed files with 2,044 additions and 888 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
@@ -12,27 +12,15 @@ import json from 'rollup-plugin-json'
 
 switch (process.env.BUILD_ENV) {
 	case 'DEV': {
-		console.log(chalk.cyan`
-+---------------+
-| DEVELOP BUILD |
-+---------------+
-`)
+		console.log(chalk.cyan('+--------------=+| DEVELOP 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 |+=--------------+'))
 	}
 }
 
@@ -64,7 +52,7 @@ export default {
 		commonjs(),
 		json(),
 		replace({
-			ENV: `'${process.env.BUILD_TARGET || 'development'}'`
+			'process.env.NODE_ENV': `'${process.env.BUILD_TARGET || 'development'}'`
 		}),
 		buble({
 			transforms: {

diff --git a/config/rollup.dev.js b/config/rollup.dev.js
@@ -12,4 +12,8 @@ base.watch = {
 	include: 'src/'
 }
 
+delete base.bundle
+delete base.devPath
+delete base.proPath
+
 export default base
diff --git a/config/rollup.prod.js b/config/rollup.prod.js
@@ -6,4 +6,8 @@ else base.output.file = `${base.proPath}/${base.bundle}.dev.js`
 
 base.output.sourcemap = process.env.BUILD_ENV === 'DEMO' || process.env.BUILD_ENV === 'CI' ? base.output.sourcemap : false
 
+delete base.bundle
+delete base.devPath
+delete base.proPath
+
 export default base