No longer using __dirname in requires
I feel like I originally did this because older versions of node didn't like relative paths (unless maybe the cwd wasn't in NODE_PATH). Regardless, it works now, and this is cleaner. Further, I noticed that __dirname didn't seem to be working properly with browserify. While GNU ease.js does not make use of it (ease.js uses its own scripts), other projects may.newmaster
parent
a537721ea1
commit
8391bc007d
|
@ -24,8 +24,8 @@
|
|||
* the existing class tests in tact for a higher-level test.
|
||||
*/
|
||||
|
||||
var util = require( __dirname + '/util' ),
|
||||
warn = require( __dirname + '/warn' ),
|
||||
var util = require( './util' ),
|
||||
warn = require( './warn' ),
|
||||
Warning = warn.Warning,
|
||||
|
||||
hasOwn = Object.prototype.hasOwnProperty,
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
/**
|
||||
* Supertype
|
||||
*/
|
||||
var MemberBuilder = require( __dirname + '/MemberBuilder' );
|
||||
var MemberBuilder = require( './MemberBuilder' );
|
||||
|
||||
/**
|
||||
* Responsible for building class members
|
||||
|
|
|
@ -41,7 +41,7 @@ module.exports = exports = function FallbackVisibilityObjectFactory()
|
|||
/**
|
||||
* "Inherit" from VisibilityObjectFactory
|
||||
*/
|
||||
exports.prototype = require( __dirname + '/VisibilityObjectFactory' )();
|
||||
exports.prototype = require( './VisibilityObjectFactory' )();
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
* keywords ]. Decide on a common format.
|
||||
*/
|
||||
|
||||
var util = require( __dirname + '/util' ),
|
||||
Warning = require( __dirname + '/warn' ).Warning,
|
||||
var util = require( './util' ),
|
||||
Warning = require( './warn' ).Warning,
|
||||
visibility = [ 'public', 'protected', 'private' ]
|
||||
;
|
||||
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
var AbstractClass = require( __dirname + '/class_abstract' ),
|
||||
ClassBuilder = require( __dirname + '/ClassBuilder' );
|
||||
var AbstractClass = require( './class_abstract' ),
|
||||
ClassBuilder = require( './ClassBuilder' );
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
/**
|
||||
* XXX: tightly coupled
|
||||
*/
|
||||
var util = require( __dirname + '/util' );
|
||||
var util = require( './util' );
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -23,12 +23,12 @@
|
|||
*/
|
||||
|
||||
// XXX: Tightly coupled
|
||||
var util = require( __dirname + '/util' ),
|
||||
var util = require( './util' ),
|
||||
|
||||
VisibilityObjectFactory = require( __dirname + '/VisibilityObjectFactory' ),
|
||||
VisibilityObjectFactory = require( './VisibilityObjectFactory' ),
|
||||
|
||||
FallbackVisibilityObjectFactory =
|
||||
require( __dirname + '/FallbackVisibilityObjectFactory' )
|
||||
require( './FallbackVisibilityObjectFactory' )
|
||||
;
|
||||
|
||||
|
||||
|
|
16
lib/class.js
16
lib/class.js
|
@ -19,28 +19,28 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
var util = require( __dirname + '/util' ),
|
||||
ClassBuilder = require( __dirname + '/ClassBuilder' ),
|
||||
var util = require( './util' ),
|
||||
ClassBuilder = require( './ClassBuilder' ),
|
||||
|
||||
warn = require( __dirname + '/warn' ),
|
||||
warn = require( './warn' ),
|
||||
Warning = warn.Warning,
|
||||
|
||||
MethodWrapperFactory = require( __dirname + '/MethodWrapperFactory' ),
|
||||
wrappers = require( __dirname + '/MethodWrappers' ).standard,
|
||||
MethodWrapperFactory = require( './MethodWrapperFactory' ),
|
||||
wrappers = require( './MethodWrappers' ).standard,
|
||||
|
||||
class_builder = ClassBuilder(
|
||||
require( __dirname + '/MemberBuilder' )(
|
||||
require( './MemberBuilder' )(
|
||||
MethodWrapperFactory( wrappers.wrapNew ),
|
||||
MethodWrapperFactory( wrappers.wrapOverride ),
|
||||
MethodWrapperFactory( wrappers.wrapProxy ),
|
||||
require( __dirname + '/MemberBuilderValidator' )(
|
||||
require( './MemberBuilderValidator' )(
|
||||
function( warning )
|
||||
{
|
||||
warn.handle( Warning( warning ) );
|
||||
}
|
||||
)
|
||||
),
|
||||
require( __dirname + '/VisibilityObjectFactoryFactory' )
|
||||
require( './VisibilityObjectFactoryFactory' )
|
||||
.fromEnvironment()
|
||||
)
|
||||
;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
var Class = require( __dirname + '/class' );
|
||||
var Class = require( './class' );
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
var Class = require( __dirname + '/class' );
|
||||
var Class = require( './class' );
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -19,19 +19,19 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
var util = require( __dirname + '/util' ),
|
||||
var util = require( './util' ),
|
||||
|
||||
MethodWrapperFactory = require( __dirname + '/MethodWrapperFactory' ),
|
||||
wrappers = require( __dirname + '/MethodWrappers' ).standard,
|
||||
MethodWrapperFactory = require( './MethodWrapperFactory' ),
|
||||
wrappers = require( './MethodWrappers' ).standard,
|
||||
|
||||
member_builder = require( __dirname + '/MemberBuilder' )(
|
||||
member_builder = require( './MemberBuilder' )(
|
||||
MethodWrapperFactory( wrappers.wrapNew ),
|
||||
MethodWrapperFactory( wrappers.wrapOverride ),
|
||||
MethodWrapperFactory( wrappers.wrapProxy ),
|
||||
require( __dirname + '/MemberBuilderValidator' )()
|
||||
require( './MemberBuilderValidator' )()
|
||||
),
|
||||
|
||||
Class = require( __dirname + '/class' )
|
||||
Class = require( './class' )
|
||||
;
|
||||
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
var propParseKeywords = require( __dirname + '/prop_parser' ).parseKeywords;
|
||||
var propParseKeywords = require( './prop_parser' ).parseKeywords;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -33,7 +33,7 @@ RMTRAIL="$PATH_TOOLS/rmtrail"
|
|||
cat_modules=$(
|
||||
cd "$PATH_TOOLS/../" &&
|
||||
grep -rIo ' require(.*)' lib/ \
|
||||
| sed "s/^lib\///;s/\.js://;s/require(.*'\/\(.*\)'.*/\1/" \
|
||||
| sed "s/^lib\///;s/\.js://;s/require( *'\.\/\(.*\)'.*/\1/" \
|
||||
| node tools/combine-order.js
|
||||
) || {
|
||||
echo "Failed to get module list" >&2
|
||||
|
|
Loading…
Reference in New Issue