update for spike 1.0+

Author: jescalan

README.md

@@ -22,18 +22,14 @@ This is a standard [webpack](https://webpack.github.io/) plugin, but is built fo
 ```js
 // app.js
 const Rooftop = require('spike-rooftop')
-const htmlStandards = require('spike-html-standards')
+const htmlStandards = require('reshape-standard')
 const locals = {}
 
 module.exports = {
   plugins: [
     new Rooftop({ addDataTo: locals, name: 'xxx', apiToken: 'xxx' })
   ],
-  reshape: (ctx) => {
-    return htmlStandards({
-      locals: { locals }
-    })
-  }
+  reshape: htmlStandards({ locals: () => locals })
 }
 ```
 
@@ -134,7 +130,7 @@ new Rooftop({
   apiToken: 'xxx',
   contentTypes: [{
     name: 'posts',
-    template: : {
+    template: {
       path: 'templates/post.html',
       output: (post) => { return `posts/${post.slug}.html` }
     }

lib/index.js

@@ -6,6 +6,7 @@ const path = require('path')
 const node = require('when/node')
 const reshape = require('reshape')
 const loader = require('reshape-loader')
+const SpikeUtil = require('spike-util')
 
 class Rooftop {
   constructor (opts) {
@@ -15,6 +16,7 @@ class Rooftop {
   }
 
   apply (compiler) {
+    this.util = new SpikeUtil(compiler.options)
     compiler.plugin('run', this.run.bind(this, compiler))
     compiler.plugin('watch-run', this.run.bind(this, compiler))
     compiler.plugin('emit', (compilation, done) => {
@@ -31,7 +33,7 @@ class Rooftop {
       })
 
       W.map(templateContent, (ct) => {
-        return writeTemplate(ct, compiler, compilation, this.addDataTo, done)
+        return writeTemplate.call(this, ct, compiler, compilation, this.addDataTo, done)
       }).done(() => done(), done)
     })
   }
@@ -155,7 +157,7 @@ function writeTemplate (ct, compiler, compilation, addDataTo, cb) {
         // webpack context is used by default in spike for plugins, so we need
         // to mock it so that plugins dont crash
         const fakeContext = { addDependency: (x) => x, resourcePath: filePath }
-        const options = loader.parseOptions.call(fakeContext, compiler.options.reshape)
+        const options = loader.parseOptions.call(fakeContext, this.util.getSpikeOptions().reshape)
 
         // W.map fires events as quickly as possible, so the locals will be
         // swapped for the last item unless bound to the result function

package.json

@@ -9,22 +9,23 @@
   },
   "bugs": "https://github.com/static-dev/spike-rooftop/issues",
   "dependencies": {
-    "joi": "^10.2.0",
+    "joi": "^10.6.0",
     "reshape": "^0.4.0",
-    "reshape-loader": "^0.4.0",
+    "reshape-loader": "^1.0.0",
     "rooftop-client": "^0.2.1",
-    "when": "^3.7.7"
+    "spike-util": "^1.2.0",
+    "when": "^3.7.8"
   },
   "devDependencies": {
-    "ava": "^0.19.0",
-    "coveralls": "^2.11.15",
+    "ava": "^0.20.0",
+    "coveralls": "^2.13.1",
     "dotenv": "^4.0.0",
-    "nyc": "^10.1.2",
-    "rimraf": "^2.5.2",
-    "snazzy": "^6.0.0",
-    "spike-core": "^0.13.3",
+    "nyc": "^11.0.3",
+    "rimraf": "^2.6.1",
+    "snazzy": "^7.0.0",
+    "spike-core": "^2.0.0",
     "spike-html-standards": "^0.3.4",
-    "standard": "^9.0.0"
+    "standard": "^10.0.2"
   },
   "engines": {
     "node": ">= 6.0.0"

test/fixtures/default/app.js

@@ -4,7 +4,7 @@ const locals = {}
 
 module.exports = {
   matchers: { html: '*(**/)*.sgr' },
-  reshape: (ctx) => htmlStandards({ webpack: ctx, locals }),
+  reshape: htmlStandards({ locals: () => locals }),
   plugins: [new Rooftop({
     url: process.env.url,
     apiToken: process.env.token,

test/fixtures/json/app.js

@@ -4,7 +4,7 @@ const locals = {}
 
 module.exports = {
   matchers: { html: '*(**/)*.sgr' },
-  reshape: (ctx) => htmlStandards({ webpack: ctx, locals }),
+  reshape: htmlStandards({ locals: () => locals }),
   plugins: [new Rooftop({
     url: process.env.url,
     apiToken: process.env.token,

test/index.js

@@ -194,7 +194,7 @@ test.cb('accepts template object and generates html', (t) => {
   const projectPath = path.join(__dirname, 'fixtures/default')
   const project = new Spike({
     root: projectPath,
-    reshape: (ctx) => htmlStandards({ webpack: ctx, locals }),
+    reshape: htmlStandards({ locals: () => locals }),
     entry: { main: [path.join(projectPath, 'main.js')] },
     plugins: [rooftop]
   })
@@ -231,7 +231,7 @@ test.cb('generates error if template has an error', (t) => {
   const projectPath = path.join(__dirname, 'fixtures/default')
   const project = new Spike({
     root: projectPath,
-    reshape: (ctx) => htmlStandards({ webpack: ctx, locals }),
+    reshape: htmlStandards({ locals: () => locals }),
     entry: { main: [path.join(projectPath, 'main.js')] },
     plugins: [rooftop]
   })