@storybook/cli 7.0.0-alpha.3 → 7.0.0-alpha.33

package/dist/cjs/repro-generators/scripts.js

@@ -1,317 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.exec = exports.createAndInit = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _path = _interopRequireDefault(require("path"));
-
-var _fsExtra = require("fs-extra");
-
-var _shelljs = _interopRequireDefault(require("shelljs"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _execa = require("execa");
-
-var _configs = require("./configs");
-
-var _versions = _interopRequireDefault(require("../versions"));
-
-const _excluded = ["name", "version"];
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-const logger = console;
-const useLocalSbCli = true;
-
-const exec = async (command, options = {}, {
-  startMessage,
-  errorMessage
-} = {}) => {
-  if (startMessage) {
-    logger.info(startMessage);
-  }
-
-  logger.debug(command);
-  return new Promise((resolve, reject) => {
-    const defaultOptions = {
-      silent: false
-    };
-
-    const child = _shelljs.default.exec(command, Object.assign({}, defaultOptions, options, {
-      async: true,
-      silent: false
-    }));
-
-    child.stderr.pipe(process.stderr);
-    child.stdout.pipe(process.stdout);
-    child.on('exit', code => {
-      if (code === 0) {
-        resolve(undefined);
-      } else {
-        logger.error(_chalk.default.red(`An error occurred while executing: \`${command}\``));
-        logger.log(errorMessage);
-        reject(new Error(`command exited with code: ${code}: `));
-      }
-    });
-  });
-};
-
-exports.exec = exec;
-
-const addPackageResolutions = async ({
-  cwd
-}) => {
-  logger.info(`🔢 Adding package resolutions:`);
-
-  const packageJsonPath = _path.default.join(cwd, 'package.json');
-
-  const packageJson = await (0, _fsExtra.readJSON)(packageJsonPath);
-  packageJson.resolutions = _versions.default;
-  await (0, _fsExtra.writeJSON)(packageJsonPath, packageJson, {
-    spaces: 2
-  });
-};
-
-const addLocalPackageResolutions = async ({
-  cwd
-}) => {
-  logger.info(`🔢 Adding package resolutions:`);
-
-  const packageJsonPath = _path.default.join(cwd, 'package.json');
-
-  const packageJson = await (0, _fsExtra.readJSON)(packageJsonPath);
-
-  const workspaceDir = _path.default.join(__dirname, '..', '..', '..', '..', '..');
-
-  const {
-    stdout
-  } = await (0, _execa.command)('yarn workspaces list --json', {
-    cwd: workspaceDir
-  });
-  console.log({
-    stdout,
-    workspaceDir
-  });
-  const workspaces = JSON.parse(`[${stdout.split('\n').join(',')}]`);
-  console.log({
-    workspaces
-  });
-  packageJson.resolutions = Object.keys(_versions.default).reduce((acc, key) => {
-    return Object.assign({}, acc, {
-      [key]: _path.default.join(workspaceDir, workspaces.find(item => item.name === key).location)
-    });
-  }, {});
-  await (0, _fsExtra.writeJSON)(packageJsonPath, packageJson, {
-    spaces: 2
-  });
-};
-
-const installYarn2 = async ({
-  cwd,
-  pnp,
-  name
-}) => {
-  const command = [`yarn set version berry`, `yarn config set enableGlobalCache true`, `yarn config set nodeLinker ${pnp ? 'pnp' : 'node-modules'}`]; // FIXME: Some dependencies used by CRA aren't listed in its package.json
-  // Next line is a hack to remove as soon as CRA will have added these missing deps
-  // for details see https://github.com/facebook/create-react-app/pull/11751
-
-  if ([_configs.cra.name, _configs.cra_typescript.name].includes(name)) {
-    command.push(`yarn config set packageExtensions --json '{ "babel-preset-react-app@10.0.x": { "dependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.16.0" } } }'`);
-  }
-
-  await exec(command.join(' && '), {
-    cwd
-  }, {
-    startMessage: `🧶 Installing Yarn 2`,
-    errorMessage: `🚨 Installing Yarn 2 failed`
-  });
-};
-
-const configureYarn2ForE2E = async ({
-  cwd
-}) => {
-  const command = [// ⚠️ Need to set registry because Yarn 2 is not using the conf of Yarn 1 (URL is hardcoded in CircleCI config.yml)
-  `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6000/" } }'`, // Some required magic to be able to fetch deps from local registry
-  `yarn config set unsafeHttpWhitelist --json '["localhost"]'`, // Disable fallback mode to make sure everything is required correctly
-  `yarn config set pnpFallbackMode none`, // We need to be able to update lockfile when bootstrapping the examples
-  `yarn config set enableImmutableInstalls false`, // Discard all YN0013 - FETCH_NOT_CACHED messages
-  `yarn config set logFilters --json '[ { "code": "YN0013", "level": "discard" } ]'`].join(' && ');
-  await exec(command, {
-    cwd
-  }, {
-    startMessage: `🎛 Configuring Yarn 2`,
-    errorMessage: `🚨 Configuring Yarn 2 failed`
-  });
-};
-
-const generate = async ({
-  cwd,
-  name,
-  appName,
-  version,
-  generator
-}) => {
-  const command = generator.replace(/{{appName}}/g, appName).replace(/{{version}}/g, version);
-  await exec(command, {
-    cwd
-  }, {
-    startMessage: `🏗 Bootstrapping ${name} project (this might take a few minutes)`,
-    errorMessage: `🚨 Bootstrapping ${name} failed`
-  });
-};
-
-const addAdditionalFiles = async ({
-  additionalFiles,
-  cwd
-}) => {
-  logger.info(`⤵️ Adding required files`);
-  await Promise.all(additionalFiles.map(async file => {
-    await (0, _fsExtra.outputFile)(_path.default.resolve(cwd, file.path), file.contents, {
-      encoding: 'UTF-8'
-    });
-  }));
-};
-
-const initStorybook = async ({
-  cwd,
-  autoDetect = true,
-  name,
-  e2e,
-  pnp
-}) => {
-  const flags = ['--yes'];
-
-  if (!autoDetect) {
-    flags.push(`--type ${name}`);
-  }
-
-  if (e2e) {
-    flags.push('--linkable');
-  }
-
-  if (pnp) {
-    flags.push('--use-pnp');
-  }
-
-  const sbCLICommand = useLocalSbCli ? `node ${_path.default.join(__dirname, '../../esm/generate')}` : `yarn dlx -p @storybook/cli sb`;
-  const command = `${sbCLICommand} init ${flags.join(' ')}`;
-  await exec(command, {
-    cwd
-  }, {
-    startMessage: `🎨 Initializing Storybook with @storybook/cli`,
-    errorMessage: `🚨 Storybook initialization failed`
-  });
-};
-
-const addRequiredDeps = async ({
-  cwd,
-  additionalDeps
-}) => {
-  // Remove any lockfile generated without Yarn 2
-  _shelljs.default.rm('-f', _path.default.join(cwd, 'package-lock.json'), _path.default.join(cwd, 'yarn.lock'));
-
-  const command = additionalDeps && additionalDeps.length > 0 ? `yarn add -D ${additionalDeps.join(' ')}` : `yarn install`;
-  await exec(command, {
-    cwd
-  }, {
-    startMessage: `🌍 Adding needed deps & installing all deps`,
-    errorMessage: `🚨 Dependencies installation failed`
-  });
-};
-
-const addTypescript = async ({
-  cwd
-}) => {
-  logger.info(`👮 Adding typescript and tsconfig.json`);
-
-  try {
-    await exec(`yarn add -D typescript@latest`, {
-      cwd
-    });
-    const tsConfig = {
-      compilerOptions: {
-        baseUrl: '.',
-        esModuleInterop: true,
-        jsx: 'preserve',
-        skipLibCheck: true,
-        strict: true
-      },
-      include: ['src/*']
-    };
-
-    const tsConfigJsonPath = _path.default.resolve(cwd, 'tsconfig.json');
-
-    await (0, _fsExtra.writeJSON)(tsConfigJsonPath, tsConfig, {
-      encoding: 'utf8',
-      spaces: 2
-    });
-  } catch (e) {
-    logger.error(`🚨 Creating tsconfig.json failed`);
-    throw e;
-  }
-};
-
-const doTask = async (task, options, condition = true) => {
-  if (condition) {
-    await task(options);
-    logger.log();
-  }
-};
-
-const createAndInit = async (cwd, _ref, {
-  e2e,
-  pnp,
-  local
-}) => {
-  let {
-    name,
-    version
-  } = _ref,
-      rest = _objectWithoutPropertiesLoose(_ref, _excluded);
-
-  const options = Object.assign({
-    name,
-    version,
-    appName: _path.default.basename(cwd),
-    creationPath: _path.default.join(cwd, '..'),
-    cwd,
-    e2e,
-    pnp
-  }, rest);
-  logger.log();
-  logger.info(`🏃 Starting for ${name} ${version}`);
-  logger.log();
-  await doTask(generate, Object.assign({}, options, {
-    cwd: options.creationPath
-  }));
-  await doTask(addAdditionalFiles, Object.assign({}, options, {
-    cwd
-  }), !!options.additionalFiles);
-
-  if (e2e) {
-    await doTask(addPackageResolutions, options);
-  }
-
-  if (local) {
-    await doTask(addLocalPackageResolutions, options);
-  }
-
-  await doTask(installYarn2, options);
-
-  if (e2e) {
-    await doTask(configureYarn2ForE2E, options, e2e);
-  }
-
-  await doTask(addTypescript, options, !!options.typescript);
-  await doTask(addRequiredDeps, options);
-  await doTask(initStorybook, options);
-};
-
-exports.createAndInit = createAndInit;

package/dist/cjs/repro.js

@@ -1,196 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.repro = void 0;
-
-require("core-js/modules/es.object.from-entries.js");
-
-require("core-js/modules/es.promise.js");
-
-var _prompts = _interopRequireDefault(require("prompts"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _path = _interopRequireDefault(require("path"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _boxen = _interopRequireDefault(require("boxen"));
-
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
-
-var _scripts = require("./repro-generators/scripts");
-
-var configs = _interopRequireWildcard(require("./repro-generators/configs"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const logger = console;
-const TEMPLATES = configs; // Create a curate list of template because some of them only make sense in E2E
-// context, fon instance react_in_yarn_workspace
-
-const CURATED_TEMPLATES = Object.fromEntries(Object.entries(configs).filter(entry => entry[0] !== 'react_in_yarn_workspace'));
-const RENDERERS = Object.values(CURATED_TEMPLATES).reduce((acc, cur) => {
-  acc[cur.renderer] = [...(acc[cur.renderer] || []), cur];
-  return acc;
-}, {});
-
-const repro = async ({
-  outputDirectory,
-  list,
-  template,
-  renderer,
-  generator,
-  e2e,
-  local,
-  pnp
-}) => {
-  logger.info((0, _boxen.default)((0, _tsDedent.default)`
-        🤗 Welcome to ${_chalk.default.yellow('sb repro')}! 🤗 
-
-        Create a ${_chalk.default.green('new project')} to minimally reproduce Storybook issues.
-        
-        1. select an environment that most closely matches your project setup.
-        2. select a location for the reproduction, outside of your project.
-        
-        After the reproduction is ready, we'll guide you through the next steps.
-        `.trim(), {
-    borderStyle: 'round',
-    padding: 1,
-    borderColor: '#F1618C'
-  }));
-
-  if (list) {
-    logger.info('🌈 Available templates');
-    Object.entries(RENDERERS).forEach(([r, templates]) => {
-      logger.info(r);
-      templates.forEach(t => logger.info(`- ${t.name}`));
-
-      if (r === 'other') {
-        logger.info('- blank');
-      }
-    });
-    return;
-  }
-
-  let selectedTemplate = template;
-  let selectedRenderer = renderer;
-
-  if (!selectedTemplate && !generator) {
-    if (!selectedRenderer) {
-      const {
-        renderer: rendererOpt
-      } = await (0, _prompts.default)({
-        type: 'select',
-        message: '🌈 Select the repro renderer',
-        name: 'renderer',
-        choices: Object.keys(RENDERERS).map(f => ({
-          title: f,
-          value: f
-        }))
-      });
-      selectedRenderer = rendererOpt;
-    }
-
-    if (!selectedRenderer) {
-      throw new Error('🚨 Repro: please select a renderer!');
-    }
-
-    selectedTemplate = (await (0, _prompts.default)({
-      type: 'select',
-      message: '📝 Select the repro base template',
-      name: 'template',
-      choices: RENDERERS[selectedRenderer].map(f => ({
-        title: f.name,
-        value: f.name
-      }))
-    })).template;
-  }
-
-  const selectedConfig = !generator ? TEMPLATES[selectedTemplate] : {
-    name: 'custom',
-    version: 'custom',
-    generator
-  };
-
-  if (!selectedConfig) {
-    throw new Error('🚨 Repro: please specify a valid template type');
-  }
-
-  let selectedDirectory = outputDirectory;
-
-  if (!selectedDirectory) {
-    const {
-      directory
-    } = await (0, _prompts.default)({
-      type: 'text',
-      message: 'Enter the output directory',
-      name: 'directory',
-      initial: selectedConfig.name,
-      validate: directoryName => _fs.default.existsSync(directoryName) ? `${directoryName} already exists. Please choose another name.` : true
-    });
-    selectedDirectory = directory;
-  }
-
-  try {
-    const cwd = _path.default.isAbsolute(selectedDirectory) ? selectedDirectory : _path.default.join(process.cwd(), selectedDirectory);
-    logger.info(`🏃 Running ${selectedTemplate} into ${cwd}`);
-    await (0, _scripts.createAndInit)(cwd, selectedConfig, {
-      e2e: !!e2e,
-      pnp: !!pnp,
-      local: !!local
-    });
-
-    if (!e2e) {
-      await initGitRepo(cwd);
-    }
-
-    logger.info((0, _boxen.default)((0, _tsDedent.default)`
-        🎉 Your Storybook reproduction project is ready to use! 🎉
-
-        ${_chalk.default.yellow(`cd ${selectedDirectory}`)}
-        ${_chalk.default.yellow(`yarn storybook`)}
-
-        Once you've recreated the problem you're experiencing, please:
-        
-        1. Document any additional steps in ${_chalk.default.cyan('README.md')}
-        2. Publish the repository to github
-        3. Link to the repro repository in your issue
-
-        Having a clean repro helps us solve your issue faster! 🙏
-      `.trim(), {
-      borderStyle: 'round',
-      padding: 1,
-      borderColor: '#F1618C'
-    }));
-  } catch (error) {
-    logger.error('🚨 Failed to create repro');
-    throw error;
-  }
-};
-
-exports.repro = repro;
-
-const initGitRepo = async cwd => {
-  await (0, _scripts.exec)('git init', {
-    cwd
-  });
-  await (0, _scripts.exec)('echo "node_modules" >> .gitignore', {
-    cwd
-  });
-  await (0, _scripts.exec)('git add --all', {
-    cwd
-  });
-  await (0, _scripts.exec)('git commit -am "added storybook"', {
-    cwd
-  });
-  await (0, _scripts.exec)('git tag repro-base', {
-    cwd
-  });
-};

package/dist/cjs/typings.d.ts

@@ -1,3 +0,0 @@
-declare module '@storybook/codemod';
-declare module 'envinfo';
-declare module '@storybook/semver';

package/dist/cjs/upgrade.js

@@ -1,174 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.upgrade = exports.isCorePackage = exports.getStorybookVersion = exports.checkVersionConsistency = exports.addExtraFlags = void 0;
-
-require("core-js/modules/es.array.sort.js");
-
-require("core-js/modules/es.promise.js");
-
-var _crossSpawn = require("cross-spawn");
-
-var _telemetry = require("@storybook/telemetry");
-
-var _semver = _interopRequireDefault(require("@storybook/semver"));
-
-var _nodeLogger = require("@storybook/node-logger");
-
-var _jsPackageManager = require("./js-package-manager");
-
-var _helpers = require("./helpers");
-
-var _automigrate = require("./automigrate");
-
-const _excluded = ["prerelease", "skipCheck", "useNpm", "dryRun", "yes"];
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-const versionRegex = /(@storybook\/[^@]+)@(\S+)/;
-
-const getStorybookVersion = line => {
-  if (line.startsWith('npm ')) return null;
-  const match = versionRegex.exec(line);
-  if (!match || !_semver.default.clean(match[2])) return null;
-  return {
-    package: match[1],
-    version: match[2]
-  };
-};
-
-exports.getStorybookVersion = getStorybookVersion;
-const excludeList = ['@storybook/linter-config', '@storybook/design-system', '@storybook/ember-cli-storybook', '@storybook/semver', '@storybook/eslint-config-storybook', '@storybook/bench', '@storybook/addon-bench', '@storybook/addon-console', '@storybook/csf', '@storybook/storybook-deployer', '@storybook/addon-postcss', '@storybook/react-docgen-typescript-plugin', '@storybook/babel-plugin-require-context-hook', '@storybook/builder-vite', '@storybook/mdx1-csf', '@storybook/mdx2-csf', '@storybook/expect', '@storybook/jest', '@storybook/test-runner', '@storybook/testing-library'];
-
-const isCorePackage = pkg => pkg.startsWith('@storybook/') && !pkg.startsWith('@storybook/preset-') && !excludeList.includes(pkg);
-
-exports.isCorePackage = isCorePackage;
-const deprecatedPackages = [{
-  minVersion: '6.0.0-alpha.0',
-  url: 'https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#60-deprecations',
-  deprecations: ['@storybook/addon-notes', '@storybook/addon-info', '@storybook/addon-contexts', '@storybook/addon-options', '@storybook/addon-centered']
-}];
-
-const formatPackage = pkg => `${pkg.package}@${pkg.version}`;
-
-const warnPackages = pkgs => pkgs.forEach(pkg => _nodeLogger.logger.warn(`- ${formatPackage(pkg)}`));
-
-const checkVersionConsistency = () => {
-  const lines = (0, _crossSpawn.sync)('npm', ['ls'], {
-    stdio: 'pipe'
-  }).output.toString().split('\n');
-  const storybookPackages = lines.map(getStorybookVersion).filter(Boolean).filter(pkg => isCorePackage(pkg.package));
-
-  if (!storybookPackages.length) {
-    _nodeLogger.logger.warn('No storybook core packages found.');
-
-    _nodeLogger.logger.warn(`'npm ls | grep storybook' can show if multiple versions are installed.`);
-
-    return;
-  }
-
-  storybookPackages.sort((a, b) => _semver.default.rcompare(a.version, b.version));
-  const latestVersion = storybookPackages[0].version;
-  const outdated = storybookPackages.filter(pkg => pkg.version !== latestVersion);
-
-  if (outdated.length > 0) {
-    _nodeLogger.logger.warn(`Found ${outdated.length} outdated packages (relative to '${formatPackage(storybookPackages[0])}')`);
-
-    _nodeLogger.logger.warn('Please make sure your packages are updated to ensure a consistent experience.');
-
-    warnPackages(outdated);
-  }
-
-  deprecatedPackages.forEach(({
-    minVersion,
-    url,
-    deprecations
-  }) => {
-    if (_semver.default.gte(latestVersion, minVersion)) {
-      const deprecated = storybookPackages.filter(pkg => deprecations.includes(pkg.package));
-
-      if (deprecated.length > 0) {
-        _nodeLogger.logger.warn(`Found ${deprecated.length} deprecated packages since ${minVersion}`);
-
-        _nodeLogger.logger.warn(`See ${url}`);
-
-        warnPackages(deprecated);
-      }
-    }
-  });
-};
-
-exports.checkVersionConsistency = checkVersionConsistency;
-const EXTRA_FLAGS = {
-  'react-scripts@<5': ['--reject', '/preset-create-react-app/']
-};
-
-const addExtraFlags = (extraFlags, flags, {
-  dependencies,
-  devDependencies
-}) => {
-  return Object.entries(extraFlags).reduce((acc, entry) => {
-    const [pattern, extra] = entry;
-    const [pkg, specifier] = (0, _jsPackageManager.getPackageDetails)(pattern);
-    const pkgVersion = dependencies[pkg] || devDependencies[pkg];
-
-    if (pkgVersion && _semver.default.satisfies(_semver.default.coerce(pkgVersion), specifier)) {
-      return [...acc, ...extra];
-    }
-
-    return acc;
-  }, [...flags]);
-};
-
-exports.addExtraFlags = addExtraFlags;
-
-const upgrade = async _ref => {
-  let {
-    prerelease,
-    skipCheck,
-    useNpm,
-    dryRun,
-    yes
-  } = _ref,
-      options = _objectWithoutPropertiesLoose(_ref, _excluded);
-
-  const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager(useNpm);
-
-  (0, _helpers.commandLog)(`Checking for latest versions of '@storybook/*' packages`);
-
-  if (!options.disableTelemetry) {
-    (0, _telemetry.telemetry)('upgrade', {
-      prerelease
-    });
-  }
-
-  let flags = [];
-  if (!dryRun) flags.push('--upgrade');
-  flags.push('--target');
-  flags.push(prerelease ? 'greatest' : 'latest');
-  flags = addExtraFlags(EXTRA_FLAGS, flags, packageManager.retrievePackageJson());
-  const check = (0, _crossSpawn.sync)('npx', ['npm-check-updates@latest', '/storybook/', ...flags], {
-    stdio: 'pipe'
-  }).output.toString();
-
-  _nodeLogger.logger.info(check);
-
-  if (!dryRun) {
-    (0, _helpers.commandLog)(`Installing upgrades`);
-    packageManager.installDependencies();
-  }
-
-  if (!skipCheck) {
-    checkVersionConsistency();
-    await (0, _automigrate.automigrate)({
-      dryRun,
-      yes
-    });
-  }
-};
-
-exports.upgrade = upgrade;