@ember-data/model 4.12.0-alpha.11 → 4.12.0-alpha.13

package/addon/index.js

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

package/addon-main.js

@@ -1,35 +1,9 @@
 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');
 
-// do our best to detect being present
-// Note: when this is not enough, consuming apps may need
-// to "hoist" peer-deps or specify us as a direct dependency
-// in order to deal with peer-dep bugs in package managers
-function detectModule(moduleName) {
-  try {
-    // package managers have peer-deps bugs where another library
-    // bringing a peer-dependency doesn't necessarily result in all
-    // versions of the dependent getting the peer-dependency
-    //
-    // so we resolve from project as well as from our own location
-    //
-    // eslint-disable-next-line node/no-missing-require
-    require.resolve(moduleName, { paths: [process.cwd(), __dirname] });
-    return true;
-  } catch {
-    try {
-      // ember-data brings all packages so if present we are present
-      //
-      // eslint-disable-next-line node/no-missing-require
-      require.resolve('ember-data', { paths: [process.cwd(), __dirname] });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-}
-
 module.exports = {
   name: pkg.name,
 
@@ -53,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,
@@ -61,8 +36,8 @@ module.exports = {
       hostOptions.debug || {}
     );
 
-    const HAS_DEBUG_PACKAGE = detectModule('@ember-data/debug');
-    const HAS_META_PACKAGE = detectModule('ember-data');
+    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'
@@ -78,7 +53,7 @@ module.exports = {
     delete MACRO_PACKAGE_FLAGS['HAS_DEBUG_PACKAGE'];
 
     Object.keys(MACRO_PACKAGE_FLAGS).forEach((key) => {
-      MACRO_PACKAGE_FLAGS[key] = detectModule(MACRO_PACKAGE_FLAGS[key]);
+      MACRO_PACKAGE_FLAGS[key] = detectModule(require, MACRO_PACKAGE_FLAGS[key], __dirname, pkg);
     });
 
     // copy configs forward
@@ -89,6 +64,7 @@ module.exports = {
     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-alpha.11",
+  "version": "4.12.0-alpha.13",
   "description": "A presentation layer for apps built with @ember-data/store",
   "keywords": [
     "ember-addon"
@@ -23,11 +23,12 @@
     "addon"
   ],
   "peerDependencies": {
-    "@ember-data/json-api": "4.12.0-alpha.11",
-    "@ember-data/legacy-compat": "4.12.0-alpha.11",
-    "@ember-data/graph": "4.12.0-alpha.11",
-    "@ember-data/store": "4.12.0-alpha.11",
-    "@ember-data/tracking": "4.12.0-alpha.11",
+    "@ember-data/debug": "4.12.0-alpha.13",
+    "@ember-data/json-api": "4.12.0-alpha.13",
+    "@ember-data/legacy-compat": "4.12.0-alpha.13",
+    "@ember-data/graph": "4.12.0-alpha.13",
+    "@ember-data/store": "4.12.0-alpha.13",
+    "@ember-data/tracking": "4.12.0-alpha.13",
     "@ember/string": "^3.0.1",
     "ember-inflector": "^4.0.2"
   },
@@ -37,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-alpha.11",
-    "@ember-data/private-build-infra": "4.12.0-alpha.11",
+    "@ember-data/private-build-infra": "4.12.0-alpha.13",
     "@ember/edition-utils": "^1.2.0",
     "@embroider/macros": "^1.10.0",
     "ember-cached-decorator-polyfill": "^1.0.1",
@@ -64,7 +64,7 @@
     "@glimmer/component": "^1.1.2",
     "ember-source": "~4.11.0",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.20.0",
+    "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",
@@ -85,7 +85,7 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "packageManager": "pnpm@7.30.0",
+  "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"