Multi Output (#252)

Author: jescalan

lib/plugin.js

@@ -82,10 +82,23 @@ module.exports = class SpikeWebpackPlugin {
           outputPath = outputPath.replace(/(.*)?(\..+?$)/, `$1.${f.extension}`)
         }
 
-        // and hand off the file to webpack for emission!
-        compilation.assets[outputPath] = {
-          source: () => { return src },
-          size: () => { return src.length }
+        if (dep._outputMultiple) {
+          // if we have an outputMultiple flag, that means more than one
+          // output (shocking, i know)
+          const sources = JSON.parse(src)
+          for (let k in sources) {
+            const multiOutPath = outputPath.replace(/\.html/, `.${k}.html`)
+            compilation.assets[multiOutPath] = {
+              source: () => { return sources[k] },
+              size: () => { return sources[k].length }
+            }
+          }
+        } else {
+          // otherwise, send off the single file to webpack for emission
+          compilation.assets[outputPath] = {
+            source: () => { return src },
+            size: () => { return src.length }
+          }
         }
       })
 

package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "babel-core": "^6.25.0",
     "babel-loader": "^7.1.1",
-    "browser-sync": "^2.18.12",
+    "browser-sync": "^2.18.13",
     "browser-sync-webpack-plugin": "^1.2.0",
     "filewrap": "^1.0.0",
     "glob": "^7.1.2",
@@ -23,9 +23,9 @@
     "micromatch": "^3.0.4",
     "mkdirp": "^0.5.1",
     "postcss-loader": "^2.0.6",
-    "reshape-loader": "^1.0.0",
+    "reshape-loader": "^1.1.0",
     "rimraf": "^2.6.1",
-    "source-loader": "^0.2.0",
+    "source-loader": "^1.0.0",
     "spike-util": "^1.3.0",
     "sprout": "^1.2.1",
     "webpack": "^3.3.0",
@@ -41,6 +41,7 @@
     "postcss-color-gray": "^4.0.0",
     "postcss-import": "^10.0.0",
     "reshape-custom-elements": "^0.1.0",
+    "reshape-expressions": "^0.1.5",
     "snazzy": "^7.0.0",
     "standard": "^10.0.2",
     "sugarml": "^0.6.0",

test/fixtures/multi/index.html

@@ -0,0 +1 @@
+<p>{{ greeting }}</p>

test/multi.js

@@ -0,0 +1,22 @@
+const test = require('ava')
+const path = require('path')
+const fs = require('fs')
+const exp = require('reshape-expressions')
+const {compileFixture} = require('./_helpers')
+
+test('emits compile errors correctly', (t) => {
+  return compileFixture(t, 'multi', {
+    reshape: {
+      plugins: [exp()],
+      multi: [
+        { locals: { greeting: 'hello' }, name: 'en' },
+        { locals: { greeting: 'hola' }, name: 'es' }
+      ]
+    }
+  }).then(({res, publicPath}) => {
+    const src1 = fs.readFileSync(path.join(publicPath, 'index.en.html'), 'utf8')
+    const src2 = fs.readFileSync(path.join(publicPath, 'index.es.html'), 'utf8')
+    t.is(src1.trim(), '<p>hello</p>')
+    t.is(src2.trim(), '<p>hola</p>')
+  })
+})

yarn.lock

@@ -872,9 +872,9 @@ browser-sync-webpack-plugin@^1.2.0:
   dependencies:
     lodash "^4"
 
-browser-sync@^2.18.12:
-  version "2.18.12"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.18.12.tgz#bbaa0a17a961e2b5f0a8e760e695027186664779"
+browser-sync@^2.18.13:
+  version "2.18.13"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.18.13.tgz#c28dc3eb3be67c97a907082b772a37f915c14d7d"
   dependencies:
     browser-sync-client "2.5.1"
     browser-sync-ui "0.6.3"
@@ -888,7 +888,7 @@ browser-sync@^2.18.12:
     fs-extra "3.0.1"
     http-proxy "1.15.2"
     immutable "3.8.1"
-    localtunnel "1.8.2"
+    localtunnel "1.8.3"
     micromatch "2.3.11"
     opn "4.0.2"
     portscanner "2.1.1"
@@ -1545,7 +1545,7 @@ debug@2.6.4:
   dependencies:
     ms "0.7.3"
 
-debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.3, debug@^2.6.8:
+debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.3, debug@^2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
@@ -2839,12 +2839,18 @@ is-arrayish@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.1.tgz#c2dfc386abaa0c3e33c48db3fe87059e69065efd"
 
-is-binary-path@^1.0.0, is-binary-path@^1.0.1:
+is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
   dependencies:
     binary-extensions "^1.0.0"
 
+is-binary-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.0.0.tgz#0e61cea6974b24dda8bcc8366ce58a69265d1a36"
+  dependencies:
+    binary-extensions "^1.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
@@ -3353,13 +3359,13 @@ loader-utils@^1.0.2, loader-utils@^1.1.0:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-localtunnel@1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-1.8.2.tgz#913051e8328b51f75ad8a22ad1f5c5b8c599a359"
+localtunnel@1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-1.8.3.tgz#dcc5922fd85651037d4bde24fd93248d0b24eb05"
   dependencies:
-    debug "2.2.0"
-    openurl "1.1.0"
-    request "2.78.0"
+    debug "2.6.8"
+    openurl "1.1.1"
+    request "2.81.0"
     yargs "3.29.0"
 
 locate-path@^2.0.0:
@@ -3752,10 +3758,6 @@ node-pre-gyp@^0.6.36:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-node-uuid@~1.4.7:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-
 nopt@3.0.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -3937,9 +3939,9 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-openurl@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.0.tgz#e2f2189d999c04823201f083f0f1a7cd8903187a"
+openurl@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387"
 
 opn@4.0.2:
   version "4.0.2"
@@ -4605,31 +4607,6 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2.78.0:
-  version "2.78.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.78.0.tgz#e1c8dec346e1c81923b24acdb337f11decabe9cc"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    node-uuid "~1.4.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-
 request@2.79.0:
   version "2.79.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
@@ -4655,7 +4632,7 @@ request@2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
-request@^2.81.0:
+request@2.81.0, request@^2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
@@ -4722,15 +4699,19 @@ reshape-custom-elements@^0.1.0:
   dependencies:
     reshape-plugin-util reshape/plugin-util
 
+reshape-expressions@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/reshape-expressions/-/reshape-expressions-0.1.5.tgz#28c12bf35de40263362499cead0b044321e4a78c"
+
 reshape-include@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/reshape-include/-/reshape-include-1.0.0.tgz#2f75e57e016447c633f48cbb0e2a5ca114275d10"
   dependencies:
     reshape-plugin-util "^0.2.0"
 
-reshape-loader@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/reshape-loader/-/reshape-loader-1.0.0.tgz#c5bf46ad99715b216f87a1b772c4bc2695121cd6"
+reshape-loader@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/reshape-loader/-/reshape-loader-1.1.0.tgz#96d88f7983a4cf6f040e601a7283402cbe3778c9"
   dependencies:
     reshape "^0.4.1"
     reshape-include "^1.0.0"
@@ -5076,11 +5057,11 @@ source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
-source-loader@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/source-loader/-/source-loader-0.2.0.tgz#b362d65885d540f069ceecd5ad4fbb67572ab87b"
+source-loader@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/source-loader/-/source-loader-1.0.0.tgz#dbe890d46c8429fa7ac358c7e648f7f03cbe8738"
   dependencies:
-    is-binary-path "^1.0.1"
+    is-binary-path "^2.0.0"
 
 source-map-resolve@^0.5.0:
   version "0.5.0"