Skip to content

Commit

Permalink
Correctly configure package.json#exports for use with tsconfig.json#c…
Browse files Browse the repository at this point in the history
…ompilerOptions#types

Fix: #9630
Fix: ember-cli/ember-cli#10611

Related:
- ember-cli/ember-cli#10613

Unblocks:
- ember-cli/ember-cli#10612
  • Loading branch information
NullVoxPopuli committed Jan 22, 2025
1 parent 1110717 commit bed0680
Show file tree
Hide file tree
Showing 18 changed files with 3,744 additions and 3,051 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/compat-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,33 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Basic Tests
run: pnpm test

packageManagers:
name: Smoke test w/ ${{ matrix.packageManager }} & ${{ matrix.kind }}
timeout-minutes: 10
runs-on: ubuntu-latest
strategy:
matrix:
packageManager:
- npm
# - yarn # yarn@1 has not been reliable, if yarn@4 were easy to setup, we could test against that
- pnpm
kind:
- alpha # requires unstable-preview-types folder for each package
# These aren't ready yet, they require additional folders
# - beta # requires preview-types folder for each package
# - stable # requires types folder for each package

steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
- uses: ./.github/actions/setup
with:
restore-broccoli-cache: true
install: true
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: "Run a basic smoke test with ${{ matrix.packageManager }} and ${{ matrix.kind }} tagging"
run: |
bun ./scripts/test-package-manager.mjs \
"${{ matrix.packageManager }}" "${{ matrix.kind}}"
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# because we have a hoist-pattern. This basically just lets us
# use the very narrowly scoped hoist-pattern.
hoist=true

# Fastboot Doesnt respect node_modules resolution for whitelisted deps
# https://github.com/ember-fastboot/ember-cli-fastboot/issues/901
hoist-pattern[]=*node-fetch*
Expand All @@ -17,7 +18,6 @@ dedupe-peer-dependents=true # this currently introduces more bugs than it fixes
resolve-peers-from-workspace-root=false # if its not declared we don't want it resolved: ensure tests are truly isolated
save-workspace-protocol=rolling
resolution-mode=highest
dedupe-direct-deps=true
child-concurrency=10
ignore-dep-scripts=true
dedupe-injected-deps=false
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"scripts": {
"takeoff": "FORCE_COLOR=2 pnpm install --prefer-offline --reporter=append-only",
"prepare": "turbo run build:infra; pnpm --filter './packages/*' run --parallel --if-present sync-hardlinks; turbo run build:pkg; pnpm run prepare:types; pnpm run _task:sync-hardlinks;",
"prepare:types": "tsc --build --force; turbo run build:glint;",
"prepare:types": "tsc --build --force; turbo run build:glint",
"release": "./release/index.ts",
"build": "turbo _build --log-order=stream --filter=./packages/* --concurrency=10;",
"_task:sync-hardlinks": "pnpm run -r --parallel --if-present sync-hardlinks;",
Expand Down
2 changes: 0 additions & 2 deletions packages/active-record/src/-private/builders/query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,11 @@ import { copyForwardUrlOptions, extractCacheOptions } from './-utils';
*/
export function query<T>(
type: TypeFromInstance<T>,
// eslint-disable-next-line @typescript-eslint/no-shadow
query?: QueryParamsSource,
options?: ConstrainedRequestOptions
): QueryRequestOptions<T, CollectionResourceDataDocument<T>>;
export function query(
type: string,
// eslint-disable-next-line @typescript-eslint/no-shadow
query?: QueryParamsSource,
options?: ConstrainedRequestOptions
): QueryRequestOptions;
Expand Down
2 changes: 1 addition & 1 deletion packages/ember/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],
"scripts": {
"_lint": "eslint . --quiet --cache --cache-strategy=content",
"build:glint": "glint --build",
"build:glint": "glint && glint --build",
"build:pkg": "vite build;",
"prepack": "bun run build:pkg",
"sync-hardlinks": "bun run sync-dependencies-meta-injected"
Expand Down
4 changes: 2 additions & 2 deletions packages/request/src/-private/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ export class Context {
#owner: ContextOwner;
declare request: ImmutableRequestInfo;
declare id: number;
private declare _isCacheHandler: boolean;
private declare _finalized: boolean;
declare private _isCacheHandler: boolean;
declare private _finalized: boolean;

constructor(owner: ContextOwner, isCacheHandler: boolean) {
this.id = owner.requestId;
Expand Down
Loading

0 comments on commit bed0680

Please sign in to comment.