ember-cli 6.3.0-beta.1 → 6.3.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # ember-cli Changelog
 
+## v6.3.0-beta.2
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v6.3.0-beta.1...v6.3.0-beta.2)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v6.3.0-beta.1...v6.3.0-beta.2)
+
+#### Changelog
+
+- [#10633](https://github.com/ember-cli/ember-cli/pull/10633) [BUGFIX release] Update all EmberData deps to stable [@Windvis](https://github.com/Windvis)
+- [#10643](https://github.com/ember-cli/ember-cli/pull/10643) Remove unmaintained ember-cli-lodash-subset in favor of requiring functions directly from lodash [@kategengler](https://github.com/kategengler)
+
+Thank you to all who took the time to contribute!
+
 ## v6.3.0-beta.1
 
 #### Blueprint Changes
@@ -45,6 +59,20 @@ Thank you to all who took the time to contribute!
 
 Thank you to all who took the time to contribute!
 
+## v6.2.2
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v6.2.1...v6.2.2)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v6.2.1...v6.2.2)
+
+#### Changelog
+
+- [#10633](https://github.com/ember-cli/ember-cli/pull/10633) [BUGFIX release] Update all EmberData deps to stable [@Windvis](https://github.com/Windvis)
+- [#10643](https://github.com/ember-cli/ember-cli/pull/10643) Remove unmaintained ember-cli-lodash-subset in favor of requiring functions directly from lodash [@kategengler](https://github.com/kategengler)
+
+Thank you to all who took the time to contribute!
+
 ## v6.2.1
 
 #### Blueprint Changes

package/blueprints/addon/index.js

@@ -5,7 +5,8 @@ const path = require('path');
 const walkSync = require('walk-sync');
 const chalk = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
-const { merge, uniq } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
+const uniq = require('lodash/uniq');
 const SilentError = require('silent-error');
 const { sortPackageJson } = require('sort-package-json');
 

package/blueprints/app/files/package.json

@@ -31,16 +31,16 @@
     "@babel/core": "^7.26.7<% if (!typescript) { %>",
     "@babel/eslint-parser": "^7.26.5",
     "@babel/plugin-proposal-decorators": "^7.25.9<% } %><% if (typescript && emberData) { %>",
-    "@ember-data/adapter": "~5.4.0-beta.14",
-    "@ember-data/graph": "~5.4.0-beta.14",
-    "@ember-data/json-api": "~5.4.0-beta.14",
-    "@ember-data/legacy-compat": "~5.4.0-beta.14",
-    "@ember-data/model": "~5.4.0-beta.14",
-    "@ember-data/request": "~5.4.0-beta.14",
-    "@ember-data/request-utils": "~5.4.0-beta.14",
-    "@ember-data/serializer": "~5.4.0-beta.14",
-    "@ember-data/store": "~5.4.0-beta.14",
-    "@ember-data/tracking": "~5.4.0-beta.14<% } %>",
+    "@ember-data/adapter": "~5.3.10",
+    "@ember-data/graph": "~5.3.10",
+    "@ember-data/json-api": "~5.3.10",
+    "@ember-data/legacy-compat": "~5.3.10",
+    "@ember-data/model": "~5.3.10",
+    "@ember-data/request": "~5.3.10",
+    "@ember-data/request-utils": "~5.3.10",
+    "@ember-data/serializer": "~5.3.10",
+    "@ember-data/store": "~5.3.10",
+    "@ember-data/tracking": "~5.3.10<% } %>",
     "@ember/optional-features": "^2.2.0",
     "@ember/test-helpers": "^5.1.0<% if (embroider) { %>",
     "@embroider/compat": "^3.8.0",
@@ -57,7 +57,7 @@
     "@types/eslint__js": "^8.42.3",
     "@types/qunit": "^2.19.12",
     "@types/rsvp": "^4.0.9",
-    "@warp-drive/core-types": "~5.4.0-beta.14<% } %>",
+    "@warp-drive/core-types": "~0.0.1<% } %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.1.2",
     "ember-auto-import": "^2.10.0",

package/lib/broccoli/ember-addon.js

@@ -3,7 +3,7 @@
 /**
 @module ember-cli
 */
-const { defaultsDeep } = require('ember-cli-lodash-subset');
+const defaultsDeep = require('lodash/defaultsDeep');
 const Funnel = require('broccoli-funnel');
 const fs = require('fs');
 

package/lib/broccoli/ember-app.js

@@ -19,7 +19,10 @@ const broccoliMergeTrees = require('broccoli-merge-trees');
 const WatchedDir = require('broccoli-source').WatchedDir;
 const UnwatchedDir = require('broccoli-source').UnwatchedDir;
 
-const { merge, defaultsDeep, omitBy, isNull } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
+const defaultsDeep = require('lodash/defaultsDeep');
+const omitBy = require('lodash/omitBy');
+const isNull = require('lodash/isNull');
 const Funnel = require('broccoli-funnel');
 const logger = require('heimdalljs-logger')('ember-cli:ember-app');
 const addonProcessTree = require('../utilities/addon-process-tree');

package/lib/cli/index.js

@@ -17,7 +17,7 @@ if (instrumentation.instrumentationEnabled()) {
 
 // Main entry point
 const requireAsHash = require('../utilities/require-as-hash');
-const { merge } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
 const path = require('path');
 const heimdall = require('heimdalljs');
 

package/lib/commands/destroy.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const Command = require('../models/command');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
-const { merge } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
 const SilentError = require('silent-error');
 
 module.exports = Command.extend({

package/lib/commands/generate.js

@@ -5,7 +5,8 @@ const chalk = require('chalk');
 const Command = require('../models/command');
 const Blueprint = require('../models/blueprint');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
-const { merge, reject } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
+const reject = require('lodash/reject');
 const EOL = require('os').EOL;
 const SilentError = require('silent-error');
 

package/lib/commands/init.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { clone, merge } = require('ember-cli-lodash-subset');
+const clone = require('lodash/clone');
+const merge = require('lodash/merge');
 const Command = require('../models/command');
 const SilentError = require('silent-error');
 const chalk = require('chalk');

package/lib/models/addon.js

@@ -27,7 +27,7 @@ const mergeTrees = require('../broccoli/merge-trees');
 const Funnel = require('broccoli-funnel');
 const walkSync = require('walk-sync');
 const ensurePosixPath = require('ensure-posix-path');
-const { defaultsDeep } = require('ember-cli-lodash-subset');
+const defaultsDeep = require('lodash/defaultsDeep');
 const heimdall = require('heimdalljs');
 const calculateCacheKeyForTree = require('calculate-cache-key-for-tree');
 const addonProcessTree = require('../utilities/addon-process-tree');

package/lib/models/blueprint.js

@@ -15,7 +15,12 @@ const inflector = require('inflection');
 const minimatch = require('minimatch');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
-const { merge, zipObject, intersection, cloneDeep, compact, uniq } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
+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 walkSync = require('walk-sync');
 const SilentError = require('silent-error');
 const CoreObject = require('core-object');

package/lib/models/command.js

@@ -7,7 +7,11 @@ 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 { union, defaults, uniq, uniqBy, reject } = require('ember-cli-lodash-subset');
+const union = require('lodash/union');
+const defaults = require('lodash/defaults');
+const uniq = require('lodash/uniq');
+const uniqBy = require('lodash/uniqBy');
+const reject = require('lodash/reject');
 const EOL = require('os').EOL;
 const CoreObject = require('core-object');
 const logger = require('heimdalljs-logger')('ember-cli:command');

package/lib/models/project.js

@@ -8,7 +8,9 @@ const path = require('path');
 const findup = require('find-up');
 const resolve = util.promisify(require('resolve'));
 const fs = require('fs-extra');
-const { cloneDeep, merge, forOwn } = require('ember-cli-lodash-subset');
+const cloneDeep = require('lodash/cloneDeep');
+const merge = require('lodash/merge');
+const forOwn = require('lodash/forOwn');
 const logger = require('heimdalljs-logger')('ember-cli:project');
 const versionUtils = require('../utilities/version-utils');
 const emberCLIVersion = versionUtils.emberCLIVersion;

package/lib/tasks/addon-install.js

@@ -2,7 +2,7 @@
 
 const Task = require('../models/task');
 const SilentError = require('silent-error');
-const { merge } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
 const getPackageBaseName = require('../utilities/get-package-base-name');
 
 class AddonInstallTask extends Task {

package/lib/tasks/install-blueprint.js

@@ -6,7 +6,7 @@ const Task = require('../models/task');
 const util = require('util');
 const temp = require('temp');
 const path = require('path');
-const { merge } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
 const execa = require('../utilities/execa');
 const SilentError = require('silent-error');
 const npa = require('npm-package-arg');

package/lib/tasks/server/express-server.js

@@ -4,7 +4,7 @@ const path = require('path');
 const EventEmitter = require('events').EventEmitter;
 const chalk = require('chalk');
 const fs = require('fs');
-const { debounce } = require('ember-cli-lodash-subset');
+const debounce = require('lodash/debounce');
 const mapSeries = require('promise-map-series');
 const Task = require('../../models/task');
 const SilentError = require('silent-error');

package/lib/utilities/markdown-color.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 
 const chalk = require('chalk');
 const SilentError = require('silent-error');
-const { merge } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
 
 let colors = ['red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'black', 'white', 'grey', 'gray'];
 let backgroundColors = ['bgRed', 'bgGreen', 'bgBlue', 'bgCyan', 'bgMagenta', 'bgYellow', 'bgWhite', 'bgBlack'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.3.0-beta.1",
+  "version": "6.3.0-beta.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -65,7 +65,6 @@
     "dag-map": "^2.0.2",
     "diff": "^7.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
-    "ember-cli-lodash-subset": "^2.0.1",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-preprocess-registry": "^5.0.1",
     "ember-cli-string-utils": "^1.1.0",

package/tests/helpers/fixturify-project.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const { merge } = require('ember-cli-lodash-subset');
+const merge = require('lodash/merge');
 const FixturifyProject = require('fixturify-project');
 const Project = require('../../lib/models/project');
 const MockCLI = require('./mock-cli');

package/tests/helpers/run-command.js

@@ -2,7 +2,7 @@
 
 const chalk = require('chalk');
 const spawn = require('child_process').spawn;
-const { defaults } = require('ember-cli-lodash-subset');
+const defaults = require('lodash/defaults');
 const killCliProcess = require('./kill-cli-process');
 const logOnFailure = require('./log-on-failure');
 let debug = require('heimdalljs-logger')('run-command');