Skip to content

Commit dfaa2b8

Browse files
runspiredrunspired
authored
feat: ember specific data utils (emberjs#9260)
* feat: ember data primitives * more fixes * maybe * update settings * all the things * test fixes etc * fixes * more updates * fixup * fix workflow * lint fixes * add brew back * all the lint * fix fastboot tests * more fixes? * updates * fix all the things * cleanup lint * bump timeout * cleanup * more tests and gts fixes * more tests * all the, nice things * cleanup * more updates * fixes
1 parent 630ed26 commit dfaa2b8

File tree

191 files changed

+8556
-4063
lines changed

Some content is hidden

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

191 files changed

+8556
-4063
lines changed

‎.github/actions/setup/action.yml

+16
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ inputs:
4646
description: Token to use for TurboRepo
4747
required: false
4848
default: ''
49+
with-cert:
50+
description: Whether to setup an SSL Cert
51+
required: false
52+
default: false
4953

5054
runs:
5155
using: composite
@@ -67,6 +71,18 @@ runs:
6771
with:
6872
repo-token: ${{ inputs.repo-token }}
6973

74+
- name: Set Up Homebrew
75+
if: ${{ inputs.with-cert }}
76+
id: set-up-homebrew
77+
uses: Homebrew/actions/setup-homebrew@master
78+
79+
- name: 'Setup SSL Cert'
80+
if: ${{ inputs.with-cert }}
81+
shell: bash
82+
run: |
83+
sudo apt install libnss3-tools
84+
brew install mkcert
85+
7086
- name: Configure Parallel Builds
7187
if: ${{ inputs.parallel-build == 'true' }}
7288
shell: bash

‎.github/workflows/main.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323

2424
jobs:
2525
lint:
26-
timeout-minutes: 6
26+
timeout-minutes: 8
2727
runs-on: ubuntu-latest
2828
steps:
2929
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
@@ -49,6 +49,7 @@ jobs:
4949
restore-broccoli-cache: true
5050
install: true
5151
repo-token: ${{ secrets.GITHUB_TOKEN }}
52+
with-cert: true
5253
- if: |
5354
github.event_name == 'pull_request' && (
5455
github.base_ref == 'main' || github.base_ref == 'beta'
@@ -90,6 +91,7 @@ jobs:
9091
restore-broccoli-cache: true
9192
jobs: 2
9293
parallel-build: true
94+
with-cert: true
9395
install: true
9496
repo-token: ${{ secrets.GITHUB_TOKEN }}
9597

@@ -156,6 +158,7 @@ jobs:
156158
- uses: ./.github/actions/setup
157159
with:
158160
restore-broccoli-cache: true
161+
with-cert: true
159162
install: true
160163
repo-token: ${{ secrets.GITHUB_TOKEN }}
161164
- name: Basic tests with ${{ matrix.scenario }}
@@ -183,6 +186,7 @@ jobs:
183186
- uses: ./.github/actions/setup
184187
with:
185188
restore-broccoli-cache: true
189+
with-cert: true
186190
install: true
187191
repo-token: ${{ secrets.GITHUB_TOKEN }}
188192
- name: Basic tests with ${{ matrix.release }}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ packages/schema-record/addon/
2525
packages/serializer/addon
2626
packages/store/addon
2727
packages/tracking/addon
28+
packages/ember/addon
2829

2930
# dependencies
3031
bower_components

‎.prettierrc.js

+16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
11
module.exports = {
22
trailingComma: 'es5',
33
printWidth: 120,
4+
plugins: ['prettier-plugin-ember-template-tag'],
45
overrides: [
56
{
67
files: '*.{js,ts,cjs,cts,mjs,mts}',
78
options: {
89
singleQuote: true,
910
},
1011
},
12+
{
13+
files: ['*.hbs'],
14+
options: {
15+
singleQuote: false,
16+
},
17+
},
18+
{
19+
files: ['*.gjs', '*.gts'],
20+
options: {
21+
parser: 'ember-template-tag',
22+
singleQuote: true,
23+
templateSingleQuote: false,
24+
trailingComma: 'es5',
25+
},
26+
},
1127
],
1228
};

‎@types/@glimmer/tracking.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export function cached(target: object, key: string, desc: PropertyDescriptor): void;
22

3-
export function tracked(target: object, key: string): void;
3+
export function tracked(target: object, key: string, desc?: object): void;

‎config/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"private": true,
44
"version": "5.4.0-alpha.39",
55
"dependencies": {
6-
"@babel/core": "^7.23.9",
7-
"@babel/eslint-parser": "^7.23.10",
8-
"@babel/plugin-proposal-decorators": "^7.23.9",
9-
"@typescript-eslint/eslint-plugin": "^6.15.0",
10-
"@typescript-eslint/parser": "^6.15.0",
11-
"eslint": "^8.56.0",
6+
"@babel/core": "^7.24.3",
7+
"@babel/eslint-parser": "^7.24.1",
8+
"@babel/plugin-proposal-decorators": "^7.24.1",
9+
"@typescript-eslint/eslint-plugin": "^7.3.1",
10+
"@typescript-eslint/parser": "^7.3.1",
11+
"eslint": "^8.57.0",
1212
"eslint-config-prettier": "^9.1.0",
1313
"eslint-plugin-import": "^2.29.1",
14-
"eslint-plugin-mocha": "^10.2.0",
15-
"eslint-plugin-n": "^16.5.0",
16-
"eslint-plugin-qunit": "^8.0.1",
17-
"eslint-plugin-simple-import-sort": "^10.0.0",
18-
"typescript": "~5.3.3"
14+
"eslint-plugin-mocha": "^10.4.1",
15+
"eslint-plugin-n": "^16.6.2",
16+
"eslint-plugin-qunit": "^8.1.1",
17+
"eslint-plugin-simple-import-sort": "^12.0.0",
18+
"typescript": "^5.4.3"
1919
},
2020
"engines": {
2121
"node": ">= 18.19.1"
2222
},
2323
"volta": {
2424
"extends": "../package.json"
2525
},
26-
"packageManager": "pnpm@8.6.0"
26+
"packageManager": "pnpm@8.15.5"
2727
}

‎package.json

+17-7
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,14 @@
3838
"test-external:ember-data-relationship-tracker": "node ./scripts/test-external-partner-project.js ember-data-relationship-tracker https://github.com/ef4/ember-data-relationship-tracker.git"
3939
},
4040
"devDependencies": {
41-
"bun-types": "^1.0.25",
41+
"@babel/core": "^7.24.3",
42+
"@glint/core": "^1.3.0",
43+
"@glint/environment-ember-loose": "^1.3.0",
44+
"@glint/environment-ember-template-imports": "^1.3.0",
45+
"@glint/template": "^1.4.0",
46+
"@glimmer/component": "^1.1.2",
4247
"@types/semver": "^7.5.6",
48+
"bun-types": "^1.0.25",
4349
"chalk": "^4.1.2",
4450
"co": "^4.6.0",
4551
"command-line-args": "^5.2.1",
@@ -51,9 +57,11 @@
5157
"lerna-changelog": "^2.2.0",
5258
"pnpm-sync-dependencies-meta-injected": "0.0.10",
5359
"prettier": "^3.1.1",
60+
"prettier-plugin-ember-template-tag": "^2.0.0",
5461
"rimraf": "^5.0.5",
5562
"semver": "^7.5.4",
5663
"silent-error": "^1.1.1",
64+
"typescript": "^5.4.3",
5765
"url": "^0.11.3",
5866
"yuidocjs": "^0.10.2",
5967
"zlib": "1.0.5"
@@ -65,13 +73,13 @@
6573
"node": ">= 18.19.1",
6674
"yarn": "use pnpm",
6775
"npm": "use pnpm",
68-
"pnpm": "8.6.0"
76+
"pnpm": "8.15.5"
6977
},
7078
"volta": {
7179
"node": "18.19.1",
72-
"pnpm": "8.6.0"
80+
"pnpm": "8.15.5"
7381
},
74-
"packageManager": "pnpm@8.6.0",
82+
"packageManager": "pnpm@8.15.5",
7583
"changelog": {
7684
"labels": {
7785
":label: breaking": ":boom: Breaking Change",
@@ -117,8 +125,9 @@
117125
"@embroider/macros": "^1.13.4",
118126
"broccoli-funnel": "^3.0.8",
119127
"broccoli-merge-trees": "^4.2.0",
120-
"@glimmer/validator": "^0.84.3",
121-
"ember-cli-babel": "^8.1.0",
128+
"@glimmer/validator": "^0.89.0",
129+
"@glint/template": "^1.4.0",
130+
"ember-cli-babel": "^8.2.0",
122131
"ember-cli-htmlbars": "^6.3.0",
123132
"ember-cli-typescript": "^5.2.1",
124133
"@ember/string": "3.1.1",
@@ -139,7 +148,8 @@
139148
},
140149
"patchedDependencies": {
141150
"qunit@2.19.4": "patches/qunit@2.19.4.patch",
142-
"testem@3.11.0": "patches/testem@3.11.0.patch"
151+
"testem@3.11.0": "patches/testem@3.11.0.patch",
152+
"@ember/test-helpers@3.3.0": "patches/@ember__test-helpers@3.3.0.patch"
143153
}
144154
}
145155
}

‎packages/-ember-data/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@
6767
"ember-auto-import": "^2.7.0",
6868
"ember-cli-babel": "^8.2.0",
6969
"ember-inflector": "^4.0.2",
70-
"typescript": "^5.3.3",
71-
"pnpm-sync-dependencies-meta-injected": "0.0.10",
72-
"webpack": "^5.89.0"
70+
"typescript": "^5.4.3",
71+
"webpack": "^5.91.0"
7372
},
7473
"dependenciesMeta": {
7574
"@ember-data/adapter": {
@@ -125,7 +124,8 @@
125124
"@glimmer/tracking": "^1.1.2",
126125
"@warp-drive/internal-config": "workspace:5.4.0-alpha.39",
127126
"ember-source": "~5.6.0",
128-
"eslint": "^8.56.0"
127+
"eslint": "^8.56.0",
128+
"pnpm-sync-dependencies-meta-injected": "0.0.10"
129129
},
130130
"engines": {
131131
"node": ">= 18.19.1"
@@ -144,5 +144,5 @@
144144
"volta": {
145145
"extends": "../../package.json"
146146
},
147-
"packageManager": "pnpm@8.6.0"
147+
"packageManager": "pnpm@8.15.5"
148148
}

‎packages/active-record/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
"extends": "../../package.json"
2323
},
2424
"dependencies": {
25-
"ember-cli-babel": "^8.2.0",
26-
"pnpm-sync-dependencies-meta-injected": "0.0.10"
25+
"ember-cli-babel": "^8.2.0"
2726
},
2827
"peerDependencies": {
2928
"@ember-data/request-utils": "workspace:5.4.0-alpha.39",
@@ -107,8 +106,9 @@
107106
"ember-inflector": "^4.0.2",
108107
"ember-source": "~5.6.0",
109108
"rollup": "^4.9.6",
110-
"typescript": "^5.3.3",
111-
"walk-sync": "^3.0.0"
109+
"typescript": "^5.4.3",
110+
"walk-sync": "^3.0.0",
111+
"pnpm-sync-dependencies-meta-injected": "0.0.10"
112112
},
113113
"ember": {
114114
"edition": "octane"

‎packages/adapter/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@
9292
"@ember-data/private-build-infra": "workspace:5.4.0-alpha.39",
9393
"@embroider/macros": "^1.13.5",
9494
"ember-cli-babel": "^8.2.0",
95-
"ember-cli-test-info": "^1.0.0",
96-
"pnpm-sync-dependencies-meta-injected": "0.0.10"
95+
"ember-cli-test-info": "^1.0.0"
9796
},
9897
"devDependencies": {
9998
"@babel/cli": "^7.23.9",
@@ -124,15 +123,16 @@
124123
"ember-inflector": "^4.0.2",
125124
"ember-source": "~5.6.0",
126125
"rollup": "^4.9.6",
127-
"typescript": "^5.3.3",
126+
"typescript": "^5.4.3",
128127
"walk-sync": "^3.0.0",
129-
"webpack": "^5.89.0"
128+
"webpack": "^5.91.0",
129+
"pnpm-sync-dependencies-meta-injected": "0.0.10"
130130
},
131131
"engines": {
132132
"node": ">= 18.19.1"
133133
},
134134
"volta": {
135135
"extends": "../../package.json"
136136
},
137-
"packageManager": "pnpm@8.6.0"
137+
"packageManager": "pnpm@8.15.5"
138138
}

‎packages/core-types/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
},
4242
"dependencies": {
4343
"@ember-data/private-build-infra": "workspace:5.4.0-alpha.39",
44-
"ember-cli-babel": "^8.2.0",
45-
"pnpm-sync-dependencies-meta-injected": "0.0.10"
44+
"ember-cli-babel": "^8.2.0"
4645
},
4746
"dependenciesMeta": {
4847
"@ember-data/private-build-infra": {
@@ -67,17 +66,18 @@
6766
"@warp-drive/internal-config": "workspace:5.4.0-alpha.39",
6867
"ember-source": "~5.6.0",
6968
"rollup": "^4.9.6",
70-
"typescript": "^5.3.3",
69+
"typescript": "^5.4.3",
7170
"walk-sync": "^3.0.0",
72-
"webpack": "^5.89.0"
71+
"webpack": "^5.91.0",
72+
"pnpm-sync-dependencies-meta-injected": "0.0.10"
7373
},
7474
"engines": {
7575
"node": ">= 18.19.1"
7676
},
7777
"volta": {
7878
"extends": "../../package.json"
7979
},
80-
"packageManager": "pnpm@8.6.0",
80+
"packageManager": "pnpm@8.15.5",
8181
"ember-addon": {
8282
"main": "addon-main.cjs",
8383
"type": "addon",

‎packages/core-types/src/request.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,6 @@ export interface RequestContext {
323323
request: ImmutableRequestInfo;
324324
id: number;
325325

326-
setStream(stream: ReadableStream): void;
326+
setStream(stream: ReadableStream | Promise<ReadableStream | null>): void;
327327
setResponse(response: Response | ResponseInfo): void;
328328
}

‎packages/debug/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
"@embroider/macros": "^1.13.5",
5050
"ember-auto-import": "^2.7.0",
5151
"ember-cli-babel": "^8.2.0",
52-
"pnpm-sync-dependencies-meta-injected": "0.0.10",
53-
"webpack": "^5.89.0"
52+
"webpack": "^5.91.0"
5453
},
5554
"devDependencies": {
5655
"@ember-data/request": "workspace:5.4.0-alpha.39",
@@ -60,7 +59,8 @@
6059
"@glimmer/component": "^1.1.2",
6160
"@warp-drive/core-types": "workspace:0.0.0-alpha.25",
6261
"@warp-drive/internal-config": "workspace:5.4.0-alpha.39",
63-
"ember-source": "~5.6.0"
62+
"ember-source": "~5.6.0",
63+
"pnpm-sync-dependencies-meta-injected": "0.0.10"
6464
},
6565
"engines": {
6666
"node": ">= 18.19.1"
@@ -73,5 +73,5 @@
7373
"volta": {
7474
"extends": "../../package.json"
7575
},
76-
"packageManager": "pnpm@8.6.0"
76+
"packageManager": "pnpm@8.15.5"
7777
}

‎packages/diagnostic/.eslintrc.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
base.rules(),
1616
imports.rules(),
1717
isolation.rules({
18-
allowedImports: ['@ember/debug', '@ember/test-helpers'],
18+
allowedImports: ['@ember/debug', '@ember/test-helpers', '@glimmer/manager', '@ember/runloop'],
1919
}),
2020
{}
2121
),

‎packages/diagnostic/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ module('My Module', function(hooks) {
442442
1. Add the following peer-deps to your app:
443443

444444
```diff
445-
+ "@ember/test-helpers": ">= 3.2.0",
445+
+ "@ember/test-helpers": ">= 3.3.0",
446446
+ "ember-cli-test-loader": ">= 3.1.0",
447447
+ "@embroider/addon-shim": ">= 1.8.6"
448448
```

0 commit comments

Comments
 (0)