Merge branch 'with-axios' of github.com:imaginarymachines/cli into with-axios

Author: Shelob9

package-lock.json

@@ -60,7 +60,6 @@
     "fs-extra": "^10.0.1",
     "get-file-object-from-local-path": "^1.0.2",
     "inquirer": "^8.2.0",
-    "isomorphic-fetch": "^3.0.0",
     "laravel-vapor": "^0.5.1",
     "request": "^2.88.2",
     "shelljs": "^0.8.5"

package.json

@@ -1,31 +1,81 @@
 {
-    "slug": "build-with-one-admin-pages",
-    "pluginId": 2,
-    "buildId": 2,
-    "entryPoints": {
-        "adminPages": [
-            "build-with-one-admin-pages-0"
-        ],
-        "blocks": [
-            ""
-        ]
-    },
-    "buildIncludes": [
-        "build-with-one-admin-pages.php",
-        "readme.txt",
-        "php",
-        "vendor",
-        "build",
-        "blocks/init.php",
-        "blocks/index.js",
-        "admin/build-with-one-admin-pages-0/init.php"
+  "slug": "build-with-two-admin-pages",
+  "pluginId": 1,
+  "buildId": 1,
+  "entryPoints": {
+    "adminPages": [
+      "build-with-two-admin-pages-0",
+      "build-with-two-admin-pages-1",
+      "name",
+      "a",
+      "aaa",
+      "qa",
+      "aa"
     ],
-    "buildSteps": {
-        "dev": [
-
-        ],
-        "prod": [
-            "node -v"
-        ]
-    }
-}
+    "blocks": []
+  },
+  "buildIncludes": [
+    "build-with-two-admin-pages.php",
+    "readme.txt",
+    "php",
+    "vendor",
+    "build",
+    "inc",
+    "admin/build-with-two-admin-pages-0/init.php",
+    "admin/build-with-two-admin-pages-1/init.php",
+    "admin/name/init.php",
+    "admin/name/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/aaa/init.php",
+    "admin/aaa/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/qa/init.php",
+    "admin/qa/init.php",
+    "admin/aa/init.php",
+    "admin/aa/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/aaa/init.php",
+    "admin/aaa/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/aaa/init.php",
+    "admin/aaa/init.php",
+    "admin/aa/init.php",
+    "admin/aa/init.php",
+    "admin/aa/init.php",
+    "admin/aa/init.php",
+    "admin/aaa/init.php",
+    "admin/aaa/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php",
+    "admin/a/init.php"
+  ],
+  "buildSteps": {
+    "dev": [
+      "yarn",
+      "yarn start"
+    ],
+    "prod": [
+      "yarn",
+      "yarn build"
+    ]
+  }
+}

pluginMachine.json

@@ -171,6 +171,10 @@ async function handleAddFeature(pluginDir,pluginMachine,pluginMachineJson,option
         data[option] = options[option].toLowerCase();
       }
     }
+    if( 'adminPageType' === option ) {
+      data[option] = options[option].toUpperCase();
+
+    }
   });
   data.featureType = feature;
 
@@ -183,6 +187,10 @@ async function handleAddFeature(pluginDir,pluginMachine,pluginMachineJson,option
   if( files.length ){
     files.forEach(async(file) => {
       let fileContents = await pluginMachine.getFeatureCode(pluginMachineJson,featureId,file);
+      //If json file got converted to js, then convert back to json
+      if( 'object' === typeof fileContents ) {
+        fileContents = JSON.stringify(fileContents, null, 2);
+      }
       promises.push(
         await pluginMachine.writeFile(pluginDir,file,fileContents).catch(e => {
             throw new Error(e);