@rancher/create-extension 1.0.4 → 1.0.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rancher/create-extension",
   "description": "Rancher UI Extension generator",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "license": "Apache-2.0",
   "author": "SUSE",
   "packageManager": "yarn@4.5.0",

package/update/init

@@ -12,7 +12,7 @@ const args = process.argv;
 
 args.splice(0, 2);
 
-const res = spawnSync(`${ __dirname }/upgrade`, args, {
+const res = spawnSync(path.join(__dirname, 'upgrade'), args, {
   cwd:   dest,
   shell: false,
   stdio: ['ignore', process.stdout, process.stderr],
@@ -31,9 +31,13 @@ rawdata = fs.readFileSync(path.join(baseFolder, 'app', 'package.json'));
 const latestPackage = JSON.parse(rawdata);
 
 // Update dependency versions to match the latest from the creator
-Object.keys(latestPackage._pkgs).forEach((key) => {
-  appPackage.dependencies[key] = latestPackage._pkgs[key];
-});
+if ( latestPackage.dependencies ) {
+  Object.keys(latestPackage.dependencies).forEach((key) => {
+    appPackage.dependencies[key] = latestPackage.dependencies[key];
+  });
+} else {
+  console.warn('No dependencies found in latestPackage.'); // eslint-disable-line no-console
+}
 
 // Add in the webpack resolution
 appPackage.resolutions = appPackage.resolutions || {};

package/update/upgrade

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 BASE_DIR="$(cd $SCRIPT_DIR && cd .. && pwd)"
@@ -20,13 +20,13 @@ done
 # Check for a clean git repository
 if [ ! -d ".git" ] && [ "${FORCE}" == "false" ]; then
   echo "Not runnning in a git repository. Re-run with -f to ignore this check"
-  echo "Note: This action will update yuor files - running in a git repsository will ensure you have visibility over changes made"
+  echo "Note: This action will update your files - running in a git repository will ensure you have visibility over changes made"
   exit 1 
 fi
 
 if [[ $(git diff --stat) != '' ]] && [ "${FORCE}" == "false" ]; then
   echo "Git repository is not clean. Re-run with -f to ignore this check"
-  echo "Note: This action will update yuor files - running in a clean git repsository will ensure you have visibility over changes made"
+  echo "Note: This action will update your files - running in a clean git repository will ensure you have visibility over changes made"
   exit 1 
 fi
 
@@ -54,4 +54,4 @@ do
 
     cp ${BASE_DIR}/pkg/files/* ${pkg}
   fi
-done
+done