Fix 'Cannot find module' of meta.js when using local template

ktsn · ktsn · commit 241b6383edb3 · 2016-08-21T15:59:54.000+09:00
diff --git a/lib/options.js b/lib/options.js
@@ -40,7 +40,7 @@ function getMetadata (dir) {
   if (exists(json)) {
     opts = metadata.sync(json)
   } else if (exists(js)) {
-    var req = require(js)
+    var req = require(path.resolve(js))
     if (req !== Object(req)) {
       throw new Error('meta.js needs to expose an object')
     }
diff --git a/test/e2e/test.js b/test/e2e/test.js
@@ -13,6 +13,7 @@ const metadata = require('../../lib/options')
 
 const MOCK_TEMPLATE_REPO_PATH = './test/e2e/mock-template-repo'
 const MOCK_TEMPLATE_BUILD_PATH = path.resolve('./test/e2e/mock-template-build')
+const MOCK_METADATA_REPO_JS_PATH = './test/e2e/mock-metadata-repo-js'
 
 function monkeyPatchInquirer (answers) {
   // monkey patch inquirer
@@ -50,16 +51,15 @@ describe('vue-cli', () => {
   })
 
   it('read metadata from js', done => {
-    const meta = metadata('test-pkg', path.join(__dirname, '/mock-metadata-repo-js'))
+    const meta = metadata('test-pkg', MOCK_METADATA_REPO_JS_PATH)
     expect(meta).to.be.an('object')
     expect(meta.prompts).to.have.property('description')
     done()
   })
 
   it('helpers', done => {
     monkeyPatchInquirer(answers)
-    const buildPath = path.join(__dirname, '/mock-metadata-repo-js')
-    generate('test', buildPath, MOCK_TEMPLATE_BUILD_PATH, err => {
+    generate('test', MOCK_METADATA_REPO_JS_PATH, MOCK_TEMPLATE_BUILD_PATH, err => {
       if (err) done(err)
       const contents = fs.readFileSync(`${MOCK_TEMPLATE_BUILD_PATH}/readme.md`, 'utf-8')
       expect(contents).to.equal(answers.name.toUpperCase())

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function getMetadata (dir) {`
`40`	`40`	`if (exists(json)) {`
`41`	`41`	`opts = metadata.sync(json)`
`42`	`42`	`} else if (exists(js)) {`
`43`		`- var req = require(js)`
	`43`	`+ var req = require(path.resolve(js))`
`44`	`44`	`if (req !== Object(req)) {`
`45`	`45`	`throw new Error('meta.js needs to expose an object')`
`46`	`46`	`}`