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

feat(process): load ENV variables into process.env #10895

Merged
merged 6 commits into from
May 30, 2019
Merged

feat(process): load ENV variables into process.env #10895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a3135db
feat(android): write _env_.json file with ENV variables
sgtcoolguy Apr 30, 2019
bb9c5df
feat(ios): write _env_.json file with ENV variables
sgtcoolguy Apr 30, 2019
517d4c8
feat(process): load _env_.json into process.env
sgtcoolguy Apr 30, 2019
97428ca
fix(process): write out ENV variables to file only for 'development' …
sgtcoolguy May 15, 2019
531eb81
refactor: write env vars if not production deploy type
sgtcoolguy May 23, 2019
c1f6269
Merge branch 'master' into process-env
ssjsamir May 29, 2019
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
75 changes: 39 additions & 36 deletions android/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ const ADB = require('node-titanium-sdk/lib/adb'),
tiappxml = require('node-titanium-sdk/lib/tiappxml'),
url = require('url'),
util = require('util'),
wrench = require('wrench'),

afs = appc.fs,
i18nLib = appc.i18n(__dirname),
Expand Down Expand Up @@ -970,6 +969,9 @@ AndroidBuilder.prototype.validate = function validate(logger, config, cli) {
this.minifyJS = false;
}

// Do we write out process.env into a file in the app to use?
this.writeEnvVars = this.deployType !== 'production';

// check the app name
if (cli.tiapp.name.indexOf('&') !== -1) {
if (config.get('android.allowAppNameAmpersands', false)) {
Expand Down Expand Up @@ -2245,10 +2247,11 @@ AndroidBuilder.prototype.checkIfNeedToRecompile = function checkIfNeedToRecompil
// check if we need to do a rebuild
this.forceRebuild = this.checkIfShouldForceRebuild();

if (this.forceRebuild && fs.existsSync(this.buildGenAppIdDir)) {
wrench.rmdirSyncRecursive(this.buildGenAppIdDir);
if (this.forceRebuild) {
fs.emptyDirSync(this.buildGenAppIdDir);
} else {
fs.ensureDirSync(this.buildGenAppIdDir);
}
fs.existsSync(this.buildGenAppIdDir) || wrench.mkdirSyncRecursive(this.buildGenAppIdDir);

// now that we've read the build manifest, delete it so if this build
// becomes incomplete, the next build will be a full rebuild
Expand Down Expand Up @@ -2281,34 +2284,30 @@ AndroidBuilder.prototype.createBuildDirs = function createBuildDirs(next) {
// that build.pre.compile was fired.
ti.validateAppJsExists(this.projectDir, this.logger, 'android');

fs.existsSync(this.buildDir) || wrench.mkdirSyncRecursive(this.buildDir);
fs.ensureDirSync(this.buildDir);

// make directories if they don't already exist
let dir = this.buildAssetsDir;
if (this.forceRebuild) {
fs.existsSync(dir) && wrench.rmdirSyncRecursive(dir);
fs.emptyDirSync(dir);
Object.keys(this.lastBuildFiles).forEach(function (file) {
if (file.indexOf(dir + '/') === 0) {
delete this.lastBuildFiles[file];
}
}, this);
wrench.mkdirSyncRecursive(dir);
} else if (!fs.existsSync(dir)) {
wrench.mkdirSyncRecursive(dir);
} else {
fs.ensureDirSync(dir);
}

// we always destroy and rebuild the res directory
if (fs.existsSync(this.buildResDir)) {
wrench.rmdirSyncRecursive(this.buildResDir);
}
wrench.mkdirSyncRecursive(this.buildResDir);
fs.emptyDirSync(this.buildResDir);

fs.existsSync(dir = this.buildBinAssetsResourcesDir) || wrench.mkdirSyncRecursive(dir);
fs.existsSync(dir = path.join(this.buildDir, 'gen')) || wrench.mkdirSyncRecursive(dir);
fs.existsSync(dir = path.join(this.buildDir, 'lib')) || wrench.mkdirSyncRecursive(dir);
fs.existsSync(dir = this.buildResDrawableDir) || wrench.mkdirSyncRecursive(dir);
fs.existsSync(dir = path.join(this.buildResDir, 'values')) || wrench.mkdirSyncRecursive(dir);
fs.existsSync(dir = this.buildSrcDir) || wrench.mkdirSyncRecursive(dir);
fs.ensureDirSync(this.buildBinAssetsResourcesDir);
fs.ensureDirSync(path.join(this.buildDir, 'gen'));
fs.ensureDirSync(path.join(this.buildDir, 'lib'));
fs.ensureDirSync(this.buildResDrawableDir);
fs.ensureDirSync(path.join(this.buildResDir, 'values'));
fs.ensureDirSync(this.buildSrcDir);

// create the deploy.json file which contains debugging/profiling info
const deployJsonFile = path.join(this.buildBinAssetsDir, 'deploy.json'),
Expand Down Expand Up @@ -2359,7 +2358,7 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {

function copyFile(from, to, next) {
var d = path.dirname(to);
fs.existsSync(d) || wrench.mkdirSyncRecursive(d);
fs.ensureDirSync(d);

if (fs.existsSync(to)) {
_t.logger.warn(__('Overwriting file %s', to.cyan));
Expand Down Expand Up @@ -2482,7 +2481,7 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
}

// if the destination directory does not exists, create it
fs.existsSync(destDir) || wrench.mkdirSyncRecursive(destDir);
fs.ensureDirSync(destDir);

const ext = filename.match(extRegExp);

Expand Down Expand Up @@ -2783,7 +2782,7 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
this.tiSymbols[to] = modified.symbols;

const dir = path.dirname(to);
fs.existsSync(dir) || wrench.mkdirSyncRecursive(dir);
fs.ensureDirSync(dir);

if (symlinkFiles && newContents === originalContents) {
this.logger.debug(__('Copying %s => %s', from.cyan, to.cyan));
Expand Down Expand Up @@ -2827,6 +2826,19 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
this.encryptJS && jsFilesToEncrypt.push('_app_props_.json');
delete this.lastBuildFiles[appPropsFile];

// write the env variables file
const envVarsFile = path.join(buildAssetsPath, '_env_.json');
Object.keys(this.tiapp.properties).forEach(function (prop) {
props[prop] = this.tiapp.properties[prop].value;
}, this);
fs.writeFileSync(
envVarsFile,
// for non-development builds, DO NOT WRITE OUT ENV VARIABLES TO APP
sgtcoolguy marked this conversation as resolved.
Show resolved Hide resolved
this.writeEnvVars ? JSON.stringify(process.env) : {}
);
this.encryptJS && jsFilesToEncrypt.push('_env_.json');
delete this.lastBuildFiles[envVarsFile];

// Write the "bootstrap.json" file, even if the bootstrap array is empty.
// Note: An empty array indicates the app has no bootstrap files.
const bootstrapJsonRelativePath = path.join('ti.internal', 'bootstrap.json'),
Expand Down Expand Up @@ -3259,8 +3271,7 @@ AndroidBuilder.prototype.copyModuleResources = function copyModuleResources(next
this.logger.info(__('Extracting module resources: %s', resFile.cyan));

const tmp = temp.path();
fs.existsSync(tmp) && wrench.rmdirSyncRecursive(tmp);
wrench.mkdirSyncRecursive(tmp);
fs.emptyDirSync(tmp);

appc.zip.unzip(resFile, tmp, {}, function (ex) {
if (ex) {
Expand Down Expand Up @@ -3944,9 +3955,7 @@ AndroidBuilder.prototype.generateAndroidManifest = function generateAndroidManif
AndroidBuilder.prototype.packageApp = function packageApp(next) {
this.ap_File = path.join(this.buildBinDir, 'app.ap_');
const bundlesPath = path.join(this.buildIntermediatesDir, 'bundles');
if (!fs.existsSync(bundlesPath)) {
wrench.mkdirSyncRecursive(bundlesPath);
}
fs.ensureDirSync(bundlesPath);

const aaptHook = this.cli.createHook('build.android.aapt', this, function (exe, args, opts, done) {
this.logger.info(__('Running AAPT: %s', (exe + ' "' + args.join('" "') + '"').cyan));
Expand Down Expand Up @@ -4149,10 +4158,7 @@ AndroidBuilder.prototype.compileJavaClasses = function compileJavaClasses(next)
fs.writeFileSync(javaSourcesFile, '"' + javaFiles.join('"\n"').replace(/\\/g, '/') + '"');

// if we're recompiling the java files, then nuke the classes dir
if (fs.existsSync(this.buildBinClassesDir)) {
wrench.rmdirSyncRecursive(this.buildBinClassesDir);
}
wrench.mkdirSyncRecursive(this.buildBinClassesDir);
fs.emptyDirSync(this.buildBinClassesDir);

const javacHook = this.cli.createHook('build.android.javac', this, function (exe, args, opts, done) {
this.logger.info(__('Building Java source files: %s', (exe + ' "' + args.join('" "') + '"').cyan));
Expand Down Expand Up @@ -4260,10 +4266,7 @@ AndroidBuilder.prototype.runDexer = function runDexer(next) {
}

// nuke and create the folder holding all the classes*.dex files
if (fs.existsSync(this.buildBinClassesDex)) {
wrench.rmdirSyncRecursive(this.buildBinClassesDex);
}
wrench.mkdirSyncRecursive(this.buildBinClassesDex);
fs.emptyDirSync(this.buildBinClassesDex);

// Wipe existing outjar
fs.existsSync(outjar) && fs.unlinkSync(outjar);
Expand Down Expand Up @@ -4633,7 +4636,7 @@ AndroidBuilder.prototype.writeBuildManifest = function writeBuildManifest(callba
this.logger.info(__('Writing build manifest: %s', this.buildManifestFile.cyan));

this.cli.createHook('build.android.writeBuildManifest', this, function (manifest, cb) {
fs.existsSync(this.buildDir) || wrench.mkdirSyncRecursive(this.buildDir);
fs.ensureDirSync(this.buildDir);
fs.existsSync(this.buildManifestFile) && fs.unlinkSync(this.buildManifestFile);
fs.writeFile(this.buildManifestFile, JSON.stringify(this.buildManifest = manifest, null, '\t'), cb);
})({
Expand Down
22 changes: 19 additions & 3 deletions common/Resources/ti.internal/extensions/node/process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,25 @@ process.emitWarning = function (warning, options, code, ctor) { // eslint-disabl
}
this.emit('warning', warning);
};
process.env = {
// DEBUG: '*' // uncomment to make use of npm 'debug' module. TODO: have CLI pass along env vars in some file/property for dev builds?
};
function loadEnvJson() {
try {
const jsonFile = Ti.Filesystem.getFile(Ti.Filesystem.resourcesDirectory, '_env_.json');
if (jsonFile.exists()) {
return JSON.parse(jsonFile.read().text);
}
} catch (error) {
Ti.API.error(`Failed to read "_env_.json". Reason: ${error.message}`);
}
return {};
}
Object.defineProperty(process, 'env', {
get: function () {
delete this.env;
return this.env = loadEnvJson();
},
enumerable: true,
configurable: true
});
process.execArgv = [];
process.execPath = ''; // FIXME: What makes sense here? Path to titanium CLI here?
process.exit = () => {
Expand Down