@rancher/shell 0.2.3 → 0.2.4

package/scripts/test-plugins-build.sh

@@ -67,10 +67,7 @@ else
 fi
 
 export YARN_REGISTRY=http://localhost:4873
-export NUXT_TELEMETRY_DISABLED=1
-
-# Remove test package from previous run, if present
-rm -rf ${BASE_DIR}/pkg/test-pkg
+export NEXT_TELEMETRY_DISABLED=1
 
 # We need to patch the version number of the shell, otherwise if we are running
 # with the currently published version, things will fail as those versions
@@ -80,7 +77,6 @@ rm ${SHELL_DIR}/package.json.bak
 
 # Publish shell
 echo "Publishing shell packages to local registry"
-yarn install
 ${SHELL_DIR}/scripts/publish-shell.sh
 
 if [ "${SKIP_STANDALONE}" == "false" ]; then
@@ -96,21 +92,21 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   yarn install
 
   echo "Building skeleton app"
-  FORCE_COLOR=true yarn build | cat
+  yarn build
 
   # Package creator
   echo "Verifying package creator package"
   yarn create @rancher/pkg test-pkg
 
   echo "Building test package"
-  FORCE_COLOR=true yarn build-pkg test-pkg | cat
+  yarn build-pkg test-pkg
 
   # Add test list component to the test package
   # Validates rancher-components imports
   mkdir pkg/test-pkg/list
   cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
 
-  FORCE_COLOR=true yarn build-pkg test-pkg | cat
+  yarn build-pkg test-pkg
 
   echo "Cleaning temporary dir"
   popd > /dev/null
@@ -130,7 +126,7 @@ yarn install
 rm -rf ./pkg/test-pkg
 yarn create @rancher/pkg test-pkg -t
 cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue ./pkg/test-pkg/list
-FORCE_COLOR=true yarn build-pkg test-pkg | cat
+yarn build-pkg test-pkg
 rm -rf ./pkg/test-pkg
 
 echo "All done"

package/store/prefs.js

@@ -52,7 +52,7 @@ export const CLUSTER = create('cluster', '');
 export const LAST_NAMESPACE = create('last-namespace', '');
 export const NAMESPACE_FILTERS = create('ns-by-cluster', {}, { parseJSON });
 export const WORKSPACE = create('workspace', '');
-export const EXPANDED_GROUPS = create('open-groups', ['cluster', 'rbac', 'serviceDiscovery', 'storage', 'workload'], { parseJSON });
+export const EXPANDED_GROUPS = create('open-groups', ['cluster', 'policy', 'rbac', 'serviceDiscovery', 'storage', 'workload'], { parseJSON });
 export const FAVORITE_TYPES = create('fav-type', [], { parseJSON });
 export const GROUP_RESOURCES = create('group-by', 'namespace');
 export const DIFF = create('diff', 'unified', { options: ['unified', 'split'] });

package/types/form.ts

@@ -0,0 +1 @@
+export type FormMode = 'create' | 'view' | 'edit' | 'clone' | 'stage' | 'import';

package/types/generic.ts

@@ -0,0 +1,2 @@
+export type ValueOf<T> = T[keyof T]
+export type Enumerable<T extends Object> = T['propertyIsEnumerable']

package/types/t.ts

@@ -0,0 +1 @@
+export type Translation = (key: string, args?: Record<string, any>, raw?: boolean) => string

package/types/userPreferences.d.ts

@@ -0,0 +1,14 @@
+// eslint-disable-next-line no-unused-vars
+interface UserPreferences {
+  'after-login-route': string,
+  cluster: string,
+  'group-by': string,
+  'home-page-cards': string,
+  'last-namespace': string,
+  'last-visited': string,
+  'ns-by-cluster': string,
+  provisioner: string,
+  'read-whatsnew': string,
+  'seen-whatsnew': string,
+  theme: string,
+}

package/utils/array.ts

@@ -155,6 +155,27 @@ export function findBy<T, K, V>(
   return findOrFilterBy('find', ary, keyOrObj, val);
 }
 
+export function findStringIndex(items: string[], item: string, trim = true): number {
+  return items.indexOf(trim ? item?.trim() : item);
+}
+
+export function hasDuplicatedStrings(items: string[], caseSensitive = true): boolean {
+  const normalizedItems = items.map(i => (caseSensitive ? i : i.toLowerCase()).trim());
+
+  for (let i = 0; i < items.length; i++) {
+    const index = findStringIndex(
+      normalizedItems,
+      (caseSensitive ? items[i] : items[i].toLowerCase()),
+    );
+
+    if (i !== index) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 export function sameContents<T>(aryA: T[], aryB: T[]): boolean {
   return xor(aryA, aryB).length === 0;
 }

package/utils/favicon.js

@@ -18,6 +18,8 @@ export function setFavIcon(store) {
 
     if (brandSetting?.value === 'suse') {
       brandImage = require('~shell/assets/brand/suse/favicon.png');
+    } else if (brandSetting?.value === 'csp') {
+      brandImage = require('~shell/assets/brand/csp/favicon.png');
     }
 
     link.href = res?.value || brandImage || defaultFavIcon;

package/utils/settings.ts

@@ -0,0 +1,50 @@
+import { MANAGEMENT } from '@shell/config/types';
+import { Store } from 'vuex';
+import { DEFAULT_PERF_SETTING, SETTING } from '@shell/config/settings';
+
+export const fetchOrCreateSetting = async(store: Store<any>, id: string, val: string, save = true): Promise<any> => {
+  let setting;
+
+  try {
+    setting = await store.dispatch('management/find', { type: MANAGEMENT.SETTING, id });
+  } catch {
+    const schema = store.getters['management/schemaFor'](MANAGEMENT.SETTING);
+    const url = schema.linkFor('collection');
+
+    setting = await store.dispatch('management/create', {
+      type: MANAGEMENT.SETTING, metadata: { name: id }, value: val, default: val || ''
+    });
+    if ( save ) {
+      await setting.save({ url });
+    }
+  }
+
+  return setting;
+};
+
+export const setSetting = async(store: Store<any>, id: string, val: string): Promise<any> => {
+  const setting = await fetchOrCreateSetting(store, id, val, false);
+
+  setting.value = val;
+  await setting.save();
+
+  return setting;
+};
+
+export const getPerformanceSetting = (rootGetters: Record<string, (arg0: string, arg1: string) => any>) => {
+  const perfSetting = rootGetters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE);
+  let perfConfig = {};
+
+  if (perfSetting && perfSetting.value) {
+    try {
+      perfConfig = JSON.parse(perfSetting.value);
+    } catch (e) {
+      console.warn('ui-performance setting contains invalid data'); // eslint-disable-line no-console
+    }
+  }
+
+  // Start with the default and overwrite the values from the setting - ensures we have defaults for newly added options
+  perfConfig = Object.assign(DEFAULT_PERF_SETTING, perfConfig);
+
+  return perfConfig;
+};

package/utils/validators/formRules/__tests__/index.test.ts

@@ -8,7 +8,7 @@ const mockT = (key: string, args: any) => {
 };
 
 describe('formRules', () => {
-  const formRules = formRulesGenerator(mockT, { displayKey: 'testDisplayKey' });
+  const formRules = formRulesGenerator(mockT, { key: 'testDisplayKey' });
 
   it('"required" : returns undefined when value supplied', () => {
     const testValue = 'foo';
@@ -1033,4 +1033,25 @@ describe('formRules', () => {
 
     expect(formRuleResult).toStrictEqual(expectedResult);
   });
+
+  describe.each([
+    ['minValue', 2, [3], [1]],
+    ['maxValue', 256, [1], [300]],
+    ['betweenValues', [2, 256], [3], [1, 300]],
+    ['minLength', 2, ['test'], ['x']],
+    ['maxLength', 10, ['x'], ['wrong value']],
+    ['betweenLengths', [2, 10], ['test'], ['x', 'wrong value']],
+  ])('%p with parameter %p should', (rule, argument, correctValues, wrongValues) => {
+    it.each(wrongValues as [])('return error for value %p', (wrong) => {
+      const formRuleResult = (formRules as any)[rule](argument)(wrong);
+
+      expect(formRuleResult).not.toBeUndefined();
+    });
+
+    it.each(correctValues as [])('return valid for value %p', (correct) => {
+      const formRuleResult = (formRules as any)[rule](argument)(correct);
+
+      expect(formRuleResult).toBeUndefined();
+    });
+  });
 });

package/utils/validators/formRules/index.ts

@@ -4,6 +4,7 @@ import isEmpty from 'lodash/isEmpty';
 import has from 'lodash/has';
 // import uniq from 'lodash/uniq';
 import cronstrue from 'cronstrue';
+import { Translation } from '@shell/types/t';
 
 // import uniq from 'lodash/uniq';
 export type Validator = (val: any, arg?: any) => undefined | string;
@@ -47,25 +48,43 @@ const runValidators = (val: any, validators: Validator[]) => {
   }
 };
 
-// "t" is the function name we use for getting a translated string
-export default function(t: (key: string, options?: any) => string, opt: {displayKey?: string} = {}) {
-  const { displayKey = 'Value' } = opt;
+export interface ValidationOptions {
+  key?: string,
+}
 
+// "t" is the function name we use for getting a translated string
+export default function(t: Translation, { key = 'Value' }: ValidationOptions) {
   // utility validators these validators only get used by other validators
-  const startDot: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(0, 1) === '.' ? t(`validation.dns.${ label }.startDot`, { key: displayKey }) : undefined;
+  const startDot: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(0, 1) === '.' ? t(`validation.dns.${ label }.startDot`, { key }) : undefined;
+
+  const endDot = (label: string): Validator => (val: string) => val?.slice(-1) === '.' ? t(`validation.dns.${ label }.endDot`, { key }) : undefined;
 
-  const endDot = (label: string): Validator => (val: string) => val?.slice(-1) === '.' ? t(`validation.dns.${ label }.endDot`, { key: displayKey }) : undefined;
+  const startNumber: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(0, 1)?.match(/[0-9]/) ? t(`validation.dns.${ label }.startNumber`, { key }) : undefined;
 
-  const startNumber: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(0, 1)?.match(/[0-9]/) ? t(`validation.dns.${ label }.startNumber`, { key: displayKey }) : undefined;
+  const startHyphen: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(0, 1) === '-' ? t(`validation.dns.${ label }.startHyphen`, { key }) : undefined;
 
-  const startHyphen: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(0, 1) === '-' ? t(`validation.dns.${ label }.startHyphen`, { key: displayKey }) : undefined;
+  const endHyphen: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(-1) === '-' ? t(`validation.dns.${ label }.endHyphen`, { key }) : undefined;
 
-  const endHyphen: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(-1) === '-' ? t(`validation.dns.${ label }.endHyphen`, { key: displayKey }) : undefined;
+  const minValue: ValidatorFactory = (min: string) => (val: string | number) => Number(val) < Number(min) ? t('validation.minValue', { key, min }) : undefined;
+
+  const maxValue: ValidatorFactory = (max: string) => (val: string | number) => Number(val) > Number(max) ? t('validation.maxValue', { key, max }) : undefined;
+
+  const betweenValues: ValidatorFactory = ([min, max]: string[]) => (val: string | number) => minValue(min)(val) || maxValue(max)(val) ? t('validation.betweenValues', {
+    key, min, max
+  }) : undefined;
 
-  const requiredInt: Validator = (val: string) => isNaN(parseInt(val, 10)) ? t('validation.number.requiredInt', { key: displayKey }) : undefined;
+  const minLength: ValidatorFactory = (min: string) => (val: string) => val.length < Number(min) ? t('validation.minLength', { key, min }) : undefined;
+
+  const maxLength: ValidatorFactory = (max: string) => (val: string) => val.length > Number(max) ? t('validation.maxLength', { key, max }) : undefined;
+
+  const betweenLengths: ValidatorFactory = ([min, max]: string[]) => (val: string) => minLength(min)(val) || maxLength(max)(val) ? t('validation.betweenLengths', {
+    key, min, max
+  }) : undefined;
+
+  const requiredInt: Validator = (val: string) => isNaN(parseInt(val, 10)) ? t('validation.number.requiredInt', { key }) : undefined;
 
   const portNumber: Validator = (val: string) => parseInt(val, 10) < 1 || parseInt(val, 10) > 65535 ? t('validation.number.between', {
-    key: displayKey, min: '1', max: '65535'
+    key, min: '1', max: '65535'
   }) : undefined;
 
   const dnsChars: Validator = (val: string) => {
@@ -73,7 +92,7 @@ export default function(t: (key: string, options?: any) => string, opt: {display
 
     if (matchedChars) {
       return t('validation.chars', {
-        key: displayKey, count: matchedChars.length, chars: matchedChars.map(char => char === ' ' ? 'Space' : `"${ char }"`).join(', ')
+        key, count: matchedChars.length, chars: matchedChars.map(char => char === ' ' ? 'Space' : `"${ char }"`).join(', ')
       });
     }
 
@@ -82,24 +101,24 @@ export default function(t: (key: string, options?: any) => string, opt: {display
 
   // the weird edge case here deals with internationalized domain names which are prepended with 'xn--'
   // https://datatracker.ietf.org/doc/html/rfc5891#section-4.2.3.1
-  const dnsDoubleDash: Validator = (val: string) => (val?.substr(2, 2) === '--' && val?.substr(0, 2) !== 'xn') ? t(`validation.dns.doubleHyphen`, { key: displayKey }) : undefined;
+  const dnsDoubleDash: Validator = (val: string) => (val?.substr(2, 2) === '--' && val?.substr(0, 2) !== 'xn') ? t(`validation.dns.doubleHyphen`, { key }) : undefined;
 
-  const dnsIanaServiceNameDoubleDash: Validator = (val: string) => (val?.substr(2, 2) === '--' && val?.substr(0, 2) !== 'xn') ? t(`validation.dns.doubleHyphen`, { key: displayKey }) : undefined;
+  const dnsIanaServiceNameDoubleDash: Validator = (val: string) => (val?.substr(2, 2) === '--' && val?.substr(0, 2) !== 'xn') ? t(`validation.dns.doubleHyphen`, { key }) : undefined;
 
-  const dnsEmpty: ValidatorFactory = (label: string): Validator => (val = '') => val.length === 0 ? t(`validation.dns.${ label }.emptyLabel`, { key: displayKey, min: 1 }) : undefined;
+  const dnsEmpty: ValidatorFactory = (label: string): Validator => (val = '') => val.length === 0 ? t(`validation.dns.${ label }.emptyLabel`, { key, min: 1 }) : undefined;
 
-  const dnsTooLong: ValidatorFactory = (label: string, length = 63): Validator => (val = '') => val.length > length ? t(`validation.dns.${ label }.tooLongLabel`, { key: displayKey, max: length }) : undefined;
+  const dnsTooLong: ValidatorFactory = (label: string, length = 63): Validator => (val = '') => val.length > length ? t(`validation.dns.${ label }.tooLongLabel`, { key, max: length }) : undefined;
 
   // eslint-disable-next-line no-unused-vars
-  const hostnameEmpty: Validator = (val = '') => val.length === 0 ? t('validation.dns.hostname.empty', { key: displayKey }) : undefined;
+  const hostnameEmpty: Validator = (val = '') => val.length === 0 ? t('validation.dns.hostname.empty', { key }) : undefined;
 
-  const hostnameTooLong: Validator = (val = '') => val.length > 253 ? t('validation.dns.hostname.tooLong', { key: displayKey, max: 253 }) : undefined;
+  const hostnameTooLong: Validator = (val = '') => val.length > 253 ? t('validation.dns.hostname.tooLong', { key, max: 253 }) : undefined;
 
-  const absolutePath: Validator = (val = '') => val[0] !== '/' && val.length > 0 ? t('validation.path', { key: displayKey }) : undefined;
+  const absolutePath: Validator = (val = '') => val[0] !== '/' && val.length > 0 ? t('validation.path', { key }) : undefined;
 
-  const required: Validator = (val: any) => !val && val !== false ? t('validation.required', { key: displayKey }) : undefined;
+  const required: Validator = (val: any) => !val && val !== false ? t('validation.required', { key }) : undefined;
 
-  const noUpperCase: Validator = (val = '') => val.toLowerCase() !== val ? t('validation.noUpperCase', { key: displayKey }) : undefined;
+  const noUpperCase: Validator = (val = '') => val.toLowerCase() !== val ? t('validation.noUpperCase', { key }) : undefined;
 
   const cronSchedule: Validator = (val: string) => {
     try {
@@ -115,7 +134,7 @@ export default function(t: (key: string, options?: any) => string, opt: {display
     return isHttps;
   };
 
-  const interval: Validator = (val: string) => !/^\d+[hms]$/.test(val) ? t('validation.monitoring.route.interval', { key: displayKey }) : undefined;
+  const interval: Validator = (val: string) => !/^\d+[hms]$/.test(val) ? t('validation.monitoring.route.interval', { key }) : undefined;
 
   const containerImage: Validator = (val: any) => !val?.image ? t('workload.validation.containerImage', { name: val.name }) : undefined;
 
@@ -126,7 +145,7 @@ export default function(t: (key: string, options?: any) => string, opt: {display
       return t('validation.required', { key: t('workload.container.titles.containers') });
     }
 
-    // making sure each container has an imagename
+    // making sure each container has an image name
     return containers.map((container: any) => containerImage(container)).find((containerError: string) => containerError);
   };
 
@@ -415,7 +434,7 @@ export default function(t: (key: string, options?: any) => string, opt: {display
 
     if (matchedChars) {
       return t('validation.chars', {
-        key: displayKey, count: matchedChars.length, chars: matchedChars.map((char: string) => char === ' ' ? 'Space' : `"${ char }"`).join(', ')
+        key, count: matchedChars.length, chars: matchedChars.map((char: string) => char === ' ' ? 'Space' : `"${ char }"`).join(', ')
       });
     }
 
@@ -423,33 +442,39 @@ export default function(t: (key: string, options?: any) => string, opt: {display
   };
 
   return {
-    noUpperCase,
-    required,
-    requiredInt,
-    portNumber,
-    cronSchedule,
-    isHttps,
-    interval,
+    absolutePath,
+    backupTarget,
+    betweenLengths,
+    betweenValues,
+    clusterIp,
+    clusterName,
     containerImage,
     containerImages,
-    ruleGroups,
-    groupsAreValid,
-    matching,
-    clusterName,
-    roleTemplateRules,
-    servicePort,
-    clusterIp,
-    externalName,
-    backupTarget,
-    imageUrl,
-    fileRequired,
+    cronSchedule,
     dnsLabel,
     dnsLabelIanaServiceName,
     dnsLabelRestricted,
+    externalName,
+    fileRequired,
+    groupsAreValid,
     hostname,
-    testRule,
+    imageUrl,
+    interval,
+    isHttps,
+    matching,
+    maxLength,
+    maxValue,
+    minLength,
+    minValue,
+    noUpperCase,
+    portNumber,
+    required,
+    requiredInt,
+    roleTemplateRules,
+    ruleGroups,
+    servicePort,
     subDomain,
-    absolutePath,
+    testRule,
     wildcardHostname,
   };
 }

package/creators/update/init

@@ -1,54 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const fs = require('fs-extra');
-const { spawnSync } = require('child_process');
-
-const scriptFolder = __dirname;
-const dest = path.resolve('.');
-
-// Remove first two args
-let args = process.argv;
-args.splice(0, 2);
-
-const res = spawnSync(`${__dirname}/upgrade`, args, {
-  cwd: dest,
-  shell: false,
-  stdio: [ 'ignore', process.stdout, process.stderr ],
-});
-
-if (res.status !== 0) {
-  process.exit(res.status);
-}
-
-// Read the existing package.json
-let rawdata = fs.readFileSync(path.join(dest, 'package.json'));
-const appPackage = JSON.parse(rawdata);
-
-// Read the package.json from the app creator
-rawdata = fs.readFileSync(path.join(scriptFolder, 'app', 'package.json'));
-const latestPackage = JSON.parse(rawdata);
-
-// Read the package.json from the upgrade creator
-rawdata = fs.readFileSync(path.join(scriptFolder, 'package.json'));
-const upgradePackage = JSON.parse(rawdata);
-
-// Update dependency versions to match the latest from the creator
-Object.keys(latestPackage.dependencies).forEach((key) => {
-  const version = latestPackage.dependencies[key];
-
-  appPackage.dependencies[key] = version;
-});
-
-// Update the version of @rancher/shell
-const shellVersion = upgradePackage.version;
-
-appPackage.dependencies['@rancher/shell'] = shellVersion;
-
-fs.writeFileSync(path.join(dest, 'package.json'), JSON.stringify(appPackage, null, 2));
-
-spawnSync(`yarn`, ['install'], {
-  cwd: dest,
-  shell: false,
-  stdio: [ 'ignore', process.stdout, process.stderr ],
-});

package/creators/update/package.json

@@ -1,20 +0,0 @@
-{
-  "name": "@rancher/create-update",
-  "description": "Rancher UI Update helper",
-  "version": "0.0.0",
-  "license": "Apache-2.0",
-  "author": "SUSE",
-  "private": false,
-  "bin": "./init",
-  "files": [
-    "**/*.*",
-    "init",
-    "upgrade"
-  ],
-  "engines": {
-    "node": ">=12"
-  },
-  "dependencies": {
-    "fs-extra": "^10.0.0"
-  }
-}

package/creators/update/upgrade

@@ -1,56 +0,0 @@
-#!/usr/bin/env sh
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-echo "Upgrading Rancher Shell"
-
-# Get the version number from the package.json file
-VERSION=$(node -p -e "require('${SCRIPT_DIR}/package.json').version")
-
-echo "Updating to version: ${VERSION}"
-echo ""
-
-FORCE="false"
-
-if [ "$1" == "-f" ]; then
-  FORCE="true"
-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 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 yuor files - running in a clean git repsository will ensure you have visibility over changes made"
-  exit 1 
-fi
-
-# Check this is a Rancher Extension
-if [ ! -f "./package.json" ]; then
-  echo "Can't find package.json - check you're running from the correct folder"
-  exit 1 
-fi
-
-HAS_SHELL=$(grep "\"@rancher/shell\"" package.json -c )
-if [ "${HAS_SHELL}" != "1" ]; then
-  echo "package.json does not reference @rancher/shell - check you're running from the correct folder"
-  exit 1 
-fi
-
-# Copy files for the top-level folder (from the app creator)
-cp ${SCRIPT_DIR}/app/files/* .
-
-# Go through each folder in the pkg folder and update their files
-for pkg in ./pkg/*
-do
-  if [ -d "${pkg}" ]; then
-    pkgName=$(basename $pkg)
-    echo "Updating package ${pkgName}"
-
-    cp ${SCRIPT_DIR}/pkg/files/* ${pkg}
-  fi
-done

package/scripts/record-deps.js

@@ -1,37 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-// Script lives in shell/scripts, so work out top-level dir from there
-const topDir = path.resolve(__dirname, '..', '..');
-const dir = process.cwd();
-
-// Read the package.json file
-const topPkgFile = path.join(topDir, 'package.json');
-const pkgFile = path.join(dir, 'package.json');
-
-const topPkg = JSON.parse(fs.readFileSync(topPkgFile));
-const mainPkg = JSON.parse(fs.readFileSync(pkgFile));
-
-// Look to see if we specify the deps we require
-if (mainPkg._requires) {
-  // Map each one to the same version as the main package
-  const out = {};
-
-  mainPkg._requires.forEach((name) => {
-    let ver = topPkg.dependencies?.[name] || topPkg.devDependencies?.[name];
-
-    if (name === '@rancher/components') {
-      const componentsPkgFile = path.join(topDir, 'pkg', 'rancher-components', 'package.json');
-      const componentsPkg = JSON.parse(fs.readFileSync(componentsPkgFile));
-
-      ver = componentsPkg.version;
-    }
-
-    out[name] = ver;
-  });
-
-  mainPkg._pkgs = out;
-  delete mainPkg._requires;
-
-  fs.writeFileSync(pkgFile, JSON.stringify(mainPkg, null, 2), 'utf-8');
-}

package/scripts/typegen.sh

@@ -1,84 +0,0 @@
-#!/usr/bin/env bash
-
-SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
-SHELL_DIR=$BASE_DIR/shell
-
-echo "Generating typescript definitions"
-
-rm -rf ${SHELL_DIR}/tmp
-mkdir -p ${SHELL_DIR}/tmp
-
-echo "Generating ..."
-
-# utils
-${BASE_DIR}/node_modules/.bin/tsc shell/utils/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/utils > /dev/null
-
-# config
-${BASE_DIR}/node_modules/.bin/tsc shell/config/query-params.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc shell/config/table-headers.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc shell/config/types.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
-
-# store
-${BASE_DIR}/node_modules/.bin/tsc shell/store/features.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
-
-# plugins
-${BASE_DIR}/node_modules/.bin/tsc shell/plugins/dashboard-store/normalize.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc shell/plugins/dashboard-store/resource-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
-
-
-# mkixins
-${BASE_DIR}/node_modules/.bin/tsc shell/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null
-
-#./node_modules/.bin/tsc shell/plugins/dashboard-store/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store > /dev/null
-
-# Go through all of the folders and combine by wrapping with 'declare module'
-
-echo "Combining type definitions ..."
-
-DEST=${SHELL_DIR}/types/shell
-mkdir -p ${DEST}
-
-INDEX=${DEST}/index.d.ts
-rm -rf ${INDEX}
-
-echo "// Auto-generated type definitions for shell" > ${INDEX}
-echo "// Do not modify this file as changes will get overwritten" >> ${INDEX}
-
-# Copy in the vue shim type definitions
-if [ -f "$BASE_DIR/shell/types/vue-shim.d" ]; then
-  cat "$BASE_DIR/shell/types/vue-shim.d" >> ${INDEX}
-fi
-
-function processDir() {
-  local dir=$1
-  local basePkg=$2
-
-  for entry in $1/*
-  do
-    local filename=$(basename $entry)
-
-    if [ -d $entry ]; then
-      processDir $entry $basePkg/$filename
-    else
-      if [[ $filename == *.d.ts ]]; then
-        # We use convoluted mechanism here to ensure this works on mac with bash 3.x
-        local name=$(echo $filename | rev | cut -c6- | rev)
-
-        local module=${basePkg}/${name}
-        if [ "${name}" == "index" ]; then
-          module=${basePkg}
-        fi
-
-        echo -e "\n// ${module}\n" >> ${INDEX}
-        echo "declare module '${module}' {" >> ${INDEX}
-        cat $entry >> ${INDEX}
-        echo -e "}" >> ${INDEX}
-      fi
-    fi
-  done
-}
-
-processDir ${SHELL_DIR}/tmp @shell
-
-rm -rf ${SHELL_DIR}/tmp