Update environment packages for ESM + exports

typed-ember · Nov 8, 2022 · cd20907 · cd20907
1 parent a4ad23e
commit cd20907
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 16 deletions.
diff --git a/packages/environment-ember-loose/-private/dsl/index.d.ts b/packages/environment-ember-loose/-private/dsl/index.d.ts
@@ -1,5 +1,8 @@
 export * from './without-function-resolution';
 
+// Exported for `environment-ember-template-imports` to reuse
+export type { ComponentKeyword } from '../intrinsics/component';
+
 import { ResolveOrReturn } from '@glint/template/-private/dsl';
 import {
   DirectInvokable,

diff --git a/packages/environment-ember-loose/-private/environment/index.ts b/packages/environment-ember-loose/-private/environment/index.ts
@@ -1,4 +1,4 @@
-import { GlintEnvironmentConfig, PathCandidate } from '@glint/config';
+import { GlintEnvironmentConfig, PathCandidate } from '@glint/config/types';
 
 const REGEXES = {
   JS_SCRIPT_EXT: /\.js$/,

diff --git a/...ember-loose/__tests__/environment.test.ts → ...mber-loose/__tests__/environment.test.mts b/...ember-loose/__tests__/environment.test.ts → ...mber-loose/__tests__/environment.test.mts
@@ -1,5 +1,5 @@
 import { describe, test, expect } from 'vitest';
-import { GlintEnvironment } from '@glint/config/lib/environment';
+import { GlintEnvironment } from '@glint/config';
 
 describe('Environments: Ember Loose', () => {
   test.each(['ts', 'js'])('finds possible template paths for %s script paths', (ext) => {

diff --git a/packages/environment-ember-loose/__tests__/tsconfig.json b/packages/environment-ember-loose/__tests__/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../../tsconfig.compileroptions.json"
+}
diff --git a/packages/environment-ember-loose/__tests__/type-tests/intrinsics/component.test.ts b/packages/environment-ember-loose/__tests__/type-tests/intrinsics/component.test.ts
@@ -7,7 +7,7 @@ import {
   NamedArgsMarker,
 } from '@glint/environment-ember-loose/-private/dsl';
 import Component from '@ember/component';
-import { ComponentKeyword } from '@glint/environment-ember-loose/-private/intrinsics/component';
+import { ComponentKeyword } from '../../../-private/intrinsics/component';
 import { WithBoundArgs, ComponentLike } from '@glint/template';
 
 const componentKeyword = resolve({} as ComponentKeyword<LocalRegistry>);

diff --git a/packages/environment-ember-loose/__tests__/type-tests/intrinsics/mut.test.ts b/packages/environment-ember-loose/__tests__/type-tests/intrinsics/mut.test.ts
@@ -1,6 +1,6 @@
 import { expectTypeOf } from 'expect-type';
 import { Globals, NamedArgsMarker, resolve } from '@glint/environment-ember-loose/-private/dsl';
-import { Mut } from '@glint/environment-ember-loose/-private/intrinsics/mut';
+import { Mut } from '../../../-private/intrinsics/mut';
 
 let fn = resolve(Globals['fn']);
 let mut = resolve(Globals['mut']);

diff --git a/packages/environment-ember-loose/package.json b/packages/environment-ember-loose/package.json
@@ -7,7 +7,13 @@
   "author": "Dan Freeman (https://github.com/dfreeman)",
   "glint-environment": "-private/environment/index.js",
   "main": "-private/index.js",
-  "types": "-private/index.d.ts",
+  "exports": {
+    ".": "./-private/index.js",
+    "./package.json": "./package.json",
+    "./registry": "./registry/index.js",
+    "./-private/dsl": "./-private/dsl/index.js",
+    "./-private/dsl/without-function-resolution": "./-private/dsl/without-function-resolution.js"
+  },
   "keywords": [
     "glint-environment"
   ],

diff --git a/packages/environment-ember-template-imports/-private/dsl/globals.d.ts b/packages/environment-ember-template-imports/-private/dsl/globals.d.ts
@@ -1,4 +1,4 @@
-import { ComponentKeyword } from '@glint/environment-ember-loose/-private/intrinsics/component';
+import { ComponentKeyword } from '@glint/environment-ember-loose/-private/dsl';
 import { Globals as EELGlobals } from '@glint/environment-ember-loose/-private/dsl';
 
 interface Keywords

diff --git a/packages/environment-ember-template-imports/-private/environment/index.ts b/packages/environment-ember-template-imports/-private/environment/index.ts
@@ -1,4 +1,4 @@
-import { GlintEnvironmentConfig } from '@glint/config';
+import { GlintEnvironmentConfig } from '@glint/config/types';
 import { preprocess } from './preprocess';
 import { transform } from './transform';
 

diff --git a/packages/environment-ember-template-imports/-private/environment/preprocess.ts b/packages/environment-ember-template-imports/-private/environment/preprocess.ts
@@ -1,4 +1,4 @@
-import { GlintExtensionPreprocess } from '@glint/config';
+import { GlintExtensionPreprocess } from '@glint/config/types';
 import { parseTemplates } from 'ember-template-imports';
 import { GLOBAL_TAG, PreprocessData, TemplateLocation } from './common';
 

diff --git a/packages/environment-ember-template-imports/-private/environment/transform.ts b/packages/environment-ember-template-imports/-private/environment/transform.ts
@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
-import { GlintExtensionTransform } from '@glint/config';
+import { GlintExtensionTransform } from '@glint/config/types';
 import { PreprocessData, GLOBAL_TAG, TemplateLocation } from './common';
 
 type TSLib = typeof ts;

diff --git a/packages/environment-ember-template-imports/__tests__/transformation.test.ts b/packages/environment-ember-template-imports/__tests__/transformation.test.ts
@@ -1,9 +1,9 @@
-import ts from 'typescript';
+import * as ts from 'typescript';
 import { stripIndent } from 'common-tags';
 import { describe, test, expect } from 'vitest';
 import { preprocess } from '../-private/environment/preprocess';
 import { transform } from '../-private/environment/transform';
-import { GlintEmitMetadata } from '@glint/config/lib/environment';
+import { GlintEmitMetadata } from '@glint/config/types';
 
 describe('Environment: ETI', () => {
   describe('preprocess', () => {

diff --git a/packages/environment-ember-template-imports/__tests__/tsconfig.json b/packages/environment-ember-template-imports/__tests__/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "extends": "../../../tsconfig.compileroptions.json",
+  "compilerOptions": { "rootDir": ".." },
+  "include": [".", "../-private"]
+}
diff --git a/packages/environment-ember-template-imports/package.json b/packages/environment-ember-template-imports/package.json
@@ -5,9 +5,13 @@
   "description": "A Glint environment to support ember-template-imports projects",
   "license": "MIT",
   "author": "Dan Freeman (https://github.com/dfreeman)",
-  "glint-environment": "-private/environment",
+  "glint-environment": "-private/environment/index.js",
   "main": "-private/index.js",
-  "types": "-private/index.d.ts",
+  "exports": {
+    ".": "./-private/index.js",
+    "./package.json": "./package.json",
+    "./-private/dsl": "./-private/dsl/index.js"
+  },
   "keywords": [
     "glint-environment"
   ],

diff --git a/packages/environment-glimmerx/-private/environment/index.ts b/packages/environment-glimmerx/-private/environment/index.ts
@@ -1,4 +1,4 @@
-import { GlintEnvironmentConfig, GlintTagConfig } from '@glint/config';
+import { GlintEnvironmentConfig, GlintTagConfig } from '@glint/config/types';
 
 export default function glimmerxEnvironment(
   config: Record<string, unknown>

diff --git a/packages/environment-glimmerx/package.json b/packages/environment-glimmerx/package.json
@@ -5,9 +5,14 @@
   "description": "A Glint environment to support GlimmerX projects",
   "license": "MIT",
   "author": "Dan Freeman (https://github.com/dfreeman)",
-  "main": "-private/index.js",
-  "types": "-private/index.d.ts",
   "glint-environment": "-private/environment/index.js",
+  "main": "./-private/index.js",
+  "exports": {
+    ".": "./-private/index.js",
+    "./package.json": "./package.json",
+    "./globals": "./globals/index.js",
+    "./-private/dsl": "./-private/dsl/index.js"
+  },
   "keywords": [
     "glint-environment"
   ],