Skip to content

Commit e77fc12

Browse files
Merge pull request #1467 from emberjs/fix-type-imports
Fix import type via upgrading @tsconfig/ember
2 parents 44be785 + 63b1d5d commit e77fc12

42 files changed

Lines changed: 192 additions & 105 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci-build.yml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@ jobs:
3737
cache: pnpm
3838
- name: Install Dependencies
3939
run: pnpm install
40+
- name: Build addon
41+
working-directory: addon
42+
run: pnpm build
4043
- run: pnpm test
44+
- name: own types
45+
working-directory: addon
46+
run: pnpm tsc --noEmit
4147

4248
floating:
4349
name: "Floating Dependencies"
@@ -52,8 +58,14 @@ jobs:
5258
cache: pnpm
5359
- name: Install Dependencies
5460
run: pnpm install --no-lockfile
61+
- name: Build addon
62+
working-directory: addon
63+
run: pnpm build
5564
- name: Run Tests
5665
run: pnpm test
66+
- name: own types
67+
working-directory: addon
68+
run: pnpm tsc --noEmit
5769

5870
try-scenarios:
5971
timeout-minutes: 10
@@ -88,6 +100,9 @@ jobs:
88100
cache: pnpm
89101
- name: Install Dependencies
90102
run: pnpm install
103+
- name: Build addon
104+
working-directory: addon
105+
run: pnpm build
91106
- name: test
92107
working-directory: addon
93108
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
@@ -121,9 +136,12 @@ jobs:
121136
cache: pnpm
122137
- name: Install Dependencies
123138
run: pnpm install
124-
- name: install TS version
139+
- name: Build types for addon
125140
working-directory: addon
141+
run: pnpm build
142+
- name: install TS version
143+
working-directory: type-tests
126144
run: pnpm add --save-dev typescript@${{matrix.ts-version}}
127-
- name: test types
128-
working-directory: addon
129-
run: pnpm lint:ts
145+
- name: public types
146+
working-directory: type-tests
147+
run: pnpm test

addon/addon-test-support/@ember/test-helpers/-internal/build-registry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import EmberObject from '@ember/object';
66
import require, { has } from 'require';
77
import Ember from 'ember';
88

9-
import { FullName } from '@ember/owner';
9+
import type { FullName } from '@ember/owner';
1010

1111
// These shenanigans work around the fact that the import locations are not
1212
// public API and are not stable, so we jump through hoops to get the right

addon/addon-test-support/@ember/test-helpers/-internal/debug-info.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
// "provides" this public API, but does not for earlier versions. As a result,
33
// this type will be `any`.
44
import { _backburner } from '@ember/runloop';
5-
import { DebugInfo as BackburnerDebugInfo } from '@ember/runloop/-private/backburner';
6-
import { DebugInfoHelper, debugInfoHelpers } from './debug-info-helpers';
7-
import { getPendingWaiterState, PendingWaiterState } from '@ember/test-waiters';
5+
import type { DebugInfo as BackburnerDebugInfo } from '@ember/runloop/-private/backburner';
6+
import { type DebugInfoHelper, debugInfoHelpers } from './debug-info-helpers';
7+
import {
8+
getPendingWaiterState,
9+
type PendingWaiterState,
10+
} from '@ember/test-waiters';
811

912
const PENDING_AJAX_REQUESTS = 'Pending AJAX requests';
1013
const PENDING_TEST_WAITERS = 'Pending test waiters';

addon/addon-test-support/@ember/test-helpers/-internal/deprecations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseContext } from '../setup-context';
1+
import type { BaseContext } from '../setup-context';
22
import { registerDeprecationHandler } from '@ember/debug';
33
import isPromise from './is-promise';
44

addon/addon-test-support/@ember/test-helpers/-internal/warnings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseContext } from '../setup-context';
1+
import type { BaseContext } from '../setup-context';
22
import { registerWarnHandler } from '@ember/debug';
33
import isPromise from './is-promise';
44

addon/addon-test-support/@ember/test-helpers/build-owner.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import Application from '@ember/application';
22
import type { Resolver } from '@ember/owner';
33

44
import legacyBuildRegistry from './-internal/build-registry';
5-
import EmberOwner from '@ember/owner';
6-
import { SimpleElement } from '@simple-dom/interface';
5+
import type EmberOwner from '@ember/owner';
6+
import type { SimpleElement } from '@simple-dom/interface';
77

88
export interface Owner extends EmberOwner {
99
_emberTestHelpersMockOwner?: boolean;

addon/addon-test-support/@ember/test-helpers/dom/-get-description.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { isDescriptor, lookupDescriptorData } from 'dom-element-descriptors';
2-
import type Target from './-target';
2+
import type { Target } from './-target';
33

44
/**
55
Used internally by the DOM interaction helpers to get a description of a

addon/addon-test-support/@ember/test-helpers/dom/-get-element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import getRootElement from './get-root-element';
2-
import Target, { isDocument, isElement } from './-target';
2+
import { type Target, isDocument, isElement } from './-target';
33
import {
44
type IDOMElementDescriptor,
55
lookupDescriptorData,

addon/addon-test-support/@ember/test-helpers/dom/-get-window-or-element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import getElement from './-get-element';
2-
import Target, { isWindow } from './-target';
2+
import { type Target, isWindow } from './-target';
33

44
/**
55
Used internally by the DOM interaction helpers to find either window or an element.

addon/addon-test-support/@ember/test-helpers/dom/-guard-for-maxlength.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FormControl } from './-is-form-control';
1+
import type { FormControl } from './-is-form-control';
22

33
// ref: https://html.spec.whatwg.org/multipage/input.html#concept-input-apply
44
const constrainedInputTypes = [

0 commit comments

Comments
 (0)