Skip to content

Commit fb95dc3

Browse files
runspiredMehulKChaudhari
runspired
authored and
MehulKChaudhari
committed
chore: update to pnpm 10 (emberjs#9699)
* chore: update to pnpm 10 * fix prettier * fixup settings * fixup npmrc * fix lockfile * bump to 10.5.2 * make work with pnpm * add script to warp-drive package * fix patch * fixup no-shadow-rule * chore: fix fastboot test app * fix lock
1 parent e7c6f3a commit fb95dc3

File tree

60 files changed

+16890
-14656
lines changed

Some content is hidden

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

60 files changed

+16890
-14656
lines changed

‎.npmrc

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,19 @@ hoist-pattern[]=*node-fetch*
1313
# https://github.com/pnpm/pnpm/issues/5340
1414
strict-peer-dependencies=true
1515
auto-install-peers=false # probably apps should set this to true, but we need to test with it false to be sure we aren't the bad citizen
16-
dedupe-peer-dependents=true # this currently introduces more bugs than it fixes
16+
dedupe-peer-dependents=false # this currently introduces more bugs than it fixes
1717
resolve-peers-from-workspace-root=false # if its not declared we don't want it resolved: ensure tests are truly isolated
1818
save-workspace-protocol=rolling
1919
resolution-mode=highest
2020
dedupe-direct-deps=true
2121
child-concurrency=10
2222
ignore-dep-scripts=true
2323
dedupe-injected-deps=false
24+
link-workspace-packages=deep
2425
hoist-workspace-packages=false
2526
enable-pre-post-scripts=false
27+
manage-package-manager-versions=false
28+
inject-workspace-packages=true
29+
30+
public-hoist-pattern[]=*eslint*
31+
public-hoist-pattern[]=*prettier*

‎config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
"volta": {
3535
"extends": "../package.json"
3636
},
37-
"packageManager": "pnpm@8.15.9"
37+
"packageManager": "pnpm@10.5.2"
3838
}

‎package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@
7171
"node": ">= 18.20.4",
7272
"yarn": "use pnpm",
7373
"npm": "use pnpm",
74-
"pnpm": "8.15.9"
74+
"pnpm": "10.5.2"
7575
},
7676
"volta": {
7777
"node": "22.3.0",
78-
"pnpm": "8.15.9"
78+
"pnpm": "10.5.2"
7979
},
80-
"packageManager": "pnpm@8.15.9",
80+
"packageManager": "pnpm@10.5.2",
8181
"changelog": {
8282
"labels": {
8383
":label: breaking": ":boom: Breaking Change",
@@ -174,7 +174,8 @@
174174
"testem@3.11.0": "patches/testem@3.11.0.patch",
175175
"@ember/test-helpers@3.3.0": "patches/@ember__test-helpers@3.3.0.patch",
176176
"@ember/test-helpers@4.0.4": "patches/@ember__test-helpers@4.0.4.patch",
177-
"@ember/test-helpers@5.1.0": "patches/@ember__test-helpers@5.1.0.patch"
177+
"@ember/test-helpers@5.1.0": "patches/@ember__test-helpers@5.1.0.patch",
178+
"pnpm-sync-dependencies-meta-injected": "patches/pnpm-sync-dependencies-meta-injected.patch"
178179
}
179180
}
180181
}

‎packages/-ember-data/package.json

+1-42
Original file line numberDiff line numberDiff line change
@@ -66,47 +66,6 @@
6666
},
6767
"author": "",
6868
"license": "MIT",
69-
"dependenciesMeta": {
70-
"@ember-data/adapter": {
71-
"injected": true
72-
},
73-
"@ember-data/graph": {
74-
"injected": true
75-
},
76-
"@ember-data/debug": {
77-
"injected": true
78-
},
79-
"@ember-data/model": {
80-
"injected": true
81-
},
82-
"@ember-data/json-api": {
83-
"injected": true
84-
},
85-
"@ember-data/request": {
86-
"injected": true
87-
},
88-
"@ember-data/request-utils": {
89-
"injected": true
90-
},
91-
"@ember-data/legacy-compat": {
92-
"injected": true
93-
},
94-
"@ember-data/serializer": {
95-
"injected": true
96-
},
97-
"@ember-data/store": {
98-
"injected": true
99-
},
100-
"@ember-data/tracking": {
101-
"injected": true
102-
},
103-
"@warp-drive/core-types": {
104-
"injected": true
105-
},
106-
"@warp-drive/build-config": {
107-
"injected": true
108-
}
109-
},
11069
"dependencies": {
11170
"@ember-data/adapter": "workspace:*",
11271
"@ember-data/debug": "workspace:*",
@@ -168,5 +127,5 @@
168127
"volta": {
169128
"extends": "../../package.json"
170129
},
171-
"packageManager": "pnpm@8.15.9"
130+
"packageManager": "pnpm@10.5.2"
172131
}

‎packages/-warp-drive/package.json

+3-7
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"author": "Chris Thoburn <runspired@users.noreply.github.com>",
2727
"scripts": {
2828
"build:pkg": "vite build;",
29-
"prepack": "bun run build:pkg"
29+
"prepack": "bun run build:pkg",
30+
"sync-hardlinks": "bun run sync-dependencies-meta-injected"
3031
},
3132
"bin": {
3233
"warp-drive": "./dist/warp-drive.js",
@@ -44,11 +45,6 @@
4445
],
4546
"type": "module",
4647
"peerDependencies": {},
47-
"dependenciesMeta": {
48-
"@warp-drive/build-config": {
49-
"injected": true
50-
}
51-
},
5248
"dependencies": {
5349
"@embroider/macros": "^1.16.10",
5450
"@manypkg/get-packages": "^2.2.2",
@@ -73,5 +69,5 @@
7369
"volta": {
7470
"extends": "../../package.json"
7571
},
76-
"packageManager": "pnpm@8.15.9"
72+
"packageManager": "pnpm@10.5.2"
7773
}

‎packages/active-record/package.json

-20
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,6 @@
6969
"vite": "^5.2.11",
7070
"typescript": "^5.7.2"
7171
},
72-
"dependenciesMeta": {
73-
"@warp-drive/core-types": {
74-
"injected": true
75-
},
76-
"@warp-drive/build-config": {
77-
"injected": true
78-
},
79-
"@ember-data/store": {
80-
"injected": true
81-
},
82-
"@ember-data/request-utils": {
83-
"injected": true
84-
},
85-
"@ember-data/request": {
86-
"injected": true
87-
},
88-
"@ember-data/tracking": {
89-
"injected": true
90-
}
91-
},
9272
"ember": {
9373
"edition": "octane"
9474
},

‎packages/active-record/src/-private/builders/query.ts

-2
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,11 @@ import { copyForwardUrlOptions, extractCacheOptions } from './-utils';
6262
*/
6363
export function query<T>(
6464
type: TypeFromInstance<T>,
65-
// eslint-disable-next-line @typescript-eslint/no-shadow
6665
query?: QueryParamsSource,
6766
options?: ConstrainedRequestOptions
6867
): QueryRequestOptions<T, CollectionResourceDataDocument<T>>;
6968
export function query(
7069
type: string,
71-
// eslint-disable-next-line @typescript-eslint/no-shadow
7270
query?: QueryParamsSource,
7371
options?: ConstrainedRequestOptions
7472
): QueryRequestOptions;

‎packages/adapter/package.json

+1-30
Original file line numberDiff line numberDiff line change
@@ -54,35 +54,6 @@
5454
"@ember-data/request-utils": "workspace:*",
5555
"@warp-drive/core-types": "workspace:*"
5656
},
57-
"dependenciesMeta": {
58-
"@warp-drive/core-types": {
59-
"injected": true
60-
},
61-
"@ember-data/legacy-compat": {
62-
"injected": true
63-
},
64-
"@ember-data/store": {
65-
"injected": true
66-
},
67-
"@ember-data/request": {
68-
"injected": true
69-
},
70-
"@ember-data/tracking": {
71-
"injected": true
72-
},
73-
"@ember-data/graph": {
74-
"injected": true
75-
},
76-
"@ember-data/json-api": {
77-
"injected": true
78-
},
79-
"@ember-data/request-utils": {
80-
"injected": true
81-
},
82-
"@warp-drive/build-config": {
83-
"injected": true
84-
}
85-
},
8657
"dependencies": {
8758
"@embroider/macros": "^1.16.10",
8859
"ember-cli-test-info": "^1.0.0",
@@ -119,5 +90,5 @@
11990
"volta": {
12091
"extends": "../../package.json"
12192
},
122-
"packageManager": "pnpm@8.15.9"
93+
"packageManager": "pnpm@10.5.2"
12394
}

‎packages/build-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@
6565
"volta": {
6666
"extends": "../../package.json"
6767
},
68-
"packageManager": "pnpm@8.15.9"
68+
"packageManager": "pnpm@10.5.2"
6969
}

‎packages/codemods/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@
5353
"volta": {
5454
"extends": "../../package.json"
5555
},
56-
"packageManager": "pnpm@8.15.9"
56+
"packageManager": "pnpm@10.5.2"
5757
}

‎packages/core-types/package.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,13 @@
5656
"volta": {
5757
"extends": "../../package.json"
5858
},
59-
"packageManager": "pnpm@8.15.9",
59+
"packageManager": "pnpm@10.5.2",
6060
"ember-addon": {
6161
"main": "addon-main.cjs",
6262
"type": "addon",
6363
"version": 2
6464
},
6565
"ember": {
6666
"edition": "octane"
67-
},
68-
"dependenciesMeta": {
69-
"@warp-drive/build-config": {
70-
"injected": true
71-
}
7267
}
7368
}

‎packages/debug/package.json

+1-27
Original file line numberDiff line numberDiff line change
@@ -46,32 +46,6 @@
4646
"@ember-data/request-utils": "workspace:*",
4747
"@warp-drive/core-types": "workspace:*"
4848
},
49-
"dependenciesMeta": {
50-
"@ember-data/store": {
51-
"injected": true
52-
},
53-
"@ember-data/model": {
54-
"injected": true
55-
},
56-
"@ember-data/legacy-compat": {
57-
"injected": true
58-
},
59-
"@ember-data/request": {
60-
"injected": true
61-
},
62-
"@ember-data/request-utils": {
63-
"injected": true
64-
},
65-
"@warp-drive/core-types": {
66-
"injected": true
67-
},
68-
"@ember-data/tracking": {
69-
"injected": true
70-
},
71-
"@warp-drive/build-config": {
72-
"injected": true
73-
}
74-
},
7549
"dependencies": {
7650
"@ember/edition-utils": "^1.2.0",
7751
"@embroider/macros": "^1.16.10",
@@ -112,5 +86,5 @@
11286
"volta": {
11387
"extends": "../../package.json"
11488
},
115-
"packageManager": "pnpm@8.15.9"
89+
"packageManager": "pnpm@10.5.2"
11690
}

‎packages/diagnostic/package.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"dependencies": {
9292
"chalk": "^5.3.0",
9393
"debug": "^4.3.7",
94-
"ember-cli-htmlbars": "^6.3.0",
9594
"tmp": "^0.2.3",
9695
"@warp-drive/build-config": "workspace:*"
9796
},
@@ -117,7 +116,7 @@
117116
"volta": {
118117
"extends": "../../package.json"
119118
},
120-
"packageManager": "pnpm@8.15.9",
119+
"packageManager": "pnpm@10.5.2",
121120
"ember-addon": {
122121
"main": "addon-main.cjs",
123122
"type": "addon",
@@ -126,10 +125,5 @@
126125
},
127126
"ember": {
128127
"edition": "octane"
129-
},
130-
"dependenciesMeta": {
131-
"@warp-drive/build-config": {
132-
"injected": true
133-
}
134128
}
135129
}

‎packages/diagnostic/src/ember.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { run } from '@ember/runloop';
2+
import { precompileTemplate } from '@ember/template-compilation';
23
import type { SetupContextOptions, TestContext as EmberTestContext } from '@ember/test-helpers';
34
import { getTestMetadata, hasCalledSetupRenderingContext, setupContext, teardownContext } from '@ember/test-helpers';
45
import type { Owner } from '@ember/test-helpers/build-owner';
56

6-
import { hbs } from 'ember-cli-htmlbars';
77
import AbstractTestLoader from 'ember-cli-test-loader/test-support/index';
88

99
import { module as _module, skip as _skip, test as _test, todo as _todo } from './-define';
@@ -13,7 +13,7 @@ import { setupGlobalHooks } from './internals/config';
1313
import { PublicTestInfo } from './internals/run';
1414

1515
// const OUTLET_TEMPLATE = hbs`{{outlet}}`;
16-
const INVOKE_PROVIDED_COMPONENT = hbs`<this.ProvidedComponent />` as object;
16+
const INVOKE_PROVIDED_COMPONENT = precompileTemplate('<this.ProvidedComponent />', { strictMode: false }) as object;
1717

1818
export interface TestContext extends EmberTestContext {
1919
element: HTMLDivElement;

‎packages/diagnostic/vite.config.mjs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { createConfig } from '@warp-drive/internal-config/vite/config.js';
44
export const externals = [
55
'@ember/runloop',
66
'@ember/test-helpers',
7+
'@ember/template-compilation',
78
'ember-cli-test-loader/test-support/index',
89
'@glimmer/manager',
910
];

‎packages/ember/package.json

-20
Original file line numberDiff line numberDiff line change
@@ -54,26 +54,6 @@
5454
"@embroider/macros": "^1.16.10",
5555
"@warp-drive/build-config": "workspace:*"
5656
},
57-
"dependenciesMeta": {
58-
"@ember-data/store": {
59-
"injected": true
60-
},
61-
"@ember-data/request": {
62-
"injected": true
63-
},
64-
"@ember-data/request-utils": {
65-
"injected": true
66-
},
67-
"@warp-drive/core-types": {
68-
"injected": true
69-
},
70-
"@ember-data/tracking": {
71-
"injected": true
72-
},
73-
"@warp-drive/build-config": {
74-
"injected": true
75-
}
76-
},
7757
"peerDependenciesMeta": {
7858
"ember-provide-consume-context": {
7959
"optional": true

0 commit comments

Comments
 (0)