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.

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

Set cwd to the location of the closest package.json #282

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions index.js
@@ -1,5 +1,6 @@
"use strict";

var findup = require("findup");
var stream = require("stream");
var util = require("util");
var path = require("path");
Expand Down Expand Up @@ -49,7 +50,7 @@ function buildTransform(opts) {
}

function normalizeOptions(preconfiguredOpts, transformOpts, filename) {
const basedir = normalizeTransformBasedir(transformOpts);
const basedir = normalizeTransformBasedir(filename);
const opts = normalizeTransformOpts(transformOpts);

// Transform options override preconfigured options unless they are undefined.
Expand Down Expand Up @@ -95,8 +96,18 @@ function normalizeOptions(preconfiguredOpts, transformOpts, filename) {
return opts;
}

function normalizeTransformBasedir(opts) {
return path.resolve(opts._flags && opts._flags.basedir || ".");
var findConfigCache = {};

function normalizeTransformBasedir(filename) {
var dirname = path.dirname(filename);

try {
return findConfigCache[dirname] || (
findConfigCache[dirname] = findup.sync(dirname, "package.json")
);
} catch (e) {
return dirname;
}
}

function normalizeTransformOpts(opts) {
Expand Down
21 changes: 20 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Expand Up @@ -33,5 +33,8 @@
},
"scripts": {
"test": "tap test/*.js"
},
"dependencies": {
"findup": "^0.1.5"
}
}
4 changes: 3 additions & 1 deletion test/browserify-package.js
Expand Up @@ -4,9 +4,10 @@ var test = require('tap').test;
var vm = require('vm');

test('browserify package', function (t) {
t.plan(3);
t.plan(4);

process.env.NODE_ENV = 'development';
process.env.LOCAL_ENV_HIJACK = 'production';

var b = browserify();
b.require(path.join(__dirname, 'pkg-app/index.js'), {expose: 'pkgApp'});
Expand All @@ -20,6 +21,7 @@ test('browserify package', function (t) {
c.require('pkgApp')({
createClass: function(obj) {
t.equal(obj.envLength(), process.env.NODE_ENV.length);
t.equal(obj.localEnvHijack(), process.env.LOCAL_ENV_HIJACK.toUpperCase());
t.equal(obj.displayName, 'TestComponent')
}
});
Expand Down
3 changes: 3 additions & 0 deletions test/pkg-app/node_modules/app/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions test/pkg-app/node_modules/app/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.