Skip to content

Commit

Permalink
feat: ember specific data utils (#9260)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
runspired authored Mar 22, 2024
1 parent 630ed26 commit dfaa2b8
Show file tree
Hide file tree
Showing 191 changed files with 8,556 additions and 4,063 deletions.
16 changes: 16 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ inputs:
description: Token to use for TurboRepo
required: false
default: ''
with-cert:
description: Whether to setup an SSL Cert
required: false
default: false

runs:
using: composite
Expand All @@ -67,6 +71,18 @@ runs:
with:
repo-token: ${{ inputs.repo-token }}

- name: Set Up Homebrew
if: ${{ inputs.with-cert }}
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: 'Setup SSL Cert'
if: ${{ inputs.with-cert }}
shell: bash
run: |
sudo apt install libnss3-tools
brew install mkcert
- name: Configure Parallel Builds
if: ${{ inputs.parallel-build == 'true' }}
shell: bash
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:

jobs:
lint:
timeout-minutes: 6
timeout-minutes: 8
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
Expand All @@ -49,6 +49,7 @@ jobs:
restore-broccoli-cache: true
install: true
repo-token: ${{ secrets.GITHUB_TOKEN }}
with-cert: true
- if: |
github.event_name == 'pull_request' && (
github.base_ref == 'main' || github.base_ref == 'beta'
Expand Down Expand Up @@ -90,6 +91,7 @@ jobs:
restore-broccoli-cache: true
jobs: 2
parallel-build: true
with-cert: true
install: true
repo-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -156,6 +158,7 @@ jobs:
- uses: ./.github/actions/setup
with:
restore-broccoli-cache: true
with-cert: true
install: true
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Basic tests with ${{ matrix.scenario }}
Expand Down Expand Up @@ -183,6 +186,7 @@ jobs:
- uses: ./.github/actions/setup
with:
restore-broccoli-cache: true
with-cert: true
install: true
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Basic tests with ${{ matrix.release }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ packages/schema-record/addon/
packages/serializer/addon
packages/store/addon
packages/tracking/addon
packages/ember/addon

# dependencies
bower_components
Expand Down
16 changes: 16 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,28 @@
module.exports = {
trailingComma: 'es5',
printWidth: 120,
plugins: ['prettier-plugin-ember-template-tag'],
overrides: [
{
files: '*.{js,ts,cjs,cts,mjs,mts}',
options: {
singleQuote: true,
},
},
{
files: ['*.hbs'],
options: {
singleQuote: false,
},
},
{
files: ['*.gjs', '*.gts'],
options: {
parser: 'ember-template-tag',
singleQuote: true,
templateSingleQuote: false,
trailingComma: 'es5',
},
},
],
};
2 changes: 1 addition & 1 deletion @types/@glimmer/tracking.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export function cached(target: object, key: string, desc: PropertyDescriptor): void;

export function tracked(target: object, key: string): void;
export function tracked(target: object, key: string, desc?: object): void;
24 changes: 12 additions & 12 deletions config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"private": true,
"version": "5.4.0-alpha.39",
"dependencies": {
"@babel/core": "^7.23.9",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.23.9",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"eslint": "^8.56.0",
"@babel/core": "^7.24.3",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@typescript-eslint/eslint-plugin": "^7.3.1",
"@typescript-eslint/parser": "^7.3.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-mocha": "^10.2.0",
"eslint-plugin-n": "^16.5.0",
"eslint-plugin-qunit": "^8.0.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"typescript": "~5.3.3"
"eslint-plugin-mocha": "^10.4.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-qunit": "^8.1.1",
"eslint-plugin-simple-import-sort": "^12.0.0",
"typescript": "^5.4.3"
},
"engines": {
"node": ">= 18.19.1"
},
"volta": {
"extends": "../package.json"
},
"packageManager": "pnpm@8.6.0"
"packageManager": "pnpm@8.15.5"
}
24 changes: 17 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,14 @@
"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"
},
"devDependencies": {
"bun-types": "^1.0.25",
"@babel/core": "^7.24.3",
"@glint/core": "^1.3.0",
"@glint/environment-ember-loose": "^1.3.0",
"@glint/environment-ember-template-imports": "^1.3.0",
"@glint/template": "^1.4.0",
"@glimmer/component": "^1.1.2",
"@types/semver": "^7.5.6",
"bun-types": "^1.0.25",
"chalk": "^4.1.2",
"co": "^4.6.0",
"command-line-args": "^5.2.1",
Expand All @@ -51,9 +57,11 @@
"lerna-changelog": "^2.2.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10",
"prettier": "^3.1.1",
"prettier-plugin-ember-template-tag": "^2.0.0",
"rimraf": "^5.0.5",
"semver": "^7.5.4",
"silent-error": "^1.1.1",
"typescript": "^5.4.3",
"url": "^0.11.3",
"yuidocjs": "^0.10.2",
"zlib": "1.0.5"
Expand All @@ -65,13 +73,13 @@
"node": ">= 18.19.1",
"yarn": "use pnpm",
"npm": "use pnpm",
"pnpm": "8.6.0"
"pnpm": "8.15.5"
},
"volta": {
"node": "18.19.1",
"pnpm": "8.6.0"
"pnpm": "8.15.5"
},
"packageManager": "pnpm@8.6.0",
"packageManager": "pnpm@8.15.5",
"changelog": {
"labels": {
":label: breaking": ":boom: Breaking Change",
Expand Down Expand Up @@ -117,8 +125,9 @@
"@embroider/macros": "^1.13.4",
"broccoli-funnel": "^3.0.8",
"broccoli-merge-trees": "^4.2.0",
"@glimmer/validator": "^0.84.3",
"ember-cli-babel": "^8.1.0",
"@glimmer/validator": "^0.89.0",
"@glint/template": "^1.4.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-typescript": "^5.2.1",
"@ember/string": "3.1.1",
Expand All @@ -139,7 +148,8 @@
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
"[email protected]": "patches/[email protected]",
"@ember/[email protected]": "patches/@[email protected]"
}
}
}
10 changes: 5 additions & 5 deletions packages/-ember-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@
"ember-auto-import": "^2.7.0",
"ember-cli-babel": "^8.2.0",
"ember-inflector": "^4.0.2",
"typescript": "^5.3.3",
"pnpm-sync-dependencies-meta-injected": "0.0.10",
"webpack": "^5.89.0"
"typescript": "^5.4.3",
"webpack": "^5.91.0"
},
"dependenciesMeta": {
"@ember-data/adapter": {
Expand Down Expand Up @@ -125,7 +124,8 @@
"@glimmer/tracking": "^1.1.2",
"@warp-drive/internal-config": "workspace:5.4.0-alpha.39",
"ember-source": "~5.6.0",
"eslint": "^8.56.0"
"eslint": "^8.56.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10"
},
"engines": {
"node": ">= 18.19.1"
Expand All @@ -144,5 +144,5 @@
"volta": {
"extends": "../../package.json"
},
"packageManager": "pnpm@8.6.0"
"packageManager": "pnpm@8.15.5"
}
8 changes: 4 additions & 4 deletions packages/active-record/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"extends": "../../package.json"
},
"dependencies": {
"ember-cli-babel": "^8.2.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10"
"ember-cli-babel": "^8.2.0"
},
"peerDependencies": {
"@ember-data/request-utils": "workspace:5.4.0-alpha.39",
Expand Down Expand Up @@ -107,8 +106,9 @@
"ember-inflector": "^4.0.2",
"ember-source": "~5.6.0",
"rollup": "^4.9.6",
"typescript": "^5.3.3",
"walk-sync": "^3.0.0"
"typescript": "^5.4.3",
"walk-sync": "^3.0.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10"
},
"ember": {
"edition": "octane"
Expand Down
10 changes: 5 additions & 5 deletions packages/adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@
"@ember-data/private-build-infra": "workspace:5.4.0-alpha.39",
"@embroider/macros": "^1.13.5",
"ember-cli-babel": "^8.2.0",
"ember-cli-test-info": "^1.0.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10"
"ember-cli-test-info": "^1.0.0"
},
"devDependencies": {
"@babel/cli": "^7.23.9",
Expand Down Expand Up @@ -124,15 +123,16 @@
"ember-inflector": "^4.0.2",
"ember-source": "~5.6.0",
"rollup": "^4.9.6",
"typescript": "^5.3.3",
"typescript": "^5.4.3",
"walk-sync": "^3.0.0",
"webpack": "^5.89.0"
"webpack": "^5.91.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10"
},
"engines": {
"node": ">= 18.19.1"
},
"volta": {
"extends": "../../package.json"
},
"packageManager": "pnpm@8.6.0"
"packageManager": "pnpm@8.15.5"
}
10 changes: 5 additions & 5 deletions packages/core-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
},
"dependencies": {
"@ember-data/private-build-infra": "workspace:5.4.0-alpha.39",
"ember-cli-babel": "^8.2.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10"
"ember-cli-babel": "^8.2.0"
},
"dependenciesMeta": {
"@ember-data/private-build-infra": {
Expand All @@ -67,17 +66,18 @@
"@warp-drive/internal-config": "workspace:5.4.0-alpha.39",
"ember-source": "~5.6.0",
"rollup": "^4.9.6",
"typescript": "^5.3.3",
"typescript": "^5.4.3",
"walk-sync": "^3.0.0",
"webpack": "^5.89.0"
"webpack": "^5.91.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10"
},
"engines": {
"node": ">= 18.19.1"
},
"volta": {
"extends": "../../package.json"
},
"packageManager": "pnpm@8.6.0",
"packageManager": "pnpm@8.15.5",
"ember-addon": {
"main": "addon-main.cjs",
"type": "addon",
Expand Down
2 changes: 1 addition & 1 deletion packages/core-types/src/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,6 @@ export interface RequestContext {
request: ImmutableRequestInfo;
id: number;

setStream(stream: ReadableStream): void;
setStream(stream: ReadableStream | Promise<ReadableStream | null>): void;
setResponse(response: Response | ResponseInfo): void;
}
8 changes: 4 additions & 4 deletions packages/debug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
"@embroider/macros": "^1.13.5",
"ember-auto-import": "^2.7.0",
"ember-cli-babel": "^8.2.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10",
"webpack": "^5.89.0"
"webpack": "^5.91.0"
},
"devDependencies": {
"@ember-data/request": "workspace:5.4.0-alpha.39",
Expand All @@ -60,7 +59,8 @@
"@glimmer/component": "^1.1.2",
"@warp-drive/core-types": "workspace:0.0.0-alpha.25",
"@warp-drive/internal-config": "workspace:5.4.0-alpha.39",
"ember-source": "~5.6.0"
"ember-source": "~5.6.0",
"pnpm-sync-dependencies-meta-injected": "0.0.10"
},
"engines": {
"node": ">= 18.19.1"
Expand All @@ -73,5 +73,5 @@
"volta": {
"extends": "../../package.json"
},
"packageManager": "pnpm@8.6.0"
"packageManager": "pnpm@8.15.5"
}
2 changes: 1 addition & 1 deletion packages/diagnostic/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = {
base.rules(),
imports.rules(),
isolation.rules({
allowedImports: ['@ember/debug', '@ember/test-helpers'],
allowedImports: ['@ember/debug', '@ember/test-helpers', '@glimmer/manager', '@ember/runloop'],
}),
{}
),
Expand Down
2 changes: 1 addition & 1 deletion packages/diagnostic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ module('My Module', function(hooks) {
1. Add the following peer-deps to your app:

```diff
+ "@ember/test-helpers": ">= 3.2.0",
+ "@ember/test-helpers": ">= 3.3.0",
+ "ember-cli-test-loader": ">= 3.1.0",
+ "@embroider/addon-shim": ">= 1.8.6"
```
Expand Down
Loading

0 comments on commit dfaa2b8

Please sign in to comment.