Merge pull request #976 from NullVoxPopuli/refactor-cell

Refactor, cell was in the wrong folder
NullVoxPopuli · Aug 8, 2023 · 5fa3990 · 5fa3990
2 parents 56f49b9 + 869d531
commit 5fa3990
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/dev/estimate-bytes/index.js b/dev/estimate-bytes/index.js
@@ -22,6 +22,7 @@ const config = {
       nest: [
         'core/class-based/index.js',
         'core/function-based/index.js',
+        'core/cell.js',
         'core/use.js',
       ]
     },

diff --git a/ember-resources/package.json b/ember-resources/package.json
@@ -16,7 +16,7 @@
     "./service": "./dist/service.js",
     "./modifier": "./dist/modifier/index.js",
     "./util": "./dist/util/index.js",
-    "./util/cell": "./dist/util/cell.js",
+    "./util/cell": "./dist/core/cell.js",
     "./util/keep-latest": "./dist/util/keep-latest.js",
     "./util/fps": "./dist/util/fps.js",
     "./util/map": "./dist/util/map.js",

diff --git a/ember-resources/src/util/cell.ts → ember-resources/src/core/cell.ts b/ember-resources/src/util/cell.ts → ember-resources/src/core/cell.ts
@@ -142,9 +142,9 @@ export function cell<Value = unknown>(initialValue?: Value): Cell<Value> {
 // @ts-ignore
 import { capabilities as helperCapabilities, setHelperManager } from '@ember/helper';
 
-import { CURRENT } from '../core/function-based/types';
+import { CURRENT } from './function-based/types';
 
-import type { GlintRenderable, Reactive } from '../core/function-based/types';
+import type { GlintRenderable, Reactive } from './function-based/types';
 
 class CellManager {
   capabilities = helperCapabilities('3.23', {

diff --git a/ember-resources/src/core/function-based/manager.ts b/ember-resources/src/core/function-based/manager.ts
@@ -8,7 +8,7 @@ import { invokeHelper } from '@ember/helper';
 import { capabilities as helperCapabilities } from '@ember/helper';
 import { dependencySatisfies, importSync, macroCondition } from '@embroider/macros';
 
-import { ReadonlyCell } from '../../util/cell';
+import { ReadonlyCell } from '../cell';
 import { CURRENT, INTERNAL } from './types';
 
 import type {

diff --git a/ember-resources/src/core/use.ts b/ember-resources/src/core/use.ts
@@ -8,7 +8,7 @@ import { associateDestroyableChild } from '@ember/destroyable';
 // @ts-ignore
 import { invokeHelper } from '@ember/helper';
 
-import { ReadonlyCell } from '../util/cell';
+import { ReadonlyCell } from './cell';
 import { INTERNAL } from './function-based/types';
 import { normalizeThunk } from './utils';
 

diff --git a/ember-resources/src/index.ts b/ember-resources/src/index.ts
@@ -4,7 +4,7 @@ export { resource, resourceFactory } from './core/function-based';
 export { use } from './core/use';
 
 // Public API -- Utilities
-export { cell } from './util/cell';
+export { cell } from './core/cell';
 
 // Public Type Utilities
 export type { ResourceAPI } from './core/function-based';