Merge pull request #1090 from NullVoxPopuli/only-allow-the-root-import

Remove the 'core' import, only allowing importing from 'ember-resources'
NullVoxPopuli · Jan 9, 2024 · 837ee4f · 837ee4f
2 parents be18432 + b3afce6
commit 837ee4f
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 16 deletions.
diff --git a/.github/actions/assert-build/action.yml b/.github/actions/assert-build/action.yml
@@ -12,8 +12,6 @@ runs:
           run: pnpm build
           cwd: ./ember-resources
         expect: |
-          core/index.js
-          core/function-based/index.js
           index.js
           index.js.map
           index.d.ts

diff --git a/ember-resources/package.json b/ember-resources/package.json
@@ -9,17 +9,12 @@
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
-    "./core": "./dist/core/index.js",
-    "./core/function-based": "./dist/core/function-based/index.js",
     "./addon-main.js": "./addon-main.cjs"
   },
   "typesVersions": {
     ">=4.0.0": {
       "*": [
         "dist/*"
-      ],
-      "core": [
-        "dist/core/index.d.ts"
       ]
     }
   },

diff --git a/ember-resources/src/core/cell.ts → ember-resources/src/cell.ts b/ember-resources/src/core/cell.ts → ember-resources/src/cell.ts
diff --git a/ember-resources/src/core/index.ts b/ember-resources/src/core/index.ts
diff --git a/...re/function-based/immediate-invocation.ts → ...rc/function-based/immediate-invocation.ts b/...re/function-based/immediate-invocation.ts → ...rc/function-based/immediate-invocation.ts
diff --git a/...esources/src/core/function-based/index.ts → ember-resources/src/function-based/index.ts b/...esources/src/core/function-based/index.ts → ember-resources/src/function-based/index.ts
diff --git a/...ources/src/core/function-based/manager.ts → ...r-resources/src/function-based/manager.ts b/...ources/src/core/function-based/manager.ts → ...r-resources/src/function-based/manager.ts
diff --git a/...urces/src/core/function-based/resource.ts → ...-resources/src/function-based/resource.ts b/...urces/src/core/function-based/resource.ts → ...-resources/src/function-based/resource.ts
diff --git a/...esources/src/core/function-based/types.ts → ember-resources/src/function-based/types.ts b/...esources/src/core/function-based/types.ts → ember-resources/src/function-based/types.ts
diff --git a/...esources/src/core/function-based/utils.ts → ember-resources/src/function-based/utils.ts b/...esources/src/core/function-based/utils.ts → ember-resources/src/function-based/utils.ts
diff --git a/ember-resources/src/index.ts b/ember-resources/src/index.ts
@@ -1,11 +1,11 @@
 // Public API -- base classes
-export { resource, resourceFactory } from './core/function-based';
-export { use } from './core/use';
+export { resource, resourceFactory } from './function-based';
+export { use } from './use';
 
 // Public API -- Utilities
-export { cell } from './core/cell';
+export { cell } from './cell';
 
 // Public Type Utilities
-export type { ResourceAPI } from './core/function-based';
-export type { Reactive } from './core/function-based/types';
-export type { ArgsWrapper, ExpandArgs, Thunk } from './core/types';
+export type { ResourceAPI } from './function-based';
+export type { Reactive } from './function-based/types';
+export type { ArgsWrapper, ExpandArgs, Thunk } from './types';
diff --git a/ember-resources/src/core/types.ts → ember-resources/src/types.ts b/ember-resources/src/core/types.ts → ember-resources/src/types.ts
diff --git a/ember-resources/src/core/types/base.ts → ember-resources/src/types/base.ts b/ember-resources/src/core/types/base.ts → ember-resources/src/types/base.ts
diff --git a/...esources/src/core/types/signature-args.ts → ember-resources/src/types/signature-args.ts b/...esources/src/core/types/signature-args.ts → ember-resources/src/types/signature-args.ts
diff --git a/ember-resources/src/core/types/thunk.ts → ember-resources/src/types/thunk.ts b/ember-resources/src/core/types/thunk.ts → ember-resources/src/types/thunk.ts
diff --git a/ember-resources/src/core/use.ts → ember-resources/src/use.ts b/ember-resources/src/core/use.ts → ember-resources/src/use.ts
diff --git a/ember-resources/src/core/utils.ts → ember-resources/src/utils.ts b/ember-resources/src/core/utils.ts → ember-resources/src/utils.ts
diff --git a/ember-resources/tsconfig.json b/ember-resources/tsconfig.json
@@ -14,8 +14,7 @@
     // Lazy import settings, affects build time only
     // because these aliases are only used for type imports
     "paths": {
-      "[core-types]": ["./src/core/types"],
-      "[deprecated-types]": ["./src/deprecated-in-v4/types"]
+      "[core-types]": ["./src/types"]
     }
   }
 }