added e2e and fixed fixtures

Author: Alid Castano

.babelrc

@@ -3,10 +3,26 @@
     ["es2015", { "modules": false }],
     "stage-2"
   ],
-
   "plugins": [
     "transform-async-to-generator"
   ],
-
+  "env": {
+    "test": {
+      "presets": [
+        "es2015",
+        "stage-2"
+      ],
+      "plugins": [
+        "istanbul",
+        [
+          "transform-object-rest-spread",
+          {
+            "useBuiltIns": true
+          }
+        ]
+      ],
+      "sourceMaps": "inline"
+    }
+  },
   "comments": false
 }

index.js

@@ -0,0 +1,4 @@
+const nuxtentModule = require("./dist/module.js");
+
+module.exports = nuxtentModule.default;
+module.exports.meta = nuxtentModule.meta;

lib/module.js

@@ -1,22 +1,24 @@
+import { resolve, join } from 'path'
+
 import createRouter from './content/api'
 import buildContent from './content/build'
 import { mdParser, yamlParser } from './util/parsers'
 
-const { existsSync } = require('fs')
-const { resolve, join } = require('path')
+import pkg from '../package.json'
 
 const port = process.env.PORT || process.env.npm_package_config_nuxt_port || 3000
 const host = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
 
 const nuxtentConfig = (nuxtOpts) => {
 	const rootConfig = resolve(nuxtOpts.rootDir, 'nuxtent.config.js')
-	if (existsSync(rootConfig)) {
-		try {
-			return require(rootConfig)
-		} catch (err) {
-			throw new Error (`[Invalid Nuxtent configuration] ${err}`)
+	try {
+		return require(rootConfig)
+	} catch (err) {
+		if (err.code === "MODULE_NOT_FOUND") {
+			return nuxtOpts.nuxtent
 		}
-	} else return nuxtOpts.nuxtent
+		throw new Error (`[Invalid Nuxtent configuration] ${err}`)
+	}
 }
 
 const contentOptions = (content, defaults) => {
@@ -111,9 +113,9 @@ export default function ContentModule(moduleOpts) {
 		src: resolve(__dirname, 'plugin.js'),
 		options: {
 			...options,
-			srcDirFromPlugin: join('../', srcDir) // TODO
+			srcDirFromPlugin: join('~/', srcDir)
 		}
 	})
 }
 
-module.exports.meta = require('../package.json')
+export { pkg as meta };

lib/plugin.js

@@ -94,5 +94,5 @@ function toQuery (options = {}) {
 
   if (Array.isArray(exclude)) return 'exclude=' + exclude.join(',')
 
-  return `exclude=${exclude}`
+  return 'exclude=' + exclude
 }

package.json

@@ -2,7 +2,7 @@
   "name": "nuxtent",
   "version": "0.2.77",
   "description": "Content Module for Nuxt.js.",
-  "main": "dist/module.js",
+  "main": "index.js",
   "contributors": [
     "Alid Castano (@alidcastano)"
   ],
@@ -27,7 +27,7 @@
   },
   "scripts": {
     "unit": "cross-env NODE_ENV=development karma start test/unit/karma.conf.js",
-    "e2e": "cross-env NODE_ENV=test ava --verbose --serial tests/e2e",
+    "e2e": "cross-env NODE_ENV=test ava --verbose --serial test/e2e",
     "test": "npm run unit --single-run && npm run e2e",
     "build": "NODE_ENV=production rollup -c rollup.config.js",
     "watch": "npm run build -- -w",
@@ -50,12 +50,16 @@
   },
   "devDependencies": {
     "@nuxtjs/axios": "^3.0.1",
-    "ava": "^0.21.0",
+    "ava": "^0.22.0",
+    "babel-cli": "^6.26.0",
+    "babel-plugin-external-helpers": "^6.22.0",
+    "babel-plugin-istanbul": "^4.1.5",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.24.1",
-    "babel-preset-es2015-rollup": "^3.0.0",
     "babel-preset-stage-2": "^6.24.1",
+    "babel-register": "^6.26.0",
     "chai": "^4.1.0",
     "cross-env": "^5.0.1",
     "express": "^4.15.3",
@@ -65,9 +69,10 @@
     "karma-rollup-preprocessor": "^4.0.2",
     "karma-sinon-chai": "^1.3.1",
     "mocha": "^3.5.0",
-    "nuxt": "^1.0.0-alpha.4",
-    "rollup": "^0.43.0",
-    "rollup-plugin-babel": "^2.7.1",
+    "nuxt": "^1.0.0-rc11",
+    "request-promise-native": "^1.0.4",
+    "rollup": "^0.50.0",
+    "rollup-plugin-babel": "^3.0.2",
     "rollup-plugin-commonjs": "^8.0.2",
     "rollup-plugin-copy": "^0.2.3",
     "rollup-plugin-filesize": "^1.2.1",
@@ -79,6 +84,12 @@
     "sinon": "^3.0.0",
     "sinon-chai": "^2.12.0"
   },
+  "ava": {
+    "require": [
+      "babel-register"
+    ],
+    "babel": "inherit"
+  },
   "bugs": {
     "url": "https://github.com/nuxt-community/nuxtent-module/issues"
   },

rollup.config.js

@@ -1,4 +1,5 @@
 import resolve from 'rollup-plugin-node-resolve'
+import json from 'rollup-plugin-json'
 import builtins from 'rollup-plugin-node-builtins'
 import babel from 'rollup-plugin-babel'
 import commonjs from 'rollup-plugin-commonjs'
@@ -9,21 +10,29 @@ import copy from 'rollup-plugin-copy'
 const version = process.env.VERSION || require('./package.json').version
 
 const corePlugins = () => [
-  babel(),
   resolve(),
-  commonjs(),
+  commonjs({
+    include: 'node_modules/**'
+  }),
+  babel({
+    plugins: ['external-helpers']
+  }),
   builtins(),
   uglify(),
   filesize()
 ]
 
 const bundle = (name, options) => ({
-  entry: `lib/${name}.js`,
-  dest: `dist/${name}.js`,
-  format: 'umd',
-  moduleName: `nuxtContent`,
+  input: `lib/${name}.js`,
+  output: {
+    file: `dist/${name}.js`,
+    format: 'cjs',
+    exports: 'named'
+  },
+  name: `nuxtContent`,
   plugins: options.plugins || [],
   external: options.external || [],
+  globals: options.globals || {},
   banner: `
     /**
     * Nuxt Content v${version}
@@ -36,6 +45,7 @@ const bundle = (name, options) => ({
 export default [
   bundle('module', {
     plugins: [
+      json(),
       copy({
         'lib/plugin.js': 'dist/plugin.js',
         'lib/loader.js': 'dist/loader.js'
@@ -45,6 +55,9 @@ export default [
     external: [
       'express',
       'axios'
-    ]
+    ],
+    globals: {
+      express: 'express'
+    }
   })
 ]

test/e2e/complex.test.js

@@ -1,68 +1,64 @@
-const { Nuxt, Builder } = require('nuxt')
-const test = require('ava')
-const { resolve } = require('path')
+import { resolve } from 'path'
 
-const host = 'localhost'
-const port = 3000
-const url = (route) => `http://${host}:${port}/${route}`
+import test from 'ava'
 
-const basicConfig = require(resolve(__dirname, 'fixtures/nuxt.config.js'))({
-  content: [
-    ['posts', {
-      permalink: ":year/:slug",
-      routes: [
-        {
-          path: "/_post",
-          method: "get"
-        },
-        {
-          path: "/archives",
-          method: "getAll"
-        }
-      ]
-    }],
-    ['projects', {
-      permalink: "/:slug",
-      isPost: false,
-      routes: [
-        {
-          path: "/projects/_slug",
-          method: "get"
-        },
-        {
-          path: "/projects",
-          method: "getAll"
-        }
+import { get, commonBefore, commonAfter } from "../fixtures/nuxt";
+
+test.before('Init Nuxt and Nuxtent', async () => {
+  await commonBefore(
+    {
+      content: [
+        [
+          'posts',
+          {
+            page: '/posts/_slug',
+            permalink: '/:year/:slug',
+          }
+        ],
+        [
+          'projects',
+          {
+            page: '/projects/_slug',
+            permalink: "/projects/:slug",
+            isPost: false
+          }
+        ]
       ]
-    }]
-  ]
+    },
+    {
+      srcDir: resolve(__dirname, '../fixtures/multiple-content-types')
+    }
+  )()
 })
 
-let nuxt = null
-let server = null
-
-test.before('Init Nuxt and Nuxtent', async () => {
-  const config = Object.assign({}, {
-    rootDir: resolve(__dirname, 'fixtures'),
-    srcDir: resolve(__dirname, 'fixtures/multiple-content-types'),
-    dev: false
-  }, basicConfig)
-  nuxt = new Nuxt(config)
-  // await new Builder(nuxt).build()
-  await nuxt.listen(port, host)
+test('index', async t => {
+  const html = await get('/')
+  t.true(html.includes('<section class="home-container"><h1>Nuxtent</h1><a href="/2015/first-post">See my first post</a><a href="/archives">See all my posts</a><a href="/projects/ency">See my first project</a><a href="/projects">See all my projects</a></section>'))
 })
 
 test('posts content - get', async t => {
-  const { html } = await nuxt.renderRoute('2016/first-post')
+  const html = await get('/2016/first-post')
   t.true(html.includes('<h1>My First Post</h1><div><p>This is my first post!</p>'))
 })
 
-// test('content - getAll', async t => {
-//   const { html } = await nuxt.renderRoute('archives')
-//   t.true(html.includes('<li><a href="/2016/first-post">My First Post</a></li><li><a href="/2017/second-post">My Second Post</a></li>'
-//   ))
-// })
+test('posts content - getAll', async t => {
+  const html = await get('/archives')
+  t.true(html.includes('<section class="container"><h1>Posts</h1><ul><li><a href="/2016/first-post">My First Post</a></li></ul></section>'))
+})
+
+test('projects content - get', async t => {
+  const html = await get('/projects/ency')
+  t.true(html.includes(
+`<section class="container"><h1>Project: Ency.js</h1><div><p>Pretty cool plugin!</p>
+</div></section>`
+  ))
+})
+
+test('projects content - getAll', async t => {
+  const html = await get('/projects/')
+  t.true(html.includes('<section class="container"><h1>Projects</h1><ul><li><a href="/projects/projects/nuxtent">Nuxt Content</a></li><li><a href="/projects/projects/ency">Ency.js</a></li></ul></section>'))
+})
 
-test.after('Closing server', t => {
-  nuxt.close()
+test.after('Closing server and nuxt.js', async () => {
+  await commonAfter()
 })