Merge pull request #4 from rollup-umd/dev

kopax · web-flow · commit 98992c5ed439 · 2018-12-04T04:02:31.000+07:00
fix(createConfig): fixed default Wrapper and Layout path using __dirn…
diff --git a/src/createConfig.js b/src/createConfig.js
@@ -199,8 +199,8 @@ export function createConfig(config = {}, options = {}) {
   }
 
   // Local Layout and Wrapper in case no selection
-  const defaultStyleGuidePath = join(base, 'src/Layout');
-  const defaultWrapperPath = join(base, 'src/Wrapper');
+  const defaultStyleGuidePath = existsSync(join(__dirname, 'src/Layout')) ? join(__dirname, 'src/Layout') : join(__dirname, 'lib/Layout');
+  const defaultWrapperPath = existsSync(join(__dirname, 'src/Wrapper')) ? join(__dirname, 'src/Wrapper') : join(__dirname, 'lib/Wrapper');
 
   // External layout selection
   const {

Original file line number	Diff line number	Diff line change
`@@ -199,8 +199,8 @@ export function createConfig(config = {}, options = {}) {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`// Local Layout and Wrapper in case no selection`
`202`		`- const defaultStyleGuidePath = join(base, 'src/Layout');`
`203`		`- const defaultWrapperPath = join(base, 'src/Wrapper');`
	`202`	`+ const defaultStyleGuidePath = existsSync(join(__dirname, 'src/Layout')) ? join(__dirname, 'src/Layout') : join(__dirname, 'lib/Layout');`
	`203`	`+ const defaultWrapperPath = existsSync(join(__dirname, 'src/Wrapper')) ? join(__dirname, 'src/Wrapper') : join(__dirname, 'lib/Wrapper');`
`204`	`204`
`205`	`205`	`// External layout selection`
`206`	`206`	`const {`