Extract types and util into core package

packages/cloudinary/package.json

@@ -45,6 +45,7 @@
     "@babel/core": "7.24.4",
     "@babel/plugin-transform-typescript": "7.24.4",
     "@babel/runtime": "7.24.4",
+    "@ember-responsive-image/core": "workspace:*",
     "ember-responsive-image": "workspace:*",
     "@embroider/addon-dev": "4.3.1",
     "@glimmer/component": "1.1.2",

packages/cloudinary/src/helpers/responsive-image-cloudinary-provider.ts

@@ -4,11 +4,9 @@ import { assert } from '@ember/debug';
 import { getOwnConfig } from '@embroider/macros';
 import type { CloudinaryConfig } from '../types.ts';
 
-import type {
-  ResponsiveImageService,
-  ImageType,
-  ImageData,
-} from 'ember-responsive-image';
+import type { ResponsiveImageService } from 'ember-responsive-image';
+
+import type { ImageType, ImageData } from '@ember-responsive-image/core';
 
 interface CloudinaryOptions {
   transformations?: string;

packages/core/rollup.config.mjs

@@ -8,7 +8,9 @@ export default {
   },
 
   plugins: [
-    babel(),
+    babel({
+      extensions: ['.js', '.ts'],
+    }),
 
     // Copy Readme and License into published package
     copy({

packages/core/src/index.ts

@@ -1 +1,2 @@
-// export type * from './types.ts';
+export type * from './types.ts';
+export { findMatchingImage } from './match.ts';

packages/ember-responsive-image/src/utils/match.ts → packages/core/src/match.ts

@@ -1,4 +1,4 @@
-import type { ImageOutputResult, ImageType } from '../types.ts';
+import type { ImageOutputResult, ImageType } from './types.ts';
 
 export function findMatchingImage(
   images: ImageOutputResult[],

packages/core/src/types.ts

@@ -0,0 +1,37 @@
+export type ImageType = 'png' | 'jpeg' | 'webp' | 'avif';
+
+export interface LqipBase {
+  type: string;
+}
+
+export interface LqipInline extends LqipBase {
+  type: 'inline';
+  class: string;
+}
+
+export interface LqipColor extends LqipBase {
+  type: 'color';
+  class: string;
+}
+
+export interface LqipBlurhash extends LqipBase {
+  type: 'blurhash';
+  hash: string;
+  width: number;
+  height: number;
+}
+
+export interface ImageData {
+  imageTypes: ImageType[];
+  availableWidths?: number[];
+  aspectRatio?: number;
+  imageUrlFor(width: number, type?: ImageType): string;
+  fingerprint?: string;
+  lqip?: LqipInline | LqipColor | LqipBlurhash;
+}
+
+export interface ImageOutputResult {
+  url: string;
+  width: number;
+  format: ImageType;
+}

packages/ember-responsive-image/package.json

@@ -31,6 +31,7 @@
     "prepack": "rollup --config"
   },
   "dependencies": {
+    "@ember-responsive-image/core": "workspace:^",
     "@ember/render-modifiers": "^2.0.0",
     "@embroider/addon-shim": "^1.8.7",
     "@embroider/macros": "^1.0.0",

packages/ember-responsive-image/src/components/responsive-image.ts

@@ -5,7 +5,11 @@ import { assert } from '@ember/debug';
 import { cached, tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { macroCondition, dependencySatisfies } from '@embroider/macros';
-import type { ImageType, LqipBlurhash, ImageData } from '../types.ts';
+import type {
+  ImageType,
+  LqipBlurhash,
+  ImageData,
+} from '@ember-responsive-image/core';
 
 import './responsive-image.css';
 

packages/ember-responsive-image/src/helpers/responsive-image-resolve.ts

@@ -2,7 +2,7 @@ import { inject as service } from '@ember/service';
 import { htmlSafe } from '@ember/template';
 import Helper from '@ember/component/helper';
 import ResponsiveImageService from '../services/responsive-image.ts';
-import type { ImageType, ImageData } from '../types.ts';
+import type { ImageType, ImageData } from '@ember-responsive-image/core';
 
 interface ResponsiveImageResolveSignature {
   Args: {

packages/ember-responsive-image/src/index.ts

@@ -1,5 +1,3 @@
 export { default as ResponsiveImage } from './components/responsive-image.ts';
 export { default as ResponsiveImageService } from './services/responsive-image.ts';
 export { default as resolve } from './helpers/responsive-image-resolve.ts';
-export * from './types.ts';
-export { findMatchingImage } from './utils/match.ts';

packages/imgix/package.json

@@ -45,6 +45,7 @@
     "@babel/core": "7.24.4",
     "@babel/plugin-transform-typescript": "7.24.4",
     "@babel/runtime": "7.24.4",
+    "@ember-responsive-image/core": "workspace:*",
     "ember-responsive-image": "workspace:*",
     "@embroider/addon-dev": "4.3.1",
     "@glimmer/component": "1.1.2",

packages/imgix/src/helpers/responsive-image-imgix-provider.ts

@@ -4,11 +4,9 @@ import { assert } from '@ember/debug';
 import { getOwnConfig } from '@embroider/macros';
 import type { ImgixConfig } from '../types.ts';
 
-import type {
-  ResponsiveImageService,
-  ImageType,
-  ImageData,
-} from 'ember-responsive-image';
+import type { ResponsiveImageService } from 'ember-responsive-image';
+
+import type { ImageType, ImageData } from '@ember-responsive-image/core';
 
 interface ImgixProviderSignature {
   Args: {

packages/webpack/package.json

@@ -22,6 +22,7 @@
     "prepack": "rollup --config"
   },
   "dependencies": {
+    "@ember-responsive-image/core": "workspace:^",
     "base-n": "^3.0.0",
     "loader-utils": "^3.2.0",
     "sharp": "^0.33.0"

packages/webpack/src/export.ts

@@ -1,4 +1,7 @@
-import type { ImageOutputResult, ImageType } from 'ember-responsive-image';
+import type {
+  ImageOutputResult,
+  ImageType,
+} from '@ember-responsive-image/core';
 import { interpolateName } from 'loader-utils';
 import * as path from 'path';
 import type { LoaderContext } from 'webpack';

packages/webpack/src/images.ts

@@ -1,4 +1,4 @@
-import type { ImageType } from 'ember-responsive-image';
+import type { ImageType } from '@ember-responsive-image/core';
 import type { Metadata, Sharp } from 'sharp';
 import type { LoaderContext } from 'webpack';
 import type {

packages/webpack/src/types.ts

@@ -3,7 +3,7 @@ import type {
   LqipBlurhash,
   LqipColor,
   LqipInline,
-} from 'ember-responsive-image';
+} from '@ember-responsive-image/core';
 import type { Metadata, Sharp } from 'sharp';
 
 export type OutputImageType = 'original' | ImageType;