Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

fix(hooks): Do not set INIT_CWD on any hook #493

Merged
merged 1 commit into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions lib/before-cleanApp.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
const { cleanSnapshotArtefacts } = require("../snapshot/android/project-snapshot-generator");
const { isAndroid } = require("../projectHelpers");
const { setProcessInitDirectory } = require("./utils");

module.exports = function (hookArgs) {
if (isAndroid(hookArgs.platformInfo.platform)) {
const projectDir = hookArgs.platformInfo.projectData.projectDir;
setProcessInitDirectory(projectDir);
cleanSnapshotArtefacts(projectDir);
cleanSnapshotArtefacts(hookArgs.platformInfo.projectData.projectDir);
}
}
6 changes: 1 addition & 5 deletions lib/before-prepareJS.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const { runWebpackCompiler } = require("./compiler");
const { setProcessInitDirectory } = require("./utils");

module.exports = function ($logger, hookArgs) {
const env = hookArgs.config.env || {};
Expand All @@ -12,9 +11,6 @@ module.exports = function ($logger, hookArgs) {
release: appFilesUpdaterOptions.release,
};

const projectData = hookArgs.config.projectData;
setProcessInitDirectory(projectData.projectDir);

const result = config.bundle && runWebpackCompiler.bind(runWebpackCompiler, config, projectData, $logger, hookArgs);
const result = config.bundle && runWebpackCompiler.bind(runWebpackCompiler, config, hookArgs.config.projectData, $logger, hookArgs);
return result;
}
2 changes: 0 additions & 2 deletions lib/before-shouldPrepare.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
const { join } = require("path");
const { readFileSync, existsSync, writeFileSync } = require("fs");
const { setProcessInitDirectory } = require("./utils");
const envOptionsCacheFileLocation = join(__dirname, "env.cache.json");

module.exports = function (hookArgs) {
const platformInfo = hookArgs.shouldPrepareInfo && hookArgs.shouldPrepareInfo.platformInfo;
if (platformInfo && platformInfo.appFilesUpdaterOptions && platformInfo.appFilesUpdaterOptions.bundle) {
setProcessInitDirectory(platformInfo.projectData.projectDir);

return (args, originalMethod) => {
return originalMethod(...args).then(originalShouldPrepare => {
Expand Down
5 changes: 1 addition & 4 deletions lib/before-watch.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const { runWebpackCompiler } = require("./compiler");
const { setProcessInitDirectory } = require("./utils");

module.exports = function ($logger, hookArgs) {
if (hookArgs.config) {
Expand All @@ -16,9 +15,7 @@ module.exports = function ($logger, hookArgs) {
watch: true
};

const projectData = hookArgs.projectData;
setProcessInitDirectory(projectData.projectDir);
return runWebpackCompiler(config, projectData, $logger, hookArgs);
return runWebpackCompiler(config, hookArgs.projectData, $logger, hookArgs);
}));
}
}
Expand Down
2 changes: 0 additions & 2 deletions lib/before-watchPatterns.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const { basename } = require("path");
const {
buildEnvData,
getCompilationContext,
setProcessInitDirectory,
} = require("./utils");

module.exports = function (hookArgs) {
Expand All @@ -11,7 +10,6 @@ module.exports = function (hookArgs) {
return;
}

setProcessInitDirectory(hookArgs.projectData.projectDir);
const { platforms } = hookArgs;
const { env } = liveSyncData;
return (args, originalMethod) => {
Expand Down
7 changes: 1 addition & 6 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,8 @@ function shouldSnapshot(config) {
return config.bundle && config.release && platformSupportsSnapshot && osSupportsSnapshot;
}

function setProcessInitDirectory(dir) {
process.env.INIT_CWD = dir;
}

module.exports = {
buildEnvData,
getCompilationContext,
shouldSnapshot,
setProcessInitDirectory,
shouldSnapshot
};