Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix imported files not causing watch mode updates #22

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix imported files not causing watch mode updates #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
62 changes: 60 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

const { dirname } = require('path');
const { createFilter } = require('rollup-pluginutils');
const { compile } = require('glslify');

function compressShader(code) {
// Based on https://github.com/vwochnik/rollup-plugin-glsl
Expand Down Expand Up @@ -58,7 +57,12 @@ module.exports = function glslify(userOptions = {}) {
options
);

code = compile(code, fileOptions);
const { source, deps } = iface().compile(code, fileOptions);
code = source;

for (const dep of deps.filter(dep => !dep.entry)) {
this.addWatchFile(dep.file);
}

if (typeof options.compress === 'function') {
code = options.compress(code);
Expand All @@ -73,3 +77,57 @@ module.exports = function glslify(userOptions = {}) {
}
};
};

// The following lines (except for where commented) are copied directly from
// https://github.com/glslify/glslify/blob/ba9c52c46e10068215290753e99ac516cc02d0d7/index.js

var glslifyBundle = require('glslify-bundle');
var glslifyDeps = require('glslify-deps/sync');
var nodeResolve = require('resolve');
var path = require('path');
var stackTrace = require('stack-trace');

function iface () {
try { var basedir = path.dirname(stackTrace.get()[2].getFileName()); }
catch (err) { basedir = process.cwd(); }
var posts = [];
return { compile }; // modified to only return the compile function

function compile(src, opts) {
if (!opts) opts = {};
var depper = gdeps(opts);
var deps = depper.inline(src, opts.basedir || basedir);
return { source: bundle(deps), deps }; // modified to return deps as well as the bundle
}
function gdeps (opts) {
if (!opts) opts = {};
var depper = glslifyDeps({ cwd: opts.basedir || basedir });
var transforms = opts.transform || [];
transforms = Array.isArray(transforms) ? transforms : [transforms];
transforms.forEach(function(transform) {
transform = Array.isArray(transform) ? transform : [transform];
var name = transform[0];
var opts = transform[1] || {};
if (opts.post) {
posts.push({ name, opts });
} else {
depper.transform(name, opts);
}
});
return depper;
}
function bundle (deps) {
var source = glslifyBundle(deps);
posts.forEach(function (tr) {
if (typeof tr.name === 'function') {
var transform = tr.name;
} else {
var target = nodeResolve.sync(tr.name, { basedir });
var transform = require(target); // eslint-disable-line no-redeclare
}
var src = transform((deps && deps[0] && deps[0].file) || null, source, { post: true });
if (src) source = src;
});
return source;
}
}
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
"test": "node ./test/index.js"
},
"dependencies": {
"glslify": "^7.1.1",
"rollup-pluginutils": "^2.8.2"
"glslify-bundle": "^5.1.1",
"glslify-deps": "^1.3.2",
"rollup-pluginutils": "^2.8.2",
"stack-trace": "0.0.9"
},
"devDependencies": {
"eslint": "^8.23.1",
Expand Down