Updates for Nuxt v1.3.0 compatiblity

Removed support for Node v6

Remove rollup build

Added support for concurrent testing

Author: pimlie

.gitignore

@@ -9,11 +9,11 @@ package-lock.json
 npm-debug.log*
 
 # Other
-.nuxt
+.nuxt*
 .cache
 
 # Dist folder
-dist
+dist*
 
 # Dist example generation
 examples/**/dist
@@ -47,4 +47,4 @@ coverage
 .AppleDesktop
 Network Trash Folder
 Temporary Items
-.apdisk
+.apdisk

.travis.yml

@@ -1,14 +1,13 @@
 language: node_js
 node_js:
   - "8"
-  - "6"
+  - "9"
 cache:
   yarn: true
   directories:
     - node_modules
 install:
   - yarn install
-  - yarn run build
 script:
   - yarn run test
 after_success:

README.md

@@ -3,24 +3,20 @@
 <a href="https://codecov.io/gh/nuxt-community/nuxt-generate-cluster"><img src="https://img.shields.io/codecov/c/github/nuxt-community/nuxt-generate-cluster/master.svg" alt="Coverage Status"></a>
 [![npm](https://img.shields.io/npm/dt/nuxt-generate-cluster.svg?style=flat-square)](https://www.npmjs.com/package/nuxt-generate-cluster)
 [![npm (scoped with tag)](https://img.shields.io/npm/v/nuxt-generate-cluster/latest.svg?style=flat-square)](https://www.npmjs.com/package/nuxt-generate-cluster)
-<a href="https://github.com/nuxt/nuxt.js/"><img src="https://img.shields.io/badge/nuxt.js-next-800080.svg?style=flat-square" alt=""/></a>
+<a href="https://github.com/nuxt/nuxt.js/"><img src="https://img.shields.io/badge/nuxt.js-v1.3.0-800080.svg?style=flat-square" alt=""/></a>
 
 > Use multiple workers to generate the static files for your Nuxt.js project
 
-### :fire: Please use the `@next` version of this package and nuxt until a new nuxt version is released
-
 ## Setup
 
 Install the package with npm
 ```
- npm install --save nuxt-generate-cluster@1.0.0-rc11
+ npm install --save nuxt-generate-cluster
 ```
 or use yarn
 ```
-yarn add nuxt-generate-cluster@1.0.0-rc11`
+yarn add nuxt-generate-cluster`
 ```
-> The version of this package is in sync with Nuxt's version, use the correct version as your dependency to make sure the generate command supports the latest Nuxt.js features.
-
 Optionally add a generate script to your `package.json`
 ```js
   "scripts": {

bin/nuxt-generate

@@ -100,7 +100,7 @@ if (cluster.isMaster) {
     lastFinished: 0
   })
 
-  const { Master } = require('../')
+  const { Master } = require('..')
   const { join } = require('path')
 
   storeTime('lastStarted')
@@ -135,7 +135,7 @@ if (cluster.isMaster) {
   params = Object.assign({}, params || {}, store.data || {})
   master.run({ build, params })
 } else {
-  const { Worker } = require('../')
+  const { Worker } = require('..')
 
   const options = JSON.parse(process.env.options)
 

build/release-next.js

@@ -1,8 +1,8 @@
-import Master from './master'
-import Worker from './worker'
-import * as Mixins from './mixins'
+const Master = require('./master')
+const Worker = require('./worker')
+const Mixins = require('./mixins')
 
-export {
+module.exports = {
   Master,
   Worker,
   Mixins

build/rollup.config.js

@@ -1,12 +1,13 @@
-import { pull } from 'lodash'
-import { Master as GenerateMaster, Commands } from '../generate'
-import { Worker } from './'
-import { Messaging } from './mixins'
-import Debug from 'debug'
+const { pull } = require('lodash')
+const generate = require('../generate')
+const { Messaging } = require('./mixins')
+const Worker = require('./worker')
+const Debug = require('debug')
 
 const debug = Debug('nuxt:master')
+const { Commands } = generate
 
-export default class Master extends Messaging(GenerateMaster) {
+module.exports = class Master extends Messaging(generate.Master) {
   constructor(options, { workerCount, workerConcurrency, setup } = {}) {
     super(options, { workerCount, workerConcurrency })
 

index.js

@@ -1,5 +1,5 @@
-import Messaging from './messaging'
+const Messaging = require('./messaging')
 
-export {
+module.exports = {
   Messaging
 }

lib/async/index.js

@@ -1,9 +1,9 @@
-import { indexOf, values } from 'lodash'
-import { Commands } from '../../generate'
+const { indexOf, values } = require('lodash')
+const { Commands } = require('../../generate')
 
 let master = null
 
-export default (Base) => class extends Base {
+module.exports = (Base) => class extends Base {
   startListeningForMessages() {
     if (typeof this.__isListening === 'undefined') {
       this.__isListening = false

lib/async/master.js

@@ -1,11 +1,12 @@
-import { Messaging } from './mixins'
-import { Hookable } from '../mixins'
-import { Worker as GenerateWorker, Commands } from '../generate'
-import Debug from 'debug'
+const { Messaging } = require('./mixins')
+const { Hookable } = require('../mixins')
+const generate = require('../generate')
+const Debug = require('debug')
 
 const debug = Debug('nuxt:worker')
+const { Commands } = generate
 
-export default class Worker extends Hookable(Messaging(GenerateWorker)) {
+module.exports = class Worker extends Hookable(Messaging(generate.Worker)) {
   constructor(options, id) {
     super(options)
 
@@ -28,7 +29,7 @@ export default class Worker extends Hookable(Messaging(GenerateWorker)) {
 
   async generateRoutes(args) {
     const routes = args
-    debug(`Worker ${this.id} received ${routes.length} routes from master`)
+    debug(`Worker ${this.id} received ${routes.length} routes = require(master`)
 
     let errors
     try {

lib/async/mixins/index.js

@@ -1,8 +1,8 @@
-import Master from './master'
-import Worker from './worker'
-import * as Mixins from './mixins'
+const Master = require('./master')
+const Worker = require('./worker')
+const Mixins = require('./mixins')
 
-export {
+module.exports = {
   Master,
   Worker,
   Mixins

lib/async/mixins/messaging.js

@@ -1,11 +1,12 @@
-import cluster from 'cluster'
-import { Master as GenerateMaster, Commands } from '../generate'
-import { Messaging } from './mixins'
-import Debug from 'debug'
+const cluster = require('cluster')
+const generate = require('../generate')
+const { Messaging } = require('./mixins')
+const Debug = require('debug')
 
 const debug = Debug('nuxt:cluster-master')
+const { Commands } = generate
 
-export default class Master extends Messaging(GenerateMaster) {
+module.exports = class Master extends Messaging(generate.Master) {
   constructor(options, { workerCount, workerConcurrency, setup } = {}) {
     super(options, { workerCount, workerConcurrency })
 

lib/async/worker.js

@@ -1,5 +1,5 @@
-import Messaging from './messaging'
+const Messaging = require('./messaging')
 
-export {
+module.exports = {
   Messaging
 }

lib/cluster/index.js

@@ -1,8 +1,8 @@
-import { indexOf, values } from 'lodash'
-import cluster from 'cluster'
-import { Commands } from '../../generate'
+const { indexOf, values } = require('lodash')
+const cluster = require('cluster')
+const { Commands } = require('../../generate')
 
-export default (Base) => class extends Base {
+module.exports = (Base) => class extends Base {
   startListeningForMessages() {
     if (typeof this.__isListening === 'undefined') {
       this.__isListening = false
@@ -37,7 +37,7 @@ export default (Base) => class extends Base {
 
     const cmd = message.cmd
     if (!this.hasCommand(cmd)) {
-      console.error(`Received unknown command $cmd`) // eslint-disable-line no-console
+      console.error(`Received unknown command ${cmd}`) // eslint-disable-line no-console
     } else if (!this.hasHooks(cmd)) {
       console.error(`No handler registered for command ${cmd}`) // eslint-disable-line no-console
     } else {