Test with glslify

Author: rreusser

fixtures/glsl/index.js

@@ -1,3 +1,9 @@
-const fs = require('fs')
 const glsl = require('glslify')
-glsl(fs.readFileSync(__dirname + '/shader.glsl', 'utf8'))
+
+console.log(glsl`
+precision mediump float;
+#pragma glslify: ones = require(./ones)
+void main () {
+  gl_FragColor = ones();
+}
+`)

fixtures/glsl/ones.glsl

@@ -0,0 +1,4 @@
+vec4 ones () {
+  return vec4(1);
+}
+#pragma glslify: export(ones)

fixtures/glsl/output.js

@@ -0,0 +1,12 @@
+
+precision mediump float;
+#define GLSLIFY 1
+#define GLSLIFY 1
+vec4 ones () {
+  return vec4(1);
+}
+
+void main () {
+  gl_FragColor = ones();
+}
+,

fixtures/glsl/output.txt

@@ -1,6 +1,9 @@
 {
   "name": "fixture",
   "version": "1.0.0",
+  "scripts": {
+    "build": "../../node_modules/.bin/webpack webpack.config.js"
+  },
   "browserify": {
     "transform": [
       "brfs",

fixtures/glsl/package.json

@@ -1,6 +1,15 @@
+const path = require('path')
+
 module.exports = {
-  loaders: [
-    test: /\.(glsl|vert|v|frag|f)$/,
-    loader: 'ify-loader'
-  ]
+  entry: './index.js',
+  output: {
+    path: __dirname,
+    filename: 'bundle.js'
+  },
+  module: {
+    rules: [{
+      test: /\.js/,
+      use: path.join(__dirname, '..', '..')
+    }]
+  }
 }

fixtures/glsl/webpack.config.js

@@ -37,6 +37,7 @@ function loader (source) {
 
         const name = transform[0]
         const opts = transform[1] || {}
+        opts._flags = opts._flags || []
 
         if (typeof name === 'function') {
           return next(null, name(filename, opts))

index.js

@@ -20,6 +20,7 @@
   },
   "devDependencies": {
     "brfs": "^1.4.2",
+    "from2-string": "^1.1.0",
     "glslify": "^6.1.0",
     "npm-which": "^2.0.0",
     "regl": "^1.3.0",

package.json

@@ -5,6 +5,7 @@ const path = require('path')
 const fs = require('fs')
 const vm = require('vm')
 
+/*
 test('ify-loader', function (t) {
   const wpack = which.sync('webpack', { cwd: __dirname })
   const input = path.join(__dirname, 'fixtures', 'basic', 'index.js')
@@ -88,12 +89,14 @@ test('error handling', function (t) {
     t.equal(code, 2, 'exit code was 2')
   })
 })
+*/
 
 test('glsl-transform', function (t) {
   const wpack = which.sync('webpack', { cwd: __dirname })
   const input = path.join(__dirname, 'fixtures', 'glsl', 'index.js')
   const output = path.join(__dirname, 'fixtures', 'glsl', 'bundle.js')
-  const pkg = path.join(__dirname, 'fixtures', 'glsl', 'output.js')
+  const config = path.join(__dirname, 'fixtures', 'glsl', 'webpack.config.js')
+  const fixture = path.join(__dirname, 'fixtures', 'glsl', 'output.txt')
 
   t.plan(1)
 
@@ -103,9 +106,11 @@ test('glsl-transform', function (t) {
 
   spawn(wpack, [
     input,
-    output,
-    '--module-bind', 'js=' + __dirname
+    '--module-bind', 'js=' + __dirname,
+    '--config',
+    config
   ], {
+    cwd: path.join(__dirname, 'fixtures', 'glsl'),
     stdio: ['pipe', 'pipe', 2]
   }).once('exit', function () {
     const result = fs.readFileSync(output, { encoding: 'utf8' })
@@ -114,9 +119,9 @@ test('glsl-transform', function (t) {
 
     vm.runInNewContext(result, {
       console: {
-        log: function (src) {
-          const expected = fs.readFileSync(pkg, { encoding: 'utf8' })
-          t.equal(src, expected, 'processed brfs from package.json')
+        log: function (shader) {
+          const expected = fs.readFileSync(fixture, { encoding: 'utf8' })
+          t.equal(shader + '\n', expected, 'processed brfs from package.json')
         },
         error: console.error
       }