ember-cli 7.1.0 → 7.2.0-alpha.2

package/lib/commands/generate.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const { default: chalk } = require('chalk');
 const Command = require('../models/command');
-const Blueprint = require('../models/blueprint');
+const Blueprint = require('@ember-tooling/blueprint-model');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
 const merge = require('lodash/merge');
 const reject = require('lodash/reject');

package/lib/models/command.js

@@ -6,7 +6,7 @@ const path = require('path');
 const isGitRepo = require('is-git-url');
 const camelize = require('ember-cli-string-utils').camelize;
 const getCallerFile = require('get-caller-file');
-const printCommand = require('../utilities/print-command');
+const printCommand = require('@ember-tooling/blueprint-model/utilities/print-command');
 const union = require('lodash/union');
 const defaults = require('lodash/defaults');
 const uniq = require('lodash/uniq');

package/lib/models/package-info-cache/package-info.js

@@ -4,7 +4,7 @@ const path = require('path');
 const ErrorList = require('./error-list');
 const Errors = require('./errors');
 const AddonInfo = require('../addon-info');
-const isAddon = require('../../utilities/is-addon');
+const isAddon = require('@ember-tooling/blueprint-model/utilities/is-addon');
 const isEngine = require('../../utilities/is-engine');
 const isLazyEngine = require('../../utilities/is-lazy-engine');
 const logger = require('heimdalljs-logger')('ember-cli:package-info-cache:package-info');

package/lib/models/project.js

@@ -523,15 +523,23 @@ class Project {
    */
   blueprintLookupPaths() {
     if (this.isEmberCLIProject()) {
-      let lookupPaths = [this.localBlueprintLookupPath()];
-      let addonLookupPaths = this.addonBlueprintLookupPaths();
-
-      return lookupPaths.concat(addonLookupPaths);
+      return [this.localBlueprintLookupPath(), ...this.addonBlueprintLookupPaths(), this.builtInLookupPath()];
     } else {
-      return this.addonBlueprintLookupPaths();
+      return [...this.addonBlueprintLookupPaths(), this.builtInLookupPath()];
     }
   }
 
+  /**
+   * Returns the built-in ember-cli path for looking up blueprints
+   *
+   * @private
+   * @method builtInLookupPath
+   * @return {string} path to the ember-cli built-in blueprints
+   */
+  builtInLookupPath() {
+    return path.resolve(__dirname, '..', '..', 'blueprints');
+  }
+
   /**
     Returns a list of addon paths where blueprints will be looked up.
 

package/lib/tasks/generate-from-blueprint.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Blueprint = require('../models/blueprint');
+const Blueprint = require('@ember-tooling/blueprint-model');
 const Task = require('../models/task');
 const parseOptions = require('../utilities/parse-options');
 const logger = require('heimdalljs-logger')('ember-cli:generate-from-blueprint');

package/lib/tasks/install-blueprint.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const fs = require('fs-extra');
-const Blueprint = require('../models/blueprint');
+const Blueprint = require('@ember-tooling/blueprint-model');
 const Task = require('../models/task');
 const os = require('os');
 const path = require('path');
@@ -186,7 +186,9 @@ class InstallBlueprintTask extends Task {
     logger.info(`Checking for "ember-blueprint" keyword in "${packageName}" module ...`);
     let pkg = require(this._resolvePackageJSON(modulePath));
     if (!pkg || !pkg.keywords || pkg.keywords.indexOf('ember-blueprint') === -1) {
-      throw new SilentError(`The package '${packageName}' is not a valid Ember CLI blueprint.`);
+      throw new SilentError(
+        `The package '${packageName}' is not a valid Ember CLI blueprint. The package.json keywords list must include "ember-blueprint".`
+      );
     }
   }
 

package/lib/utilities/merge-blueprint-options.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const SilentError = require('silent-error');
-const Blueprint = require('../models/blueprint');
+const Blueprint = require('@ember-tooling/blueprint-model');
 
 /*
  * Helper for commands that use a blueprint to merge the blueprint's options

package/lib/utilities/version-utils.js

@@ -3,11 +3,12 @@
 const fs = require('fs');
 const path = require('path');
 const getRepoInfo = require('git-repo-info');
+const version = require('../../package.json').version;
 
 module.exports = {
   emberCLIVersion() {
     let gitPath = path.join(__dirname, '..', '..', '.git');
-    let output = [require('../../package.json').version];
+    let output = [version];
 
     if (fs.existsSync(gitPath)) {
       let { branch, abbreviatedSha } = getRepoInfo(gitPath);
@@ -21,6 +22,10 @@ module.exports = {
     return output.join('-');
   },
 
+  emberCLIBareVersion() {
+    return version;
+  },
+
   isDevelopment(version) {
     // match postfix SHA in dev version
     return /\b[0-9a-f]{5,40}\b/.test(version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "7.1.0",
+  "version": "7.2.0-alpha.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -26,10 +26,16 @@
   "bin": {
     "ember": "./bin/ember"
   },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
+  },
   "dependencies": {
-    "@ember-tooling/blueprint-blueprint": "^0.3.0",
-    "@ember-tooling/blueprint-model": "^0.7.0",
-    "@ember/app-blueprint": "~7.1.0",
+    "@ember/app-blueprint": "~7.2.0-alpha.1",
     "@pnpm/find-workspace-dir": "^1000.1.5",
     "babel-remove-types": "^2.0.0",
     "broccoli": "^4.0.0",
@@ -82,10 +88,10 @@
     "is-git-url": "^1.0.0",
     "is-language-code": "^5.1.3",
     "lodash": "^4.18.1",
-    "markdown-it": "^14.2.0",
+    "markdown-it": "^14.1.1",
     "markdown-it-terminal": "^0.4.0",
     "minimatch": "^10.2.5",
-    "morgan": "^1.11.0",
+    "morgan": "^1.10.1",
     "nopt": "^3.0.6",
     "npm-package-arg": "^13.0.2",
     "os-locale": "^6.0.2",
@@ -98,20 +104,22 @@
     "resolve-package-path": "^4.0.3",
     "safe-stable-stringify": "^2.5.0",
     "sane": "^5.0.1",
-    "semver": "^7.8.5",
+    "semver": "^7.8.1",
     "semver-deprecate": "^1.1.0",
     "silent-error": "^1.1.1",
-    "sort-package-json": "^3.7.1",
+    "sort-package-json": "^3.6.1",
     "symlink-or-copy": "^1.3.1",
-    "testem": "^3.20.1",
+    "testem": "^3.20.0",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
     "walk-sync": "^4.0.2",
     "watch-detector": "^1.0.2",
     "workerpool": "^10.0.2",
     "yam": "^1.0.0",
-    "@ember-tooling/classic-build-addon-blueprint": "7.1.0",
-    "@ember-tooling/classic-build-app-blueprint": "7.1.0"
+    "@ember-tooling/blueprint-blueprint": "0.3.0",
+    "@ember-tooling/blueprint-model": "0.7.1",
+    "@ember-tooling/classic-build-app-blueprint": "7.2.0-alpha.2",
+    "@ember-tooling/classic-build-addon-blueprint": "7.2.0-alpha.2"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.7",
@@ -120,7 +128,8 @@
     "chai-as-promised": "^8.0.2",
     "chai-files": "^1.4.0",
     "chai-jest-snapshot": "^2.0.0",
-    "concurrently": "^9.2.3",
+    "concurrently": "^9.2.1",
+    "ember-cli": "link:.",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
     "eslint": "^8.57.1",
@@ -129,7 +138,7 @@
     "eslint-plugin-mocha": "^10.5.0",
     "eslint-plugin-n": "^17.24.0",
     "fixturify": "^3.0.0",
-    "fixturify-project": "^2.1.1",
+    "fixturify-project": "^7.1.3",
     "jsdom": "^21.1.2",
     "latest-version": "^9.0.0",
     "mocha": "^11.7.6",
@@ -140,7 +149,7 @@
     "strip-ansi": "^7.2.0",
     "supertest": "^7.2.2",
     "testdouble": "^3.20.2",
-    "tmp": "^0.2.7",
+    "tmp": "^0.2.5",
     "tmp-promise": "^3.0.3",
     "websocket": "^1.0.35",
     "which": "6.0.0",

package/packages/addon-blueprint/files/README.md

@@ -18,6 +18,16 @@ ember install <%= addonName %>
 
 [Longer description of how to use the addon in apps.]
 
+> TODO: Document the package's public API.
+>
+> For each public api (including components, helpers, modifiers, and other apis) include:
+>
+> - The import path for a consumer (e.g. `import MyAddonsComponent from 'my-addon/components/my-addons-component'`)
+> - What it does
+> - Parameters/options
+> - Return value
+> - Example usage
+
 ## Contributing
 
 See the [Contributing](CONTRIBUTING.md) guide for details.

package/packages/addon-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "7.1.0",
+  "version": "7.2.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,7 +11,7 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "^0.7.0",
+    "@ember-tooling/blueprint-model": "workspace:*",
     "chalk": "^5.6.2",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
@@ -20,5 +20,13 @@
     "silent-error": "^1.1.1",
     "sort-package-json": "^2.15.1",
     "walk-sync": "^3.0.0"
+  },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   }
 }

package/packages/app-blueprint/files/package.json

@@ -28,9 +28,9 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@babel/core": "^7.29.7",
-    "@babel/eslint-parser": "^7.29.7",
-    "@babel/plugin-proposal-decorators": "^7.29.7<% if (typescript && emberData) { %>",
+    "@babel/core": "^7.29.0",
+    "@babel/eslint-parser": "^7.28.6",
+    "@babel/plugin-proposal-decorators": "^7.29.0<% if (typescript && emberData) { %>",
     "@ember-data/adapter": "~5.8.2",
     "@ember-data/graph": "~5.8.2",
     "@ember-data/json-api": "~5.8.2",
@@ -42,17 +42,17 @@
     "@ember-data/store": "~5.8.2",
     "@warp-drive/ember": "~5.8.2<% } %>",
     "@ember/optional-features": "^3.0.0",
-    "@ember/test-helpers": "^5.4.3<% if (embroider) { %>",
+    "@ember/test-helpers": "^5.4.2<% if (embroider) { %>",
     "@embroider/compat": "^3.9.4",
     "@embroider/core": "^3.5.10<% } %>",
-    "@embroider/macros": "^1.20.4<% if (embroider) { %>",
+    "@embroider/macros": "^1.20.2<% if (embroider) { %>",
     "@embroider/webpack": "^4.1.2<% } %>",
     "@eslint/js": "^9.39.4",
     "@glimmer/component": "^2.1.1",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
-    "@glint/template": "^1.7.8",
+    "@glint/template": "^1.7.7",
     "@tsconfig/ember": "^3.0.12",
     "@types/qunit": "^2.19.14",
     "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
@@ -61,9 +61,9 @@
     "@warp-drive/legacy": "~5.8.2",
     "@warp-drive/utilities": "~5.8.2<% } %>",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^9.2.3",
+    "concurrently": "^9.2.1",
     "ember-auto-import": "^2.13.1",
-    "ember-cli": "~7.1.0",
+    "ember-cli": "~7.2.0-alpha.2",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.3.1",
     "ember-cli-clean-css": "^3.0.0",
@@ -77,9 +77,9 @@
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.3.0",
     "ember-page-title": "^9.0.3",
-    "ember-qunit": "^9.1.0",
+    "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.2.0",
-    "ember-source": "~7.1.0",
+    "ember-source": "~7.2.0-alpha.3",
     "ember-template-imports": "^4.4.0",
     "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^8.0.5<% } %>",
@@ -91,15 +91,15 @@
     "eslint-plugin-warp-drive": "^5.8.2<% } %>",
     "globals": "^15.15.0",
     "loader.js": "^4.7.0",
-    "prettier": "^3.8.4",
+    "prettier": "^3.8.3",
     "prettier-plugin-ember-template-tag": "^2.1.6",
-    "qunit": "^2.26.0",
+    "qunit": "^2.25.0",
     "qunit-dom": "^3.5.1",
     "stylelint": "^16.26.1",
     "stylelint-config-standard": "^36.0.1<% if (typescript) { %>",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.62.0<% } %>",
-    "webpack": "^5.107.2"
+    "typescript-eslint": "^8.59.4<% } %>",
+    "webpack": "^5.107.1"
   },
   "engines": {
     "node": ">= 20.19"

package/packages/app-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "7.1.0",
+  "version": "7.2.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,8 +11,16 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "^0.7.0",
+    "@ember-tooling/blueprint-model": "workspace:*",
     "chalk": "^5.6.2",
     "ember-cli-string-utils": "^1.1.0"
+  },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   }
 }

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

@@ -0,0 +1,16 @@
+'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

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

package/packages/blueprint-blueprint/package.json

@@ -0,0 +1,13 @@
+{
+  "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/{lib/models/blueprint.js → packages/blueprint-model/index.js}

@@ -5,11 +5,11 @@
 */
 const FileInfo = require('@ember-tooling/blueprint-model/utilities/file-info');
 const { default: chalk } = require('chalk');
-const MarkdownColor = require('../utilities/markdown-color');
-const sequence = require('../utilities/sequence');
-const printCommand = require('../utilities/print-command');
-const insertIntoFile = require('../utilities/insert-into-file');
-const cleanRemove = require('../utilities/clean-remove');
+const MarkdownColor = require('@ember-tooling/blueprint-model/utilities/markdown-color');
+const sequence = require('./utilities/sequence');
+const printCommand = require('@ember-tooling/blueprint-model/utilities/print-command');
+const insertIntoFile = require('@ember-tooling/blueprint-model/utilities/insert-into-file');
+const cleanRemove = require('@ember-tooling/blueprint-model/utilities/clean-remove');
 const fs = require('fs-extra');
 const { pluralize } = require('inflection');
 const { minimatch } = require('minimatch');
@@ -20,7 +20,6 @@ const zipObject = require('lodash/zipObject');
 const intersection = require('lodash/intersection');
 const cloneDeep = require('lodash/cloneDeep');
 const compact = require('lodash/compact');
-const uniq = require('lodash/uniq');
 const sortBy = require('lodash/sortBy');
 const walkSync = require('walk-sync');
 const SilentError = require('silent-error');
@@ -28,7 +27,7 @@ const CoreObject = require('core-object');
 const EOL = require('os').EOL;
 const logger = require('heimdalljs-logger')('ember-cli:blueprint');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const isAddon = require('../utilities/is-addon');
+const isAddon = require('@ember-tooling/blueprint-model/utilities/is-addon');
 
 const initialIgnoredFiles = ['.DS_Store'];
 
@@ -1425,10 +1424,13 @@ const builtInBlueprints = new Map([
 Blueprint.lookup = function (name, options) {
   options = options || {};
 
-  let lookupPaths = generateLookupPaths(options.paths);
+  let lookupPaths = new Set(options.paths);
 
-  let lookupPath;
-  for (let i = 0; (lookupPath = lookupPaths[i]); i++) {
+  for (let path of options?.project?.blueprintLookupPaths() ?? []) {
+    lookupPaths.add(path);
+  }
+
+  for (let lookupPath of lookupPaths) {
     let blueprintPath = path.resolve(lookupPath, name);
 
     if (Blueprint._existsSync(blueprintPath)) {
@@ -1502,10 +1504,15 @@ Blueprint.load = function (blueprintPath, blueprintOptions) {
 Blueprint.list = function (options) {
   options = options || {};
 
-  let lookupPaths = generateLookupPaths(options.paths);
+  let lookupPaths = new Set(options.paths);
+
+  for (let path of options?.project?.blueprintLookupPaths() ?? []) {
+    lookupPaths.add(path);
+  }
+
   let seen = [];
 
-  return lookupPaths.map((lookupPath) => {
+  return Array.from(lookupPaths).map((lookupPath) => {
     let source;
     let packagePath = path.join(lookupPath, '../package.json');
     if (Blueprint._existsSync(packagePath)) {
@@ -1582,14 +1589,6 @@ Blueprint.ignoredFiles = initialIgnoredFiles;
 */
 Blueprint.ignoredUpdateFiles = ['.gitkeep', 'app.css', 'LICENSE.md'];
 
-/**
-  @static
-  @property defaultLookupPaths
-*/
-Blueprint.defaultLookupPaths = function () {
-  return [path.resolve(__dirname, '..', '..', 'blueprints')];
-};
-
 /**
   @private
   @method prepareConfirm
@@ -1649,21 +1648,6 @@ function isIgnored(info) {
   return Blueprint.ignoredFiles.some((ignoredFile) => minimatch(fn, ignoredFile, { matchBase: true }));
 }
 
-/**
-  Combines provided lookup paths with defaults and removes
-  duplicates.
-
-  @private
-  @method generateLookupPaths
-  @param {Array} lookupPaths
-  @return {Array}
-*/
-function generateLookupPaths(lookupPaths) {
-  lookupPaths = lookupPaths || [];
-  lookupPaths = lookupPaths.concat(Blueprint.defaultLookupPaths());
-  return uniq(lookupPaths);
-}
-
 /**
   Looks for a __path__ token in the files folder. Must be present for
   the blueprint to support pod tokens.

package/packages/blueprint-model/node_modules/.bin/markdown-it

@@ -0,0 +1,21 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules/markdown-it/bin/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules/markdown-it/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules/markdown-it/bin/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules/markdown-it/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/markdown-it@14.1.1/node_modules:/home/runner/work/ember-cli/ember-cli/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../markdown-it/bin/markdown-it.mjs" "$@"
+else
+  exec node  "$basedir/../markdown-it/bin/markdown-it.mjs" "$@"
+fi

package/packages/blueprint-model/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "@ember-tooling/blueprint-model",
+  "version": "0.7.1",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ember-cli/ember-cli.git",
+    "directory": "packages/blueprint-model"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "babel-remove-types": "^2.0.0",
+    "chalk": "^5.6.2",
+    "content-tag": "^4.0.0",
+    "core-object": "^3.1.5",
+    "diff": "^8.0.4",
+    "ember-cli-normalize-entity-name": "^1.0.0",
+    "ember-cli-string-utils": "^1.1.0",
+    "fs-extra": "^11.3.4",
+    "heimdalljs-logger": "^0.1.10",
+    "inflection": "^3.0.2",
+    "isbinaryfile": "^5.0.7",
+    "lodash": "^4.17.23",
+    "markdown-it": "^14.1.0",
+    "markdown-it-terminal": "^0.4.0",
+    "minimatch": "^10.1.1",
+    "promise.hash.helper": "^1.0.8",
+    "quick-temp": "^0.1.9",
+    "silent-error": "^1.1.1",
+    "walk-sync": "^4.0.0"
+  }
+}

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

@@ -0,0 +1,31 @@
+'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;
+  }
+};