Skip to content

Commit

Permalink
migrate transformRequire to NodeDepper
Browse files Browse the repository at this point in the history
  • Loading branch information
rubeniskov committed Nov 16, 2020
1 parent 00e0641 commit 79d2c89
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
3 changes: 0 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
var inherits = require('inherits')
var NodeDepper = require('./node')
var transformRequire = require('./transform-require')

/**
* Creates a new instance of glslify-deps. Generally, you'll
Expand All @@ -16,8 +15,6 @@ function DepperAsync(opts) {
if (!(this instanceof DepperAsync)) return new DepperAsync(opts)
opts = (typeof opts === 'string' ? { cwd: opts } : opts) || {}
opts.async = true
// keeps the initial behaviour of transform resolution
opts.transformRequire = opts.transformRequire || transformRequire.sync
NodeDepper.call(this, opts);
}

Expand Down
9 changes: 6 additions & 3 deletions node.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var map = require('map-limit')
var inherits = require('inherits')
var fs = require('graceful-fs')
var glslResolve = require('glsl-resolve')
var transformRequire = require('./transform-require')

var {
getImportName,
Expand All @@ -31,9 +32,11 @@ function createDefaultRead() {
*/
function NodeDepper(opts) {
if (!(this instanceof NodeDepper)) return new NodeDepper(opts)
opts = opts || {}
opts.resolve = mix(glslResolve.sync, glslResolve)
opts.readFile = createDefaultRead()
opts = (typeof opts === 'string' ? { cwd: opts } : opts) || {}
opts.resolve = opts.resolve || mix(glslResolve.sync, glslResolve)
// keeps the original behaviour of transform resolution
opts.transformRequire = opts.transformRequire || transformRequire.sync
opts.readFile = opts.readFile || createDefaultRead()
Depper.call(this, opts)
}

Expand Down
8 changes: 2 additions & 6 deletions sync.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
var inherits = require('inherits')
var NodeDepper = require('./node')
var transformRequire = require('./transform-require')

/**
* Creates a new instance of glslify-deps. Generally, you'll
* want to use one instance per bundle.
*
* @class
* @param {String|({
* cwd: String,
* transformRequire: Function
* })} opts The root directory of your shader. Defaults to process.cwd()
* cwd: String,
* })} opts The root directory of your shader. Defaults to process.cwd()
*/
function DepperSync(opts) {
if (!(this instanceof DepperSync)) return new DepperSync(opts)
opts = (typeof opts === 'string' ? { cwd: opts } : opts) || {}
opts.transformRequire = opts.transformRequire || transformRequire.sync
NodeDepper.call(this, opts)
}

Expand Down

0 comments on commit 79d2c89

Please sign in to comment.