@ember-data/model 4.12.0-beta.2 → 4.12.0-beta.4

package/addon/index.js

@@ -1 +1 @@
-export { a as attr, b as belongsTo, M as default, h as hasMany } from "./has-many-26353d30";
+export { a as attr, b as belongsTo, M as default, h as hasMany } from "./has-many-f4cb2303";

package/addon-main.js

@@ -1,3 +1,7 @@
+const requireModule = require('@ember-data/private-build-infra/src/utilities/require-module');
+const getEnv = require('@ember-data/private-build-infra/src/utilities/get-env');
+const detectModule = require('@ember-data/private-build-infra/src/utilities/detect-module');
+
 const pkg = require('./package.json');
 
 module.exports = {
@@ -23,6 +27,7 @@ module.exports = {
         LOG_OPERATIONS: false,
         LOG_MUTATIONS: false,
         LOG_NOTIFICATIONS: false,
+        LOG_REQUESTS: false,
         LOG_REQUEST_STATUS: false,
         LOG_IDENTIFIERS: false,
         LOG_GRAPH: false,
@@ -30,22 +35,10 @@ module.exports = {
       },
       hostOptions.debug || {}
     );
-    let HAS_DEBUG_PACKAGE, HAS_META_PACKAGE;
 
-    try {
-      // eslint-disable-next-line node/no-missing-require
-      require.resolve('@ember-data/debug', { paths: [process.cwd(), __dirname] });
-      HAS_DEBUG_PACKAGE = true;
-    } catch {
-      HAS_DEBUG_PACKAGE = false;
-    }
-    try {
-      // eslint-disable-next-line node/no-missing-require
-      require.resolve('ember-data', { paths: [process.cwd(), __dirname] });
-      HAS_META_PACKAGE = true;
-    } catch {
-      HAS_META_PACKAGE = false;
-    }
+    const HAS_DEBUG_PACKAGE = detectModule(require, '@ember-data/debug', __dirname, pkg);
+    const HAS_META_PACKAGE = detectModule(require, 'ember-data', __dirname, pkg);
+
     const includeDataAdapterInProduction =
       typeof hostOptions.includeDataAdapterInProduction === 'boolean'
         ? hostOptions.includeDataAdapterInProduction
@@ -55,6 +48,14 @@ module.exports = {
     const DEPRECATIONS = require('@ember-data/private-build-infra/src/deprecations')(hostOptions.compatWith || null);
     const FEATURES = require('@ember-data/private-build-infra/src/features')(isProd);
 
+    const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/addon/available-packages.ts');
+    const MACRO_PACKAGE_FLAGS = Object.assign({}, ALL_PACKAGES.default);
+    delete MACRO_PACKAGE_FLAGS['HAS_DEBUG_PACKAGE'];
+
+    Object.keys(MACRO_PACKAGE_FLAGS).forEach((key) => {
+      MACRO_PACKAGE_FLAGS[key] = detectModule(require, MACRO_PACKAGE_FLAGS[key], __dirname, pkg);
+    });
+
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
     ownConfig.compatWith = hostOptions.compatWith || null;
@@ -62,6 +63,8 @@ module.exports = {
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {});
     ownConfig.features = Object.assign({}, FEATURES);
     ownConfig.includeDataAdapter = includeDataAdapter;
+    ownConfig.packages = MACRO_PACKAGE_FLAGS;
+    ownConfig.env = getEnv(ownConfig);
 
     this._emberDataConfig = ownConfig;
     return ownConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.12.0-beta.2",
+  "version": "4.12.0-beta.4",
   "description": "A presentation layer for apps built with @ember-data/store",
   "keywords": [
     "ember-addon"
@@ -23,10 +23,12 @@
     "addon"
   ],
   "peerDependencies": {
-    "@ember-data/json-api": "4.12.0-beta.2",
-    "@ember-data/graph": "4.12.0-beta.2",
-    "@ember-data/store": "4.12.0-beta.2",
-    "@ember-data/tracking": "4.12.0-beta.2",
+    "@ember-data/debug": "4.12.0-beta.4",
+    "@ember-data/json-api": "4.12.0-beta.4",
+    "@ember-data/legacy-compat": "4.12.0-beta.4",
+    "@ember-data/graph": "4.12.0-beta.4",
+    "@ember-data/store": "4.12.0-beta.4",
+    "@ember-data/tracking": "4.12.0-beta.4",
     "@ember/string": "^3.0.1",
     "ember-inflector": "^4.0.2"
   },
@@ -36,19 +38,18 @@
     },
     "@ember-data/graph": {
       "optional": true
+    },
+    "@ember-data/debug": {
+      "optional": true
     }
   },
   "dependenciesMeta": {
-    "@ember-data/canary-features": {
-      "injected": true
-    },
     "@ember-data/private-build-infra": {
       "injected": true
     }
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.12.0-beta.2",
-    "@ember-data/private-build-infra": "4.12.0-beta.2",
+    "@ember-data/private-build-infra": "4.12.0-beta.4",
     "@ember/edition-utils": "^1.2.0",
     "@embroider/macros": "^1.10.0",
     "ember-cached-decorator-polyfill": "^1.0.1",
@@ -58,16 +59,16 @@
     "inflection": "~2.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.0",
+    "@babel/core": "^7.21.3",
     "@babel/cli": "^7.21.0",
     "@glimmer/component": "^1.1.2",
     "ember-source": "~4.11.0",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.17.2",
+    "rollup": "^3.20.2",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.21.0",
-    "@babel/plugin-transform-typescript": "^7.21.0",
+    "@babel/plugin-transform-typescript": "^7.21.3",
     "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-typescript": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
@@ -84,7 +85,7 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "packageManager": "pnpm@7.27.1",
+  "packageManager": "pnpm@7.30.3",
   "scripts": {
     "build": "rollup --config && babel ./addon --out-dir addon --plugins=../private-build-infra/src/transforms/babel-plugin-transform-ext.js",
     "start": "rollup --config --watch"