Skip to content

Commit

Permalink
fix(yargs): Use proces senv
Browse files Browse the repository at this point in the history
  • Loading branch information
joaogarin committed Jun 9, 2021
1 parent f7fbdc0 commit 292b900
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 27 deletions.
13 changes: 6 additions & 7 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,12 @@ gulp.task("critical-front", function (cb) {
height: 1024,
//timeout: 120000,
include: generic_force_selectors.concat(front_force_selectors),
// user: process.env.user ? process.env.user : null,
// pass: process.env.pass ? process.env.pass : null,
user: process.env.user ? process.env.user : undefined,
pass: process.env.pass ? process.env.pass : undefined,
});
});

gulp.task("critical", function (cb) {
console.log(process.env.user);
var critical = require("critical"),
path = require("path"),
coreGulpConfig = require(`${epiq_path}/gulpconfig.json`),
Expand All @@ -203,8 +202,8 @@ gulp.task("critical", function (cb) {
height: 1024,
// timeout: 120000,
include: generic_force_selectors.concat(jobs_force_selectors),
// user: process.env.user ? process.env.user : null,
// pass: process.env.pass ? process.env.pass : null,
user: process.env.user ? process.env.user : undefined,
pass: process.env.pass ? process.env.pass : undefined,
});
});

Expand Down Expand Up @@ -237,8 +236,8 @@ gulp.task("critical-job", function (cb) {
height: 1024,
// timeout: 120000,
include: generic_force_selectors.concat(jobs_force_selectors),
// user: process.env.user ? process.env.user : null,
// pass: process.env.pass ? process.env.pass : null,
user: process.env.user ? process.env.user : undefined,
pass: process.env.pass ? process.env.pass : undefined,
});
});

Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@
"stylelint-config-sass-guidelines": "^7.1.0",
"stylelint-scss": "^3.18.0",
"stylelint-selector-bem-pattern": "^2.1.0",
"tiny-lr": "^1.0.3",
"yargs": "^7.0.2"
"tiny-lr": "^1.0.3"
},
"devDependencies": {
"ansi-regex": "^3.0.0",
Expand Down
35 changes: 17 additions & 18 deletions scripts/critical.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
var exec = require('child_process').exec,
chalk = require('chalk'),
args = '',
yargs = require('yargs').argv;
var exec = require("child_process").exec,
chalk = require("chalk"),
args = "";

if (yargs.user && yargs.pass) {
args += ' --user ' + yargs.user;
args += ' --pass ' + yargs.pass;
if (process.env.user && process.env.pass) {
args += " --user " + process.env.user;
args += " --pass " + process.env.pass;
}

var cmd = 'cd node_modules/recruiter_epiq_deps && gulp critical-css' + args;
var cmd = "cd node_modules/recruiter_epiq_deps && gulp critical-css" + args;

console.log('Compiling critical css - ' + chalk.yellow('gulp critical-css'));
exec(cmd, function(error, stdout, stderr) {
// command output is in stdout
if (!error) {
console.log(chalk.green(stdout));
} else {
console.log(chalk.white(stdout));
console.log(chalk.red(error));
}
console.log(chalk.red(stderr));
console.log("Compiling critical css - " + chalk.yellow("gulp critical-css"));
exec(cmd, function (error, stdout, stderr) {
// command output is in stdout
if (!error) {
console.log(chalk.green(stdout));
} else {
console.log(chalk.white(stdout));
console.log(chalk.red(error));
}
console.log(chalk.red(stderr));
});

0 comments on commit 292b900

Please sign in to comment.