ember-cli 6.10.0-alpha.1 → 6.10.0-beta.1

package/packages/blueprint-blueprint/files/blueprints/__name__/index.js

@@ -1,16 +0,0 @@
-'use strict';
-
-module.exports = {
-  description: ''
-
-  // locals(options) {
-  //   // Return custom template variables here.
-  //   return {
-  //     foo: options.entity.options.foo
-  //   };
-  // }
-
-  // afterInstall(options) {
-  //   // Perform extra work here.
-  // }
-};

package/packages/blueprint-blueprint/index.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = {
-  description: 'Generates a blueprint and definition.',
-};

package/packages/blueprint-blueprint/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "@ember-tooling/blueprint-blueprint",
-  "version": "0.3.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ember-cli/ember-cli.git",
-    "directory": "packages/blueprint-blueprint"
-  },
-  "license": "MIT",
-  "keywords": [
-    "ember-blueprint"
-  ]
-}

package/packages/blueprint-model/package.json

@@ -1,19 +0,0 @@
-{
-  "name": "@ember-tooling/blueprint-model",
-  "version": "0.5.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ember-cli/ember-cli.git",
-    "directory": "packages/blueprint-model"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "chalk": "^4.1.2",
-    "diff": "^7.0.0",
-    "isbinaryfile": "^5.0.4",
-    "lodash": "^4.17.21",
-    "promise.hash.helper": "^1.0.8",
-    "quick-temp": "^0.1.8",
-    "silent-error": "^1.1.1"
-  }
-}

package/packages/blueprint-model/utilities/directory-for-package-name.js

@@ -1,31 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-/**
- * Derive a directory name from a package name.
- * Takes scoped packages into account.
- *
- * @method directoryForPackageName
- * @param {String} packageName
- * @return {String} Derived directory name.
- */
-module.exports = function directoryForPackageName(packageName) {
-  let isScoped = packageName[0] === '@' && packageName.includes('/');
-
-  if (isScoped) {
-    let slashIndex = packageName.indexOf('/');
-    let scopeName = packageName.substring(1, slashIndex);
-    let packageNameWithoutScope = packageName.substring(slashIndex + 1);
-    let pathParts = process.cwd().split(path.sep);
-    let parentDirectoryContainsScopeName = pathParts.includes(scopeName);
-
-    if (parentDirectoryContainsScopeName) {
-      return packageNameWithoutScope;
-    } else {
-      return `${scopeName}-${packageNameWithoutScope}`;
-    }
-  } else {
-    return packageName;
-  }
-};

package/packages/blueprint-model/utilities/edit-file-diff.js

@@ -1,64 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const util = require('util');
-const jsdiff = require('diff');
-const quickTemp = require('quick-temp');
-const path = require('path');
-const SilentError = require('silent-error');
-const openEditor = require('./open-editor');
-const hash = require('promise.hash.helper');
-
-const readFile = util.promisify(fs.readFile);
-const writeFile = util.promisify(fs.writeFile);
-
-class EditFileDiff {
-  constructor(options) {
-    this.info = options.info;
-
-    quickTemp.makeOrRemake(this, 'tmpDifferenceDir');
-  }
-
-  edit() {
-    return hash({
-      input: this.info.render(),
-      output: readFile(this.info.outputPath),
-    })
-      .then(this.invokeEditor.bind(this))
-      .then(this.applyPatch.bind(this))
-      .finally(this.cleanUp.bind(this));
-  }
-
-  cleanUp() {
-    quickTemp.remove(this, 'tmpDifferenceDir');
-  }
-
-  applyPatch(resultHash) {
-    return hash({
-      diffString: readFile(resultHash.diffPath),
-      currentString: readFile(resultHash.outputPath),
-    }).then((result) => {
-      let appliedDiff = jsdiff.applyPatch(result.currentString.toString(), result.diffString.toString());
-
-      if (!appliedDiff) {
-        let message = 'Patch was not cleanly applied.';
-        this.info.ui.writeLine(`${message} Please choose another action.`);
-        throw new SilentError(message);
-      }
-
-      return writeFile(resultHash.outputPath, appliedDiff);
-    });
-  }
-
-  invokeEditor(result) {
-    let info = this.info;
-    let diff = jsdiff.createPatch(info.outputPath, result.output.toString(), result.input);
-    let diffPath = path.join(this.tmpDifferenceDir, 'currentDiff.diff');
-
-    return writeFile(diffPath, diff)
-      .then(() => openEditor(diffPath))
-      .then(() => ({ outputPath: info.outputPath, diffPath }));
-  }
-}
-
-module.exports = EditFileDiff;

package/packages/blueprint-model/utilities/experiments.js

@@ -1,63 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-
-/*
-  If you're here to remove the VITE experiment flag in favor of it being
-  permanently on, you can't do that until addressing
-  https://github.com/ember-cli/ember-cli/pull/10781#pullrequestreview-3230644293
-
-  A lot of test coverage would otherwise be lost, because valid tests are being
-  run only when the VITE experiment is off.
-*/
-const availableExperiments = Object.freeze(['EMBROIDER', 'CLASSIC', 'VITE']);
-
-const deprecatedExperiments = Object.freeze([]);
-const enabledExperiments = Object.freeze(['VITE']);
-const deprecatedExperimentsDeprecationsIssued = [];
-
-function isExperimentEnabled(experimentName) {
-  if (!availableExperiments.includes(experimentName)) {
-    return false;
-  }
-
-  if (process.env.EMBER_CLI_ENABLE_ALL_EXPERIMENTS && deprecatedExperiments.includes(experimentName)) {
-    return false;
-  }
-
-  if (process.env.EMBER_CLI_ENABLE_ALL_EXPERIMENTS) {
-    return true;
-  }
-
-  if (process.env.EMBER_CLI_CLASSIC && experimentName === 'EMBROIDER') {
-    return false;
-  }
-
-  let experimentEnvironmentVariable = `EMBER_CLI_${experimentName}`;
-  let experimentValue = process.env[experimentEnvironmentVariable];
-
-  if (deprecatedExperiments.includes(experimentName)) {
-    let deprecationPreviouslyIssued = deprecatedExperimentsDeprecationsIssued.includes(experimentName);
-    let isSpecifiedByUser = experimentValue !== undefined;
-
-    if (!deprecationPreviouslyIssued && isSpecifiedByUser) {
-      console.warn(
-        chalk.yellow(`The ${experimentName} experiment in ember-cli has been deprecated and will be removed.`)
-      );
-      deprecatedExperimentsDeprecationsIssued.push(experimentName);
-    }
-  }
-
-  if (enabledExperiments.includes(experimentName)) {
-    return experimentValue !== 'false';
-  } else {
-    return experimentValue !== undefined && experimentValue !== 'false';
-  }
-}
-
-module.exports = {
-  isExperimentEnabled,
-
-  // exported for testing purposes
-  _deprecatedExperimentsDeprecationsIssued: deprecatedExperimentsDeprecationsIssued,
-};

package/packages/blueprint-model/utilities/file-info.js

@@ -1,170 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const util = require('util');
-const chalk = require('chalk');
-const EditFileDiff = require('./edit-file-diff');
-const EOL = require('os').EOL;
-const rxEOL = new RegExp(EOL, 'g');
-const isBinaryFile = require('isbinaryfile').isBinaryFileSync;
-const hash = require('promise.hash.helper');
-const canEdit = require('./open-editor').canEdit;
-const processTemplate = require('./process-template');
-
-const readFile = util.promisify(fs.readFile);
-const lstat = util.promisify(fs.stat);
-
-function diffHighlight(line) {
-  if (line[0] === '+') {
-    return chalk.green(line);
-  } else if (line[0] === '-') {
-    return chalk.red(line);
-  } else if (/^@@/.test(line)) {
-    return chalk.cyan(line);
-  } else {
-    return line;
-  }
-}
-
-const NOOP = (_) => _;
-class FileInfo {
-  constructor(options) {
-    this.action = options.action;
-    this.outputBasePath = options.outputBasePath;
-    this.outputPath = options.outputPath;
-    this.displayPath = options.displayPath;
-    this.inputPath = options.inputPath;
-    this.templateVariables = options.templateVariables;
-    this.replacer = options.replacer || NOOP;
-    this.ui = options.ui;
-  }
-
-  confirmOverwrite(path) {
-    let promptOptions = {
-      type: 'expand',
-      name: 'answer',
-      default: false,
-      message: `${chalk.red('Overwrite')} ${path}?`,
-      choices: [
-        { key: 'y', name: 'Yes, overwrite', value: 'overwrite' },
-        { key: 'n', name: 'No, skip', value: 'skip' },
-      ],
-    };
-
-    let outputPathIsFile = false;
-    try {
-      outputPathIsFile = fs.statSync(this.outputPath).isFile();
-    } catch (err) {
-      /* ignore */
-    }
-
-    let canDiff = !isBinaryFile(this.inputPath) && (!outputPathIsFile || !isBinaryFile(this.outputPath));
-
-    if (canDiff) {
-      promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' });
-
-      if (canEdit()) {
-        promptOptions.choices.push({ key: 'e', name: 'Edit', value: 'edit' });
-      }
-    }
-
-    return this.ui.prompt(promptOptions).then((response) => response.answer);
-  }
-
-  displayDiff() {
-    let info = this,
-      jsdiff = require('diff');
-    return hash({
-      input: this.render(),
-      output: readFile(info.outputPath),
-    }).then((result) => {
-      let diff = jsdiff.createPatch(
-        info.outputPath,
-        result.output.toString().replace(rxEOL, '\n'),
-        result.input.replace(rxEOL, '\n')
-      );
-      let lines = diff.split('\n');
-
-      for (let i = 0; i < lines.length; i++) {
-        info.ui.write(diffHighlight(lines[i] + EOL));
-      }
-    });
-  }
-
-  async render() {
-    if (!this.rendered) {
-      let result = await this._render();
-      this.rendered = this.replacer(result, this);
-    }
-
-    return this.rendered;
-  }
-
-  _render() {
-    let path = this.inputPath;
-    let context = this.templateVariables;
-
-    return readFile(path).then((content) =>
-      lstat(path).then((fileStat) => {
-        if (isBinaryFile(content, fileStat.size)) {
-          return content;
-        } else {
-          try {
-            return processTemplate(content.toString(), context);
-          } catch (err) {
-            err.message += ` (Error in blueprint template: ${path})`;
-            throw err;
-          }
-        }
-      })
-    );
-  }
-
-  checkForConflict() {
-    return this.render().then((input) => {
-      input = input.toString().replace(rxEOL, '\n');
-
-      return readFile(this.outputPath)
-        .then((output) => {
-          output = output.toString().replace(rxEOL, '\n');
-
-          return input === output ? 'identical' : 'confirm';
-        })
-        .catch((e) => {
-          if (e.code === 'ENOENT') {
-            return 'none';
-          }
-
-          throw e;
-        });
-    });
-  }
-
-  confirmOverwriteTask() {
-    let info = this;
-
-    return function () {
-      function doConfirm() {
-        return info.confirmOverwrite(info.displayPath).then((action) => {
-          if (action === 'diff') {
-            return info.displayDiff().then(doConfirm);
-          } else if (action === 'edit') {
-            let editFileDiff = new EditFileDiff({ info });
-            return editFileDiff
-              .edit()
-              .then(() => (info.action = action))
-              .catch(() => doConfirm())
-              .then(() => info);
-          } else {
-            info.action = action;
-            return info;
-          }
-        });
-      }
-
-      return doConfirm();
-    };
-  }
-}
-
-module.exports = FileInfo;

package/packages/blueprint-model/utilities/open-editor.js

@@ -1,44 +0,0 @@
-'use strict';
-
-const spawn = require('child_process').spawn;
-
-function openEditor(file) {
-  if (!openEditor.canEdit()) {
-    throw new Error('EDITOR environment variable is not set');
-  }
-
-  if (!file) {
-    throw new Error('No `file` option provided');
-  }
-
-  let editorArgs = openEditor._env().EDITOR.split(' ');
-  let editor = editorArgs.shift();
-  const args = [file].concat(editorArgs);
-  let editProcess = openEditor._spawn(editor, args, { stdio: 'inherit' });
-
-  return new Promise((resolve, reject) => {
-    editProcess.on('close', (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(
-          new Error(`Spawn('${editor}', [${args.join(',')}]) exited with a non zero error status code: '${code}'`)
-        );
-      }
-    });
-  });
-}
-
-openEditor.canEdit = function () {
-  return openEditor._env().EDITOR !== undefined;
-};
-
-openEditor._env = function () {
-  return process.env;
-};
-
-openEditor._spawn = function () {
-  return spawn.apply(this, arguments);
-};
-
-module.exports = openEditor;

package/packages/blueprint-model/utilities/prepend-emoji.js

@@ -1,12 +0,0 @@
-'use strict';
-
-function supportEmoji() {
-  const hasEmojiTurnedOff = process.argv.indexOf('--no-emoji') > -1;
-  return process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff;
-}
-
-const areEmojiSupported = supportEmoji();
-
-module.exports = function prependEmoji(emoji, msg) {
-  return areEmojiSupported ? `${emoji}  ${msg}` : msg;
-};

package/packages/blueprint-model/utilities/process-template.js

@@ -1,10 +0,0 @@
-'use strict';
-
-module.exports = function processTemplate(content, context) {
-  let options = {
-    evaluate: /<%([\s\S]+?)%>/g,
-    interpolate: /<%=([\s\S]+?)%>/g,
-    escape: /<%-([\s\S]+?)%>/g,
-  };
-  return require('lodash/template')(content, options)(context);
-};