@rancher/create-extension 2.0.2 → 2.0.4

package/app/app.package.json

@@ -5,26 +5,9 @@
   "engines": {
     "node": ">=16"
   },
-  "dependencies": {
-    "cache-loader": "^4.1.0",
-    "color": "4.2.3",
-    "ip": "2.0.1",
-    "node-polyfill-webpack-plugin": "^3.0.0"
-  },
+  "dependencies": {},
   "resolutions": {
-    "d3-color": "3.1.0",
-    "ejs": "3.1.9",
-    "follow-redirects": "1.15.2",
-    "glob": "7.2.3",
-    "glob-parent": "6.0.2",
-    "json5": "2.2.3",
-    "@types/lodash": "4.17.5",
-    "merge": "2.1.1",
-    "node-forge": "1.3.1",
-    "nth-check": "2.1.1",
-    "qs": "6.11.1",
-    "roarr": "7.0.4",
-    "semver": "7.5.4",
-    "@vue/cli-service/html-webpack-plugin": "^5.0.0"
+    "@types/node": "18.11.9",
+    "@types/lodash": "4.17.5"
   }
 }

package/app/init

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/* eslint-disable no-console */
 
 const path = require('path');
 const fs = require('fs-extra');
@@ -38,6 +39,7 @@ if (args.length >= 3 && !args[2].includes('@rancher/create-extension/app/init'))
 }
 
 let addGitlabWorkflow = false;
+let addWorkflowFolder = true;
 
 // Check for Gitlab integration option
 if ( args.length >= 3 ) {
@@ -48,6 +50,10 @@ if ( args.length >= 3 ) {
     case '-l':
       addGitlabWorkflow = true;
       break;
+    case '--skip-workflow':
+    case '-w':
+      addWorkflowFolder = false;
+      break;
     default:
       break;
     }
@@ -58,10 +64,9 @@ if ( addGitlabWorkflow ) {
   files.push('.gitlab-ci.yml');
 }
 
-// Check that there is a package file
-
 let setName = false;
 
+// Check that there is a package file
 if (!fs.existsSync(path.join(appFolder, './package.json'))) {
   console.log('  Adding package.json');
   fs.copySync(path.join(__dirname, 'app.package.json'), path.join(appFolder, 'package.json'));
@@ -106,6 +111,32 @@ if (creatorPkg._pkgs) {
 
 fs.writeFileSync(path.join(appFolder, 'package.json'), JSON.stringify(pkg, null, 2));
 
+// Add workflow folder if needed
+if ( addWorkflowFolder ) {
+  // Point to the workflow directory inside the skeleton application
+  const workflowDir = path.join(appFolder, '.github/workflows');
+
+  if ( !fs.existsSync(workflowDir) ) {
+    console.log('  Creating folder: .github/workflows');
+    fs.mkdirSync(workflowDir, { recursive: true });
+  }
+
+  const workflowFiles = [
+    'build-extension-catalog.yml',
+    'build-extension-charts.yml'
+  ];
+
+  workflowFiles.forEach((fileName) => {
+    const dest = path.join(workflowDir, fileName); // Destination in the skeleton application
+    const src = path.join(__dirname, 'files/.github/workflows', fileName); // Source in the package
+
+    if ( !fs.existsSync(dest) ) {
+      console.log(`  Adding file ${ fileName } to root workflows`);
+      fs.copySync(src, dest);
+    }
+  });
+}
+
 // Copy base files
 files.forEach((file) => {
   const destinationFile = file === 'gitignore' ? '.gitignore' : file;
@@ -115,7 +146,7 @@ files.forEach((file) => {
   if (!fs.existsSync(dest)) {
     console.log(`  Adding file: ${ file }`);
 
-    const folder = path.dirname(file);
+    const folder = path.dirname(dest);
 
     fs.ensureDirSync(folder);
 
@@ -124,4 +155,6 @@ files.forEach((file) => {
   }
 });
 
-console.log('');
+console.log('Skeleton Application creation complete.\n');
+
+/* eslint-enable no-console */

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@rancher/create-extension",
   "description": "Rancher UI Extension generator",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "license": "Apache-2.0",
   "author": "SUSE",
-  "packageManager": "yarn@4.4.1",
+  "packageManager": "yarn@4.5.0",
   "bin": {
     "create-extension": "init"
   },

package/pkg/init

@@ -1,13 +1,9 @@
 #!/usr/bin/env node
+/* eslint-disable no-console */
 
 const fs = require('fs-extra');
 const path = require('path');
 
-const targets = {
-  dev:  './node_modules/.bin/nuxt dev',
-  nuxt: './node_modules/.bin/nuxt',
-};
-
 const files = [
   'tsconfig.json',
   'vue.config.js',
@@ -30,36 +26,23 @@ const typeFolders = [
   'detail'
 ];
 
-const shellPkgPath = 'node_modules/@rancher/shell';
-
 console.log('');
 console.log('Creating Skeleton UI Package');
 
 const args = process.argv;
 
-if (args.length !== 3) {
-  console.log('Expected single argument of package name');
-}
-
 const name = args[2];
 const folder = path.resolve('.');
 const pkgFolder = path.join(folder, 'pkg', name);
 
-let addTypeFolders = false;
-let addWorkflowFolder = false;
-let ignoreShellPkgPathCheck = false;
+let addTypeFolders = true;
 
 if ( args.length >= 3 ) {
   for ( let i = 3; i < args.length; i++ ) {
     switch (args[i]) {
+    case '--skip-templates':
     case '-t':
-      addTypeFolders = true;
-      break;
-    case '-w':
-      addWorkflowFolder = true;
-      break;
-    case '-i':
-      ignoreShellPkgPathCheck = true;
+      addTypeFolders = false;
       break;
     default:
       break;
@@ -67,12 +50,6 @@ if ( args.length >= 3 ) {
   }
 }
 
-if (!ignoreShellPkgPathCheck && !fs.existsSync(path.join(pkgFolder, `../../${ shellPkgPath }/package.json`))) {
-  console.log('');
-  console.log('@rancher/shell not found in node_modules! Please do "yarn install" and make sure you run this command from the base folder of your app');
-  process.exit(1);
-}
-
 const isNodeModulesShell = !fs.existsSync(path.join(folder, 'shell'));
 
 if (!isNodeModulesShell) {
@@ -94,19 +71,8 @@ const pkg = JSON.parse(rawdata);
 pkg.name = name;
 pkg.description = `${ name } plugin`;
 
-Object.keys(targets).forEach((target) => {
-  if (!pkg.scripts[target]) {
-    pkg.scripts[target] = targets[target];
-    console.log(`  Adding script '${ target }' to package.json`);
-  }
-});
-
 writePackageJson();
 
-// Add dependencies
-// pkg.dependencies['@rancher/shell'] = '^0.6.2';
-// pkg.dependencies['core-js'] = '3.18.3';
-
 function writePackageJson() {
   fs.writeFileSync(path.join(pkgFolder, 'package.json'), JSON.stringify(pkg, null, 2));
 }
@@ -123,31 +89,6 @@ if (addTypeFolders) {
   });
 }
 
-// Add workflow folder if needed
-if (addWorkflowFolder) {
-  const workflowDir = path.join(folder, '.github/workflows');
-
-  if (!fs.existsSync(workflowDir)) {
-    fs.mkdirSync(workflowDir, { recursive: true });
-  }
-
-  const files = [
-    'build-extension-catalog.yml',
-    'build-extension-charts.yml'
-  ];
-
-  files.forEach((fileName) => {
-    const file = path.join(workflowDir, fileName);
-
-    if (!fs.existsSync(file)) {
-      const src = path.join(__dirname, 'files/.github/workflows', fileName);
-
-      console.log(`  Adding file ${ fileName } to root workflows`);
-      fs.copySync(src, file);
-    }
-  });
-}
-
 // Copy base files
 files.forEach((file) => {
   const src = path.join(__dirname, 'files', file);
@@ -159,13 +100,6 @@ files.forEach((file) => {
   }
 });
 
-// require("child_process").spawn('yarn', ['install'], {
-//   cwd: process.cwd(),
-//   stdio: "inherit"
-// });
-
-// Update tsconfig
-
 const topLevelRawdata = fs.readFileSync(path.join(folder, 'package.json'));
 const topLevelPkg = JSON.parse(topLevelRawdata);
 let updated = false;
@@ -210,3 +144,5 @@ function updateArray(data) {
 
   return updated;
 }
+
+/* eslint-enable no-console */

package/pkg/package.json

@@ -11,7 +11,7 @@
     "init"
   ],
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=16.0.0"
   },
   "dependencies": {
     "fs-extra": "^10.0.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

@@ -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