fyn 1.1.21 → 1.1.22

package/dist/fyn.js

@@ -1073,10 +1073,7 @@ class FynCli {
       }
     }));
 
-    const pathKey = xsh.envPath.envKey;
-    const env = {
-      [pathKey]: process.env[pathKey]
-    };
+    const env = npmLifecycle.initEnv(process.env, this.fyn.production);
     setupNodeGypEnv(env);
     return Promise.each(_scripts, s => _.get(pkg, ["scripts", s]) && this.runScript(pkg, s, Object.assign({}, env)));
   }
@@ -53411,8 +53408,10 @@ async function generateNpmPackage(yes = false, template = initialTemplate, exist
     delete answers.main;
   }
 
-  if (lodash_1.default.get(exist, "publishConfig") || !answers.name.startsWith("@")) {
+  if (!answers.name.startsWith("@")) {
     delete answers.publishConfig;
+  } else if (lodash_1.default.get(exist, "publishConfig")) {
+    answers.publishConfig = lodash_1.default.pick(answers.publishConfig, Object.keys(exist.publishConfig));
   }
 
   const finalData = lodash_1.default.mergeWith({}, exist, answers, mergeReplaceArray); //
@@ -77303,6 +77302,7 @@ walk.BundleWalkerSync = BundleWalkerSync;
 
 
 exports = module.exports = lifecycle;
+exports.initEnv = initEnv;
 exports.makeEnv = makeEnv;
 exports._incorrectWorkingDirectory = _incorrectWorkingDirectory; // for testing
 
@@ -77708,20 +77708,26 @@ function runHookLifecycle(pkg, stage, env, wd, opts, cb) {
   });
 }
 
-function makeEnv(data, opts, prefix, env) {
-  prefix = prefix || 'npm_package_';
+function initEnv(fromEnv, production) {
+  fromEnv = fromEnv || process.env;
+  var env = {};
 
-  if (!env) {
-    env = {};
+  for (var i in fromEnv) {
+    if (!i.match(/^npm_/)) {
+      env[i] = fromEnv[i];
+    }
+  } // express and others respect the NODE_ENV value.
 
-    for (var i in process.env) {
-      if (!i.match(/^npm_/)) {
-        env[i] = process.env[i];
-      }
-    } // express and others respect the NODE_ENV value.
 
+  if (production) env.NODE_ENV = 'production';
+  return env;
+}
+
+function makeEnv(data, opts, prefix, env) {
+  prefix = prefix || 'npm_package_';
 
-    if (opts.production) env.NODE_ENV = 'production';
+  if (!env) {
+    env = initEnv(process.env, opts.production);
   } else if (!data.hasOwnProperty('_lifecycleEnv')) {
     Object.defineProperty(data, '_lifecycleEnv', {
       value: env,
@@ -77731,7 +77737,7 @@ function makeEnv(data, opts, prefix, env) {
 
   if (opts.nodeOptions) env.NODE_OPTIONS = opts.nodeOptions;
 
-  for (i in data) {
+  for (var i in data) {
     if (i.charAt(0) !== '_') {
       var envKey = (prefix + i).replace(/[^a-zA-Z0-9_]/g, '_');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fyn",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "description": "A node package manager, fast, workspace, and better productivity and efficiency",
   "main": "./bin/fyn.js",
   "homepage": "https://www.electrode.io/fynpo/",