Merge pull request #10021 from bertdeblock/drop-support-for-using-use…

…Pods-and-the-pod-flag-simultaneously [CLEANUP] Drop support for using `usePods: true` and the `--pod` flag simultaneously
ember-cli · Oct 5, 2022 · e79fe7d · e79fe7d
2 parents 7e111ec + e924ecb
commit e79fe7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/lib/commands/destroy.js b/lib/commands/destroy.js
@@ -68,7 +68,7 @@ module.exports = Command.extend({
     };
 
     if (this.settings && this.settings.usePods && !commandOptions.classic) {
-      commandOptions.pod = !commandOptions.pod;
+      commandOptions.pod = true;
     }
 
     if (commandOptions.in) {

diff --git a/lib/commands/generate.js b/lib/commands/generate.js
@@ -58,16 +58,8 @@ module.exports = Command.extend({
       args: rawArgs,
     };
 
-    if (this.settings && this.settings.usePods) {
-      if (commandOptions.pod) {
-        let warning = 'Using both .ember-cli usePods settings and --pod flag ';
-        warning += 'together has been deprecated.';
-        this.ui.writeDeprecateLine(warning);
-      }
-
-      if (!commandOptions.classic) {
-        commandOptions.pod = !commandOptions.pod;
-      }
+    if (this.settings && this.settings.usePods && !commandOptions.classic) {
+      commandOptions.pod = true;
     }
 
     if (commandOptions.in) {