Skip to content

Commit 0ff7675

Browse files
runspiredrunspired
authored
fix: add ember-source as explicit peer-dep for use of @ember/debug (#9592)
* fix: add ember-source as explicit peer-dep for use of @ember/debug * fix lint * bump timeouts * remove forgotten pm2 * improve handling of conditional import * fixup prettier
1 parent 17fe81b commit 0ff7675

File tree

18 files changed

+335
-862
lines changed

18 files changed

+335
-862
lines changed

‎.github/workflows/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
run: pnpm test:production
7777
7878
browser-tests:
79-
timeout-minutes: 20
79+
timeout-minutes: 22
8080
strategy:
8181
fail-fast: false
8282
matrix:
@@ -110,7 +110,7 @@ jobs:
110110
DEBUG: ${{ secrets.ACTIONS_RUNNER_DEBUG == 'true' && 'engine,socket.io*' }}
111111
# DISPLAY_TEST_NAMES: true # uncomment this line to see the test names in the logs
112112
FORCE_COLOR: 2
113-
BROWSER_TIMEOUT: 540
113+
BROWSER_TIMEOUT: 600 # 10 minutes
114114

115115
- name: Production
116116
id: run-tests-production
@@ -121,7 +121,7 @@ jobs:
121121
DEBUG: ${{ secrets.ACTIONS_RUNNER_DEBUG == 'true' && 'engine,socket.io*' }}
122122
# DISPLAY_TEST_NAMES: true # uncomment this line to see the test names in the logs
123123
FORCE_COLOR: 2
124-
BROWSER_TIMEOUT: 540
124+
BROWSER_TIMEOUT: 600 # 10 minutes
125125

126126
- name: Upload testem logs
127127
if: ${{ always() && steps.run-tests-production.conclusion != 'skipped' }}

‎packages/-ember-data/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
"@warp-drive/build-config": "workspace:0.0.0-alpha.52"
126126
},
127127
"peerDependencies": {
128+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
128129
"@ember/test-helpers": "^3.3.0 || ^4.0.4",
129130
"@ember/test-waiters": "^3.1.0",
130131
"qunit": "^2.18.0"

‎packages/adapter/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
}
4949
},
5050
"peerDependencies": {
51+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
5152
"@ember-data/legacy-compat": "workspace:5.4.0-alpha.115",
5253
"@ember-data/store": "workspace:5.4.0-alpha.115",
5354
"@ember-data/request-utils": "workspace:5.4.0-alpha.115",

‎packages/debug/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
}
4141
},
4242
"peerDependencies": {
43+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
4344
"@ember-data/store": "workspace:5.4.0-alpha.115",
4445
"@ember-data/model": "workspace:5.4.0-alpha.115",
4546
"@ember-data/request-utils": "workspace:5.4.0-alpha.115",

‎packages/diagnostic/package.json

+4
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,14 @@
7373
"sync-hardlinks": "bun run sync-dependencies-meta-injected"
7474
},
7575
"peerDependencies": {
76+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
7677
"@ember/test-helpers": "4.0.4",
7778
"ember-cli-test-loader": ">= 3.1.0"
7879
},
7980
"peerDependenciesMeta": {
81+
"ember-source": {
82+
"optional": true
83+
},
8084
"@ember/test-helpers": {
8185
"optional": true
8286
},

‎packages/ember/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
}
4242
},
4343
"peerDependencies": {
44+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
4445
"@ember-data/store": "^4.12.7 || > 5.3.3",
4546
"@ember-data/request": "^4.12.7 || > 5.3.3",
4647
"@ember-data/request-utils": "^4.12.7 || > 5.3.3",

‎packages/graph/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
}
5959
},
6060
"peerDependencies": {
61+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
6162
"@ember-data/store": "workspace:5.4.0-alpha.115",
6263
"@warp-drive/core-types": "workspace:0.0.0-alpha.101"
6364
},

‎packages/legacy-compat/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
"@warp-drive/build-config": "workspace:0.0.0-alpha.52"
9090
},
9191
"peerDependencies": {
92+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
9293
"@ember-data/graph": "workspace:5.4.0-alpha.115",
9394
"@ember-data/json-api": "workspace:5.4.0-alpha.115",
9495
"@ember-data/request": "workspace:5.4.0-alpha.115",

‎packages/model/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
}
4949
},
5050
"peerDependencies": {
51+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
5152
"@ember-data/graph": "workspace:5.4.0-alpha.115",
5253
"@ember-data/json-api": "workspace:5.4.0-alpha.115",
5354
"@ember-data/legacy-compat": "workspace:5.4.0-alpha.115",

‎packages/request-utils/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"version": 2
5353
},
5454
"peerDependencies": {
55+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
5556
"@ember/string": "^3.1.1 || ^4.0.0",
5657
"@warp-drive/core-types": "workspace:0.0.0-alpha.101",
5758
"ember-inflector": "^4.0.2 || ^5.0.0"

‎packages/schema-record/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
}
4040
},
4141
"peerDependencies": {
42+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
4243
"@ember-data/request": "workspace:5.4.0-alpha.115",
4344
"@ember-data/model": "workspace:5.4.0-alpha.115",
4445
"@ember-data/store": "workspace:5.4.0-alpha.115",

‎packages/serializer/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
}
4949
},
5050
"peerDependencies": {
51+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
5152
"@warp-drive/core-types": "workspace:0.0.0-alpha.101",
5253
"@ember-data/legacy-compat": "workspace:5.4.0-alpha.115",
5354
"@ember-data/request-utils": "workspace:5.4.0-alpha.115",

‎packages/store/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"@warp-drive/build-config": "workspace:0.0.0-alpha.52"
6060
},
6161
"peerDependencies": {
62+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
6263
"@ember-data/request": "workspace:5.4.0-alpha.115",
6364
"@ember-data/request-utils": "workspace:5.4.0-alpha.115",
6465
"@ember-data/tracking": "workspace:5.4.0-alpha.115",

‎packages/store/src/-private/store-service.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,16 @@ const EmptyClass = class {
187187
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
188188
constructor(args?: unknown) {}
189189
};
190-
const BaseClass = macroCondition(dependencySatisfies('ember-source', '*'))
190+
const _BaseClass = macroCondition(dependencySatisfies('ember-source', '*'))
191191
? DEPRECATE_STORE_EXTENDS_EMBER_OBJECT
192192
? (importSync('@ember/object') as typeof EmptyClass)
193193
: EmptyClass
194194
: EmptyClass;
195195

196+
const BaseClass = (_BaseClass as unknown as { default?: typeof EmptyClass }).default
197+
? ((_BaseClass as unknown as { default?: typeof EmptyClass }).default as typeof EmptyClass)
198+
: _BaseClass;
199+
196200
if (BaseClass !== EmptyClass) {
197201
deprecate(
198202
`The Store class extending from EmberObject is deprecated.

‎packages/tracking/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@warp-drive/build-config": "workspace:0.0.0-alpha.52"
3535
},
3636
"peerDependencies": {
37-
"ember-source": ">= 3.28.12",
37+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
3838
"@warp-drive/core-types": "workspace:0.0.0-alpha.101"
3939
},
4040
"files": [

‎packages/unpublished-test-infra/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
}
6969
},
7070
"peerDependencies": {
71+
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
7172
"qunit": "^2.20.1",
7273
"testem": "^3.12.0",
7374
"@ember-data/request": "workspace:5.4.0-alpha.115",

0 commit comments

Comments
 (0)