resolve conflicts

steamerjs · Jul 10, 2016 · bc0efa3 · bc0efa3
2 parents 88b73cb + 826b07b
commit bc0efa3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/libs/SteamerInit.js b/libs/SteamerInit.js
@@ -11,7 +11,7 @@ const path = require('path'),
 
 function initSteamerConfig() {
 	// avoid overriding
-	let configSrcPath = "./node_modules/steamer/template/steamer.config.js",
+	let configSrcPath = path.resolve('../template/steamer.config.js'),
 		configDestPath = path.resolve('steamer.config.js');
 	if (fs.existsSync(configDestPath)) {
 		throw new Warning.FileExistErr("steamer.config.js");

diff --git a/libs/SteamerRepos.js b/libs/SteamerRepos.js
@@ -4,34 +4,44 @@
  */
 
 module.exports = {
-	'steamer-react': {
-		git: 'https://github.com/SteamerTeam/steamer-react.git',
-		config: {
+    'steamer-react': {
+        git: 'https://github.com/lcxfs1991/steamer-react.git -b react',
+        config: {
             src: "./react/",
             cmds: {
                 dev: "npm run dev", 
                 pub: "npm run pub",
             },
         },
-	},
-	'steamer-koa': {
-		git: 'https://github.com/SteamerTeam/steamer-koa.git',
-		config: {
+    },
+    'steamer-react-isomorphic': {
+        git: 'https://github.com/lcxfs1991/steamer-react.git -b react-isomorphic',
+        config: {
+            src: "./react/",
+            cmds: {
+                dev: "npm run dev", 
+                pub: "npm run pub",
+            },
+        },
+    },
+    'steamer-koa': {
+        git: 'https://github.com/lcxfs1991/steamer-koa.git',
+        config: {
             src: "./koa/",
             cmds: {
                 dev: "npm start", 
                 pub: "",
             },
         },
-	},
-	'steamer-gulp': {
-		git: 'https://github.com/SteamerTeam/steamer-gulp.git',
-		config: {
+    },
+    'steamer-gulp': {
+        git: 'https://github.com/lcxfs1991/steamer-gulp.git',
+        config: {
             src: "./normal/",
             cmds: {
                 dev: "npm run dev", 
                 pub: "npm run pub",
             },
         },
-	}
-};
+    }
+};