(scripts): fix comiconfig loading

Cretezy · Jun 22, 2018 · 27c86fb · 27c86fb
1 parent fd76588
commit 27c86fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/create/package.json b/packages/create/package.json
@@ -23,7 +23,7 @@
 		"test": "noderize-scripts test",
 		"lint": "noderize-scripts lint",
 		"clean": "noderize-scripts clean",
-		"prepack": "npm run clean && npm run build -- --env production"
+		"prepare": "npm run clean && npm run build -- --env production"
 	},
 	"dependencies": {
 		"@noderize/runtime": "^0.7.2",

diff --git a/packages/scripts/package.json b/packages/scripts/package.json
@@ -24,8 +24,7 @@
     "format": "npm run scripts -- format",
     "clean": "npm run scripts -- clean",
     "lint": "npm run scripts -- lint",
-    "bootstrap": " noderize-scripts build",
-    "prepack": "npm run bootstrap && npm run build && mv dist/ dist-temp/ && node dist-temp build -- --env production && chmod +x -R dist && rm -r dist-temp"
+    "prepare": "noderize-scripts build && npm run build && mv dist/ dist-temp/ && node dist-temp build -- --env production && chmod +x -R dist && rm -r dist-temp"
   },
   "dependencies": {
     "@babel/core": "^7.0.0-beta.46",

diff --git a/packages/scripts/src/options.js b/packages/scripts/src/options.js
@@ -170,10 +170,10 @@ export function getOptions(rawArgs, env = null) {
   let options = {};
   try {
     // Load from "noderize" key in package.json, .noderizerc, or noderize.config.js
-    const results = cosmiconfig("noderize", { sync: true }).load();
+    const results = cosmiconfig("noderize").searchSync();
 
     if (results) {
-      const configOptions = results.config;
+      const configOptions = results.config || {};
       Object.keys(configOptions).forEach(configOptionKey => {
         if (types[configOptionKey] !== undefined) {
           const type = types[configOptionKey];
@@ -431,7 +431,7 @@ export function getOptions(rawArgs, env = null) {
     if (envConfig === undefined) {
       log.warn(`Could not find '${options.currentEnv}' environment.`);
     } else {
-      Object.keys(envConfig).forEach(envKey => {
+      Object.keys(envConfig || {}).forEach(envKey => {
         options[envKey] = envConfig[envKey];
       });
     }