@rancher/create-extension 0.1.0 → 0.1.1

package/app/app.package.json

@@ -3,12 +3,28 @@
   "version": "0.1.0",
   "private": false,
   "engines": {
-    "node": ">=12"
+    "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": {
-    "**/webpack": "4",
-    "@types/node": "^16",
-    "glob": "7.2.3"
-  }  
+    "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"
+  }
 }

package/app/files/.eslintignore

@@ -7,10 +7,12 @@ node_modules/
 .env
 .cache
 .next
+.nuxt
 dist
 dist-pkg
 .DS_Store
 dynamic-importer.js
 ksconfig.json
+nuxt.config.js
 shell/utils/dynamic-importer.js
 shell/assets/fonts

package/app/files/.eslintrc.js

@@ -4,17 +4,19 @@ module.exports = {
     browser: true,
     node:    true
   },
-  globals: { NodeJS: true, Timer: true },
+  globals: {
+    NodeJS: true,
+    Timer:  true
+  },
   extends: [
     'standard',
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
     '@vue/standard',
     '@vue/typescript/recommended',
-    'plugin:vue/recommended',
-    'plugin:cypress/recommended',
+    'plugin:vue/vue3-recommended',
+    'plugin:cypress/recommended'
   ],
-  // add your custom rules here
   rules: {
     'dot-notation':             'off',
     'generator-star-spacing':   'off',
@@ -34,141 +36,207 @@ module.exports = {
     'vue/no-unused-components': 'warn',
     'vue/no-v-html':            'error',
     'wrap-iife':                'off',
-
-    'array-bracket-spacing':             'warn',
-    'arrow-parens':                      'warn',
-    'arrow-spacing':                     ['warn', { before: true, after: true }],
-    'block-spacing':                     ['warn', 'always'],
-    'brace-style':                       ['warn', '1tbs'],
-    'comma-dangle':                      ['warn', 'only-multiline'],
-    'comma-spacing':                     'warn',
-    curly:                               'warn',
-    eqeqeq:                              'warn',
-    'func-call-spacing':                 ['warn', 'never'],
-    'implicit-arrow-linebreak':          'warn',
-    indent:                              ['warn', 2],
-    'keyword-spacing':                   'warn',
-    'lines-between-class-members':       ['warn', 'always', { exceptAfterSingleLine: true }],
-    'multiline-ternary':                 ['warn', 'never'],
-    'newline-per-chained-call':          ['warn', { ignoreChainWithDepth: 4 }],
-    'no-caller':                         'warn',
-    'no-cond-assign':                    ['warn', 'except-parens'],
-    'no-console':                        'warn',
-    'no-debugger':                       'warn',
-    'no-eq-null':                        'warn',
-    'no-eval':                           'warn',
-    'no-trailing-spaces':                'warn',
-    'no-undef':                          'warn',
-    'no-unused-vars':                    'warn',
-    'no-whitespace-before-property':     'warn',
-    'object-curly-spacing':              ['warn', 'always'],
-    'object-property-newline':           'warn',
-    'object-shorthand':                  'warn',
-    'padded-blocks':                     ['warn', 'never'],
-    'prefer-arrow-callback':             'warn',
-    'prefer-template':                   'warn',
-    'quote-props':                       'warn',
-    'rest-spread-spacing':               'warn',
-    semi:                                ['warn', 'always'],
-    'space-before-function-paren':       ['warn', 'never'],
-    'space-infix-ops':                   'warn',
-    'spaced-comment':                    'warn',
-    'switch-colon-spacing':              'warn',
-    'template-curly-spacing':            ['warn', 'always'],
-    'yield-star-spacing':                ['warn', 'both'],
-
-    'key-spacing':              ['warn', {
-      align: {
-        beforeColon: false,
-        afterColon:  true,
-        on:          'value',
-        mode:        'minimum'
-      },
-      multiLine: {
-        beforeColon: false,
-        afterColon:  true
-      },
-    }],
-
-    'object-curly-newline':          ['warn', {
-      ObjectExpression:  {
-        multiline:     true,
-        minProperties: 3
-      },
-      ObjectPattern:     {
-        multiline:     true,
-        minProperties: 4
-      },
-      ImportDeclaration: {
-        multiline:     true,
-        minProperties: 5
-      },
-      ExportDeclaration: {
-        multiline:     true,
-        minProperties: 3
+    'array-bracket-spacing':    'warn',
+    'arrow-parens':             'warn',
+    'arrow-spacing':            [
+      'warn',
+      {
+        before: true,
+        after:  true
       }
-    }],
-
+    ],
+    'block-spacing': [
+      'warn',
+      'always'
+    ],
+    'brace-style': [
+      'warn',
+      '1tbs'
+    ],
+    'comma-dangle': [
+      'warn',
+      'only-multiline'
+    ],
+    'comma-spacing':     'warn',
+    curly:               'warn',
+    eqeqeq:              'warn',
+    'func-call-spacing': [
+      'warn',
+      'never'
+    ],
+    'implicit-arrow-linebreak': 'warn',
+    indent:                     [
+      'warn',
+      2
+    ],
+    'keyword-spacing':             'warn',
+    'lines-between-class-members': [
+      'warn',
+      'always',
+      { exceptAfterSingleLine: true }
+    ],
+    'multiline-ternary': [
+      'warn',
+      'never'
+    ],
+    'newline-per-chained-call': [
+      'warn',
+      { ignoreChainWithDepth: 4 }
+    ],
+    'no-caller':      'warn',
+    'no-cond-assign': [
+      'warn',
+      'except-parens'
+    ],
+    'no-console':                    'warn',
+    'no-debugger':                   'warn',
+    'no-eq-null':                    'warn',
+    'no-eval':                       'warn',
+    'no-trailing-spaces':            'warn',
+    'no-undef':                      'warn',
+    'no-unused-vars':                'warn',
+    'no-whitespace-before-property': 'warn',
+    'object-curly-spacing':          [
+      'warn',
+      'always'
+    ],
+    'object-property-newline': 'warn',
+    'object-shorthand':        'warn',
+    'padded-blocks':           [
+      'warn',
+      'never'
+    ],
+    'prefer-arrow-callback': 'warn',
+    'prefer-template':       'warn',
+    'quote-props':           'warn',
+    'rest-spread-spacing':   'warn',
+    semi:                    [
+      'warn',
+      'always'
+    ],
+    'space-before-function-paren': [
+      'warn',
+      'never'
+    ],
+    'space-infix-ops':        'warn',
+    'spaced-comment':         'warn',
+    'switch-colon-spacing':   'warn',
+    'template-curly-spacing': [
+      'warn',
+      'always'
+    ],
+    'yield-star-spacing': [
+      'warn',
+      'both'
+    ],
+    'key-spacing': [
+      'warn',
+      {
+        align: {
+          beforeColon: false,
+          afterColon:  true,
+          on:          'value',
+          mode:        'minimum'
+        },
+        multiLine: {
+          beforeColon: false,
+          afterColon:  true
+        }
+      }
+    ],
+    'object-curly-newline': [
+      'warn',
+      {
+        ObjectExpression: {
+          multiline:     true,
+          minProperties: 3
+        },
+        ObjectPattern: {
+          multiline:     true,
+          minProperties: 4
+        },
+        ImportDeclaration: {
+          multiline:     true,
+          minProperties: 5
+        },
+        ExportDeclaration: {
+          multiline:     true,
+          minProperties: 3
+        }
+      }
+    ],
     'padding-line-between-statements': [
       'warn',
       {
         blankLine: 'always',
         prev:      '*',
-        next:      'return',
+        next:      'return'
       },
       {
         blankLine: 'always',
         prev:      'function',
-        next:      'function',
+        next:      'function'
       },
-      // This configuration would require blank lines after every sequence of variable declarations
       {
         blankLine: 'always',
-        prev:      ['const', 'let', 'var'],
-        next:      '*'
+        prev:      [
+          'const',
+          'let',
+          'var'
+        ],
+        next: '*'
       },
       {
         blankLine: 'any',
-        prev:      ['const', 'let', 'var'],
-        next:      ['const', 'let', 'var']
+        prev:      [
+          'const',
+          'let',
+          'var'
+        ],
+        next: [
+          'const',
+          'let',
+          'var'
+        ]
       }
     ],
-
     quotes: [
       'warn',
       'single',
       {
         avoidEscape:           true,
         allowTemplateLiterals: true
-      },
+      }
     ],
-
     'space-unary-ops': [
       'warn',
       {
         words:    true,
-        nonwords: false,
+        nonwords: false
       }
     ],
-
-    // FIXME: The following is disabled due to new linter and old JS code. These should all be enabled and underlying issues fixed
-    'vue/order-in-components':              'off',
-    'vue/no-lone-template':                 'off',
-    'vue/v-slot-style':                     'off',
-    'vue/component-tags-order':             'off',
-    'vue/no-mutating-props':                'off',
-    '@typescript-eslint/no-unused-vars':    'off',
-    'array-callback-return':                'off',
+    'vue/order-in-components':           'off',
+    'vue/no-lone-template':              'off',
+    'vue/v-slot-style':                  'off',
+    'vue/component-tags-order':          'off',
+    'vue/no-mutating-props':             'off',
+    '@typescript-eslint/no-unused-vars': 'off',
+    'array-callback-return':             'off',
+    'vue/one-component-per-file':        'off',
+    'vue/no-deprecated-slot-attribute':  'off',
+    'vue/require-explicit-emits':        'off',
+    'vue/v-on-event-hyphenation':        'off'
   },
   overrides: [
     {
-      files: ['*.js'],
+      files: [
+        '*.js'
+      ],
       rules: {
-        // FIXME: The following is disabled due to new linter and old JS code. These should all be enabled and underlying issues fixed
         'prefer-regex-literals':                'off',
         'vue/component-definition-name-casing': 'off',
         'no-unreachable-loop':                  'off',
-        'computed-property-spacing':            'off',
+        'computed-property-spacing':            'off'
       }
     }
   ]

package/app/files/.github/workflows/build-extension-catalog.yml

@@ -2,8 +2,12 @@ name: Build and Release Extension Catalog
 
 on:
   workflow_dispatch:
-  release:
-    types: [released]
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 defaults:
   run:

package/app/files/.github/workflows/build-extension-charts.yml

@@ -2,8 +2,12 @@ name: Build and Release Extension Charts
 
 on:
   workflow_dispatch:
-  release:
-    types: [released]
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 defaults:
   run:

package/app/files/.vscode/settings.json

@@ -8,6 +8,7 @@
     ".eslintignore": true,
     ".eslintrc.js": true,
     ".gitignore": true,
+    ".nuxt*": true,
     ".nyc_output": true,
     ".vscode": true,
     "LICENSE": true,

package/app/files/.yarnrc.yml

@@ -0,0 +1,2 @@
+nodeLinker: node-modules
+pnpMode: false

package/app/init

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
-/* eslint-disable no-console */
 
-const { execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs-extra');
 
@@ -14,9 +12,10 @@ const targets = {
 const files = [
   'tsconfig.json',
   'vue.config.js',
-  '.gitignore',
+  'gitignore',
   '.eslintignore',
   '.eslintrc.js',
+  '.yarnrc.yml',
   'babel.config.js',
   '.vscode/settings.json'
 ];
@@ -26,8 +25,9 @@ console.log('Creating Skeleton Application');
 
 const args = process.argv;
 let appFolder = path.resolve('.');
+let shellVersion = '';
 
-if ( args.length > 2 ) {
+if (args.length === 3) {
   const name = args[2];
   const folder = path.resolve('.');
 
@@ -40,7 +40,9 @@ let addGitlabWorkflow = false;
 let addWorkflowFolder = true;
 
 // Check for Gitlab integration option
-if ( args.length > 3 ) {
+if ( args.length >= 3 ) {
+  shellVersion = args[3];
+
   for (let i = 3; i < args.length; i++) {
     switch (args[i]) {
     case '-l':
@@ -62,7 +64,6 @@ if ( addGitlabWorkflow ) {
 
 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'));
@@ -95,10 +96,7 @@ Object.keys(targets).forEach((target) => {
 const creatorPkgData = fs.readFileSync(path.join(__dirname, 'package.json'));
 const creatorPkg = JSON.parse(creatorPkgData);
 
-// Fetch the latest version of @rancher/shell
-const shellVersion = execSync('npm view @rancher/shell version').toString().trim();
-
-// Set the latest version of @rancher/shell in the dependencies
+// Set the package version of @rancher/shell in the dependencies
 pkg.dependencies['@rancher/shell'] = `^${ shellVersion }`;
 
 // Rest of dependencies are in the _pkgs property of package.json - copy then across
@@ -110,41 +108,16 @@ 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;
   const src = path.join(__dirname, 'files', file);
-  const dest = path.join(appFolder, file);
+  const dest = path.join(appFolder, destinationFile);
 
   if (!fs.existsSync(dest)) {
     console.log(`  Adding file: ${ file }`);
 
-    const folder = path.dirname(dest);
+    const folder = path.dirname(file);
 
     fs.ensureDirSync(folder);
 
@@ -153,6 +126,4 @@ files.forEach((file) => {
   }
 });
 
-console.log('Skeleton Application creation complete.\n');
-
-/* eslint-enable no-console */
+console.log('');

package/app/package.json

@@ -11,7 +11,7 @@
     "init"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=16.0.0"
   },
   "_requires": [
     "core-js",

package/init

@@ -4,6 +4,7 @@
 const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
+const creatorPkg = require('./package.json');
 
 const args = process.argv.slice(2);
 let extensionName = '';
@@ -11,6 +12,7 @@ let appName = '';
 let updateOnly = false;
 let skeletonOnly = false;
 let ignoreShellDepCheck = false;
+let tagUsed = ''; // To store the inferred tag
 
 args.forEach((arg, index) => {
   switch (arg) {
@@ -47,6 +49,45 @@ if ( !extensionName && !updateOnly && !skeletonOnly ) {
   process.exit(1);
 }
 
+// Infer the tag used based on the installed version and dist-tags
+try {
+  const packageName = creatorPkg.name;
+  const currentVersion = creatorPkg.version;
+
+  // Fetch the dist-tags from npm
+  const distTags = JSON.parse(execSync(`npm view ${ packageName } dist-tags --json`).toString());
+
+  // Find the tag matching the current version
+  tagUsed = Object.keys(distTags).find((tag) => distTags[tag] === currentVersion) || 'latest';
+
+  console.log(`Inferred tag used: ${ tagUsed }`);
+} catch (error) {
+  console.error('Error inferring tag:', error.message);
+  process.exit(1);
+}
+
+// Now, check the version of `@rancher/shell` package based on the inferred tag
+let shellVersion = 'latest';
+const shellPackageName = '@rancher/shell';
+
+try {
+  // Fetch the version of the `@rancher/shell` package that corresponds to the inferred tag
+  const tagVersion = execSync(`npm view ${ shellPackageName } dist-tags.${ tagUsed }`).toString().trim();
+
+  if (tagVersion) {
+    shellVersion = tagVersion;
+  } else {
+    const latestVersion = execSync(`npm view ${ shellPackageName } version`).toString().trim();
+
+    shellVersion = latestVersion;
+  }
+} catch (error) {
+  console.error(`  Failed to determine version for ${ shellPackageName }:`, error.message);
+  process.exit(1);
+}
+
+console.log(`  Using version ${ shellVersion } for ${ shellPackageName }`);
+
 const basePath = process.cwd();
 let skeletonPath;
 let isInsideSkeleton = false;
@@ -98,7 +139,7 @@ try {
   if ( !isInsideSkeleton && !skeletonExists ) {
     console.log(`Creating skeleton application: ${ appName }...`);
     // Pass all arguments to the app/init script
-    execSync(`node ${ path.join(__dirname, 'app', 'init') } ${ appName } ${ args.join(' ') }`, { stdio: 'inherit' });
+    execSync(`node ${ path.join(__dirname, 'app', 'init') } ${ appName }  ${ shellVersion } ${ args.join(' ') }`, { stdio: 'inherit' });
 
     // Ensure the skeleton path directory is created before attempting to change directory
     if ( !fs.existsSync(skeletonPath) ) {
@@ -124,7 +165,7 @@ try {
   // Check for package existence and create it if necessary
   if ( !pkgExists ) {
     console.log(`Creating package: ${ extensionName }...`);
-    execSync(`node ${ path.join(__dirname, 'pkg', 'init') } ${ extensionName } ${ args.join(' ') }`, { stdio: 'inherit' });
+    execSync(`node ${ path.join(__dirname, 'pkg', 'init') } ${ extensionName } ${ shellVersion } ${ args.join(' ') }`, { stdio: 'inherit' });
   }
 
   if ( args.includes('--update') || args.includes('-u') ) {

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "@rancher/create-extension",
   "description": "Rancher UI Extension generator",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "Apache-2.0",
   "author": "SUSE",
-  "private": false,
-  "bin": "./init",
+  "packageManager": "yarn@4.4.1",
+  "bin": {
+    "create-extension": "./init"
+  },
   "files": [
     "**/*",
     "init"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=16"
   },
   "dependencies": {
     "fs-extra": "^10.0.0"
@@ -20,6 +22,6 @@
     "core-js": "3.21.1",
     "css-loader": "6.7.3",
     "@types/lodash": "4.14.184",
-    "@rancher/components": "0.2.1-alpha.0"
+    "@rancher/components": "0.1.3"
   }
 }

package/pkg/init

@@ -1,11 +1,14 @@
 #!/usr/bin/env node
-/* eslint-disable no-console */
 
-const { execSync } = require('child_process');
 const fs = require('fs-extra');
 const path = require('path');
 const https = require('https');
 
+const targets = {
+  dev:  './node_modules/.bin/nuxt dev',
+  nuxt: './node_modules/.bin/nuxt',
+};
+
 const files = [
   'tsconfig.json',
   'vue.config.js',
@@ -33,18 +36,28 @@ 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 shellVersion = '';
 
-let addTypeFolders = true;
+let addTypeFolders = false;
+let addWorkflowFolder = false;
+
+if ( args.length >= 3 ) {
+  shellVersion = args[3];
 
-if ( args.length > 3 ) {
   for ( let i = 3; i < args.length; i++ ) {
     switch (args[i]) {
-    case '--skip-templates':
     case '-t':
-      addTypeFolders = false;
+      addTypeFolders = true;
+      break;
+    case '-w':
+      addWorkflowFolder = true;
       break;
     default:
       break;
@@ -73,6 +86,13 @@ 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`);
+  }
+});
+
 // Add annotation for the latest Rancher version by default
 function fetchLatestVersion() {
   console.log('  Fetching latest Rancher Version');
@@ -115,20 +135,12 @@ function fetchLatestVersion() {
 
           pkg.rancher = { annotations: { 'catalog.cattle.io/rancher-version': `>= ${ release.tag_name }` } };
 
-          // Fetch the latest version of @rancher/shell
-          const latestShellVersion = execSync('npm view @rancher/shell version').toString().trim() || null;
-
-          if (!latestShellVersion) {
+          if ( !shellVersion ) {
             console.log('Could not get a shell version from npm, skipping adding catalog.cattle.io/ui-extensions-version annotation to package.json');
           } else {
-            const splitShellVersion = latestShellVersion.split('.');
-            const majorVersion = splitShellVersion[0];
-            const minorVersion = splitShellVersion[1];
-            const parsedShellVersion = `${ majorVersion }.${ minorVersion }.0`;
+            console.log(`  Adding catalog.cattle.io/ui-extensions-version '>= ${ shellVersion }' to package.json`);
 
-            console.log(`  Adding catalog.cattle.io/ui-extensions-version '>= ${ parsedShellVersion }' to package.json`);
-
-            pkg.rancher.annotations['catalog.cattle.io/ui-extensions-version'] = `>= ${ parsedShellVersion }`;
+            pkg.rancher.annotations['catalog.cattle.io/ui-extensions-version'] = `>= ${ shellVersion }`;
           }
 
           writePackageJson();
@@ -145,6 +157,10 @@ function fetchLatestVersion() {
 fetchLatestVersion();
 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));
 }
@@ -161,6 +177,31 @@ 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);
@@ -172,6 +213,13 @@ 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;
@@ -216,5 +264,3 @@ function updateArray(data) {
 
   return updated;
 }
-
-/* eslint-enable no-console */

package/pkg/package.json

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

package/pkg/pkg.package.json

@@ -6,12 +6,31 @@
   "rancher": true,
   "scripts": {},
   "engines": {
-    "node": ">=12"
+    "node": ">=16"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "4.5.18",
-    "@vue/cli-service": "4.5.18",
-    "@vue/cli-plugin-typescript": "4.5.18"
+    "@vue/cli-plugin-babel": "~5.0.0",
+    "@vue/cli-service": "~5.0.0",
+    "@vue/cli-plugin-typescript": "~5.0.0",
+    "cache-loader": "^4.1.0",
+    "color": "4.2.3",
+    "ip": "2.0.1",
+    "node-polyfill-webpack-plugin": "^3.0.0"
+  },
+  "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",
+    "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"
   },
   "browserslist": [
     "> 1%",

package/update/init

@@ -4,18 +4,17 @@ const path = require('path');
 const fs = require('fs-extra');
 const { spawnSync } = require('child_process');
 
-const scriptFolder = path.resolve(__dirname, '..');
+const scriptFolder = __dirname;
 const dest = path.resolve('.');
 
 // Remove first two args
-const args = process.argv;
-
+let args = process.argv;
 args.splice(0, 2);
 
-const res = spawnSync(path.join(__dirname, 'upgrade'), args, {
-  cwd:   dest,
+const res = spawnSync(`${__dirname}/upgrade`, args, {
+  cwd: dest,
   shell: false,
-  stdio: ['ignore', process.stdout, process.stderr],
+  stdio: [ 'ignore', process.stdout, process.stderr ],
 });
 
 if (res.status !== 0) {
@@ -35,13 +34,9 @@ rawdata = fs.readFileSync(path.join(scriptFolder, 'package.json'));
 const upgradePackage = JSON.parse(rawdata);
 
 // Update dependency versions to match the latest from the creator
-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
-}
+Object.keys(latestPackage._pkgs).forEach((key) => {
+  appPackage.dependencies[key] = latestPackage._pkgs[key];
+});
 
 // Add in the webpack resolution
 appPackage.resolutions = appPackage.resolutions || {};
@@ -52,10 +47,10 @@ const shellVersion = upgradePackage.version;
 
 appPackage.dependencies['@rancher/shell'] = shellVersion;
 
-fs.writeFileSync(path.join(dest, 'package.json'), `${ JSON.stringify(appPackage, null, 2) }\n`);
+fs.writeFileSync(path.join(dest, 'package.json'), JSON.stringify(appPackage, null, 2) + '\n');
 
 spawnSync(`yarn`, ['install'], {
-  cwd:   dest,
+  cwd: dest,
   shell: false,
-  stdio: ['ignore', process.stdout, process.stderr],
+  stdio: [ 'ignore', process.stdout, process.stderr ],
 });

package/update/package.json

@@ -12,7 +12,7 @@
     "upgrade"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=16.0.0"
   },
   "dependencies": {
     "fs-extra": "^10.0.0"

package/update/upgrade

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"/.. &> /dev/null && pwd )
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 echo "Upgrading Rancher Shell"
 
@@ -19,13 +19,13 @@ fi
 # 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 your files - running in a git repository will ensure you have visibility over changes made"
+  echo "Note: This action will update yuor files - running in a git repsository 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 your files - running in a clean git repository will ensure you have visibility over changes made"
+  echo "Note: This action will update yuor files - running in a clean git repsository will ensure you have visibility over changes made"
   exit 1 
 fi
 
@@ -42,7 +42,7 @@ if [ "${HAS_SHELL}" != "1" ]; then
 fi
 
 # Copy files for the top-level folder (from the app creator)
-rsync ${SCRIPT_DIR}/app/files/* .
+rsync --exclude nuxt.config.js ${SCRIPT_DIR}/app/files/* .
 
 # Go through each folder in the pkg folder and update their files
 for pkg in ./pkg/*