Skip to content

Commit 354c295

Browse files
runspiredrunspired
authored
fix: restore * versions and setup publish to not overwrite them (#9629)
* fix: restore * versions * fix lint * feat: dont overwrite * deps * fixup disable flag * make CI happy? * log tsc, ensure all tsc match * fix dx test * more debugging * fix * add shell * fixup stuffs * fix formatting? * better turbo setup? * bump tsc * bump ts * stashing * fix lock * fix embroider compat test * fix vite test app * fix prettier
1 parent 2f7d94a commit 354c295

File tree

59 files changed

+2921
-5708
lines changed

Some content is hidden

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

59 files changed

+2921
-5708
lines changed

‎.github/actions/setup/action.yml

+18
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ name: Setup Test Environment
22
description: Composable Action for ensuring speedy test setup
33

44
inputs:
5+
## Disables TurboCache
6+
DISABLE_TURBO_CACHE:
7+
description: Whether to disable TurboCache
8+
required: false
9+
default: false
10+
ACTIONS_RUNNER_DEBUG:
11+
description: Whether to enable debug mode
12+
required: false
13+
default: false
514
## Speeds Up Lint by enabling reuse
615
restore-lint-caches:
716
description: Whether to restore lint caches
@@ -65,6 +74,14 @@ runs:
6574
with:
6675
bun-version: latest
6776

77+
- name: DEBUG STATUS
78+
shell: bash
79+
run:
80+
echo "DISABLE_TURBO_CACHE = ${{ inputs.DISABLE_TURBO_CACHE }}"
81+
echo "ACTIONS_RUNNER_DEBUG = ${{ inputs.ACTIONS_RUNNER_DEBUG }}"
82+
echo "restore-lint-caches = ${{ inputs.restore-lint-caches }}"
83+
echo "restore-broccoli-cache = ${{ inputs.restore-broccoli-cache }}"
84+
6885
- name: 'Setup local TurboRepo server'
6986
if: ${{ inputs.repo-token }}
7087
uses: felixmosh/turborepo-gh-artifacts@v3
@@ -97,6 +114,7 @@ runs:
97114
run: pnpm install --prefer-offline $ADTL_ARGS
98115
env:
99116
ADTL_ARGS: ${{ inputs.adtl-install-args }}
117+
TURBO_FORCE: ${{ inputs.DISABLE_TURBO_CACHE == 'true' }}
100118

101119
- name: Install Dependencies w/o Addon Builds
102120
if: ${{ inputs.install == 'true' && inputs.skip-addon-build == 'true' }}

‎.github/workflows/main.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,23 @@ jobs:
3030
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
3131
- uses: ./.github/actions/setup
3232
with:
33-
restore-lint-caches: true
33+
restore-lint-caches: ${{ secrets.ACTIONS_RUNNER_DEBUG != 'true' }}
3434
install: true
3535
repo-token: ${{ secrets.GITHUB_TOKEN }}
36+
ACTIONS_RUNNER_DEBUG: ${{ secrets.ACTIONS_RUNNER_DEBUG == 'true' }}
37+
DISABLE_TURBO_CACHE: ${{ secrets.ACTIONS_RUNNER_DEBUG == 'true' }}
3638
- name: Prettier
3739
run: pnpm lint:prettier
40+
env:
41+
TURBO_FORCE: ${{ secrets.ACTIONS_RUNNER_DEBUG == 'true' }}
3842
- name: Lint
3943
run: pnpm lint
44+
env:
45+
TURBO_FORCE: ${{ secrets.ACTIONS_RUNNER_DEBUG == 'true' }}
4046
- name: Check Uncompiled Packages for TypeScript Compilation Errors
4147
run: pnpm check:types
48+
env:
49+
TURBO_FORCE: ${{ secrets.ACTIONS_RUNNER_DEBUG == 'true' }}
4250

4351
special-build-tests:
4452
timeout-minutes: 20

‎config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"eslint-plugin-qunit": "^8.1.2",
2424
"eslint-plugin-simple-import-sort": "^12.1.1",
2525
"rollup": "^4.17.2",
26-
"typescript": "^5.4.5",
26+
"typescript": "^5.7.2",
2727
"vite": "^5.2.11",
2828
"vite-plugin-dts": "^3.9.1"
2929
},

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"rimraf": "^5.0.6",
6161
"semver": "^7.6.3",
6262
"silent-error": "^1.1.1",
63-
"typescript": "^5.4.5",
63+
"typescript": "^5.7.2",
6464
"url": "^0.11.4",
6565
"yuidocjs": "^0.10.2",
6666
"zlib": "1.0.5"

‎packages/-ember-data/package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -108,21 +108,21 @@
108108
}
109109
},
110110
"dependencies": {
111-
"@ember-data/adapter": "workspace:5.4.0-alpha.122",
112-
"@ember-data/debug": "workspace:5.4.0-alpha.122",
113-
"@ember-data/graph": "workspace:5.4.0-alpha.122",
114-
"@ember-data/json-api": "workspace:5.4.0-alpha.122",
115-
"@ember-data/legacy-compat": "workspace:5.4.0-alpha.122",
116-
"@ember-data/model": "workspace:5.4.0-alpha.122",
117-
"@ember-data/request": "workspace:5.4.0-alpha.122",
118-
"@ember-data/request-utils": "workspace:5.4.0-alpha.122",
119-
"@ember-data/serializer": "workspace:5.4.0-alpha.122",
120-
"@ember-data/store": "workspace:5.4.0-alpha.122",
121-
"@ember-data/tracking": "workspace:5.4.0-alpha.122",
111+
"@ember-data/adapter": "workspace:*",
112+
"@ember-data/debug": "workspace:*",
113+
"@ember-data/graph": "workspace:*",
114+
"@ember-data/json-api": "workspace:*",
115+
"@ember-data/legacy-compat": "workspace:*",
116+
"@ember-data/model": "workspace:*",
117+
"@ember-data/request": "workspace:*",
118+
"@ember-data/request-utils": "workspace:*",
119+
"@ember-data/serializer": "workspace:*",
120+
"@ember-data/store": "workspace:*",
121+
"@ember-data/tracking": "workspace:*",
122122
"@ember/edition-utils": "^1.2.0",
123123
"@embroider/macros": "^1.16.6",
124-
"@warp-drive/core-types": "workspace:0.0.0-alpha.108",
125-
"@warp-drive/build-config": "workspace:0.0.0-alpha.59"
124+
"@warp-drive/core-types": "workspace:*",
125+
"@warp-drive/build-config": "workspace:*"
126126
},
127127
"peerDependencies": {
128128
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
@@ -151,12 +151,12 @@
151151
"@glimmer/tracking": "^1.1.2",
152152
"@types/qunit": "2.19.10",
153153
"@ember/test-helpers": "4.0.4",
154-
"@warp-drive/internal-config": "workspace:5.4.0-alpha.122",
154+
"@warp-drive/internal-config": "workspace:*",
155155
"ember-source": "~5.12.0",
156156
"eslint": "^9.12.0",
157157
"pnpm-sync-dependencies-meta-injected": "0.0.14",
158158
"vite": "^5.2.11",
159-
"typescript": "^5.4.5",
159+
"typescript": "^5.7.2",
160160
"qunit": "^2.18.0"
161161
},
162162
"engines": {

‎packages/-warp-drive/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"dependencies": {
5353
"@embroider/macros": "^1.16.6",
5454
"@manypkg/get-packages": "^2.2.2",
55-
"@warp-drive/build-config": "workspace:0.0.0-alpha.59",
55+
"@warp-drive/build-config": "workspace:*",
5656
"semver": "^7.6.3",
5757
"debug": "^4.3.7",
5858
"chalk": "^5.3.0",
@@ -62,9 +62,9 @@
6262
"@babel/core": "^7.24.5",
6363
"@babel/plugin-transform-typescript": "^7.24.5",
6464
"@babel/preset-typescript": "^7.24.1",
65-
"@warp-drive/internal-config": "workspace:5.4.0-alpha.122",
65+
"@warp-drive/internal-config": "workspace:*",
6666
"pnpm-sync-dependencies-meta-injected": "0.0.14",
67-
"typescript": "^5.4.5",
67+
"typescript": "^5.7.2",
6868
"vite": "^5.2.11"
6969
},
7070
"engines": {

‎packages/active-record/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,28 @@
4646
},
4747
"dependencies": {
4848
"@embroider/macros": "^1.16.6",
49-
"@warp-drive/build-config": "workspace:0.0.0-alpha.59"
49+
"@warp-drive/build-config": "workspace:*"
5050
},
5151
"peerDependencies": {
52-
"@ember-data/request-utils": "workspace:5.4.0-alpha.122",
52+
"@ember-data/request-utils": "workspace:*",
5353
"@ember-data/store": "^4.12.0 || ^5.0.0",
54-
"@warp-drive/core-types": "workspace:0.0.0-alpha.108"
54+
"@warp-drive/core-types": "workspace:*"
5555
},
5656
"devDependencies": {
5757
"@babel/core": "^7.24.5",
5858
"@babel/plugin-transform-typescript": "^7.24.5",
5959
"@babel/preset-typescript": "^7.24.1",
60-
"@ember-data/request": "workspace:5.4.0-alpha.122",
61-
"@ember-data/request-utils": "workspace:5.4.0-alpha.122",
62-
"@ember-data/store": "workspace:5.4.0-alpha.122",
63-
"@ember-data/tracking": "workspace:5.4.0-alpha.122",
60+
"@ember-data/request": "workspace:*",
61+
"@ember-data/request-utils": "workspace:*",
62+
"@ember-data/store": "workspace:*",
63+
"@ember-data/tracking": "workspace:*",
6464
"@glimmer/component": "^1.1.2",
65-
"@warp-drive/core-types": "workspace:0.0.0-alpha.108",
66-
"@warp-drive/internal-config": "workspace:5.4.0-alpha.122",
65+
"@warp-drive/core-types": "workspace:*",
66+
"@warp-drive/internal-config": "workspace:*",
6767
"ember-source": "~5.12.0",
6868
"pnpm-sync-dependencies-meta-injected": "0.0.14",
6969
"vite": "^5.2.11",
70-
"typescript": "^5.4.5"
70+
"typescript": "^5.7.2"
7171
},
7272
"dependenciesMeta": {
7373
"@warp-drive/core-types": {

‎packages/adapter/package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
},
5050
"peerDependencies": {
5151
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
52-
"@ember-data/legacy-compat": "workspace:5.4.0-alpha.122",
53-
"@ember-data/store": "workspace:5.4.0-alpha.122",
54-
"@ember-data/request-utils": "workspace:5.4.0-alpha.122",
55-
"@warp-drive/core-types": "workspace:0.0.0-alpha.108"
52+
"@ember-data/legacy-compat": "workspace:*",
53+
"@ember-data/store": "workspace:*",
54+
"@ember-data/request-utils": "workspace:*",
55+
"@warp-drive/core-types": "workspace:*"
5656
},
5757
"dependenciesMeta": {
5858
"@warp-drive/core-types": {
@@ -89,28 +89,28 @@
8989
"ember-cli-string-utils": "^1.1.0",
9090
"ember-cli-path-utils": "^1.0.0",
9191
"@ember/edition-utils": "1.2.0",
92-
"@warp-drive/build-config": "workspace:0.0.0-alpha.59"
92+
"@warp-drive/build-config": "workspace:*"
9393
},
9494
"devDependencies": {
9595
"@babel/core": "^7.24.5",
9696
"@babel/plugin-transform-typescript": "^7.24.5",
9797
"@babel/preset-typescript": "^7.24.1",
98-
"@ember-data/graph": "workspace:5.4.0-alpha.122",
99-
"@ember-data/json-api": "workspace:5.4.0-alpha.122",
100-
"@ember-data/legacy-compat": "workspace:5.4.0-alpha.122",
101-
"@ember-data/request": "workspace:5.4.0-alpha.122",
102-
"@ember-data/request-utils": "workspace:5.4.0-alpha.122",
103-
"@ember-data/store": "workspace:5.4.0-alpha.122",
104-
"@ember-data/tracking": "workspace:5.4.0-alpha.122",
98+
"@ember-data/graph": "workspace:*",
99+
"@ember-data/json-api": "workspace:*",
100+
"@ember-data/legacy-compat": "workspace:*",
101+
"@ember-data/request": "workspace:*",
102+
"@ember-data/request-utils": "workspace:*",
103+
"@ember-data/store": "workspace:*",
104+
"@ember-data/tracking": "workspace:*",
105105
"@ember/test-waiters": "^3.1.0",
106106
"@glimmer/component": "^1.1.2",
107107
"decorator-transforms": "^2.2.2",
108108
"@types/jquery": "^3.5.30",
109-
"@warp-drive/core-types": "workspace:0.0.0-alpha.108",
110-
"@warp-drive/internal-config": "workspace:5.4.0-alpha.122",
109+
"@warp-drive/core-types": "workspace:*",
110+
"@warp-drive/internal-config": "workspace:*",
111111
"ember-source": "~5.12.0",
112112
"pnpm-sync-dependencies-meta-injected": "0.0.14",
113-
"typescript": "^5.4.5",
113+
"typescript": "^5.7.2",
114114
"vite": "^5.2.11"
115115
},
116116
"engines": {

‎packages/build-config/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848
"semver": "^7.6.3"
4949
},
5050
"devDependencies": {
51-
"@warp-drive/internal-config": "workspace:5.4.0-alpha.122",
51+
"@warp-drive/internal-config": "workspace:*",
5252
"@types/babel__core": "^7.20.5",
5353
"@types/node": "^20.14.2",
5454
"@babel/plugin-transform-typescript": "^7.24.5",
5555
"@babel/preset-typescript": "^7.24.1",
5656
"@babel/core": "^7.24.5",
5757
"pnpm-sync-dependencies-meta-injected": "0.0.14",
58-
"typescript": "^5.4.5",
58+
"typescript": "^5.7.2",
5959
"bun-types": "^1.1.30",
6060
"vite": "^5.2.11"
6161
},

‎packages/build-config/src/-private/utils/deprecations.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ export function getDeprecations(
2020
): { [key in DeprecationFlag]: boolean } {
2121
const flags = {} as Record<DeprecationFlag, boolean>;
2222
const keys = Object.keys(CURRENT_DEPRECATIONS) as DeprecationFlag[];
23-
const DISABLE_6X_DEPRECATIONS = deprecations?.DISABLE_6X_DEPRECATIONS ?? true;
23+
const DISABLE_7X_DEPRECATIONS = deprecations?.DISABLE_7X_DEPRECATIONS ?? true;
2424

2525
keys.forEach((flag) => {
2626
const deprecatedSince = CURRENT_DEPRECATIONS[flag];
27-
const isDeactivatedDeprecationNotice = DISABLE_6X_DEPRECATIONS && deprecationIsNextMajorCycle(deprecatedSince);
27+
const isDeactivatedDeprecationNotice = DISABLE_7X_DEPRECATIONS && deprecationIsNextMajorCycle(deprecatedSince);
2828
let flagState = true; // default to no code-stripping
2929

3030
if (!isDeactivatedDeprecationNotice) {
3131
// if we have a specific flag setting, use it
3232
if (typeof deprecations?.[flag] === 'boolean') {
33-
flagState = deprecations?.[flag];
33+
flagState = deprecations?.[flag]!;
3434
} else if (compatVersion) {
3535
// if we are told we are compatible with a version
3636
// we check if we can strip this flag

‎packages/build-config/src/deprecation-versions.ts

+17
Original file line numberDiff line numberDiff line change
@@ -459,3 +459,20 @@ export const ENABLE_LEGACY_SCHEMA_SERVICE = '5.4';
459459
* @public
460460
*/
461461
export const DEPRECATE_EMBER_INFLECTOR = '5.3';
462+
463+
/**
464+
* This is a special flag that can be used to opt-in early to receiving deprecations introduced in 6.x
465+
* which have had their infra backported to 5.x versions of EmberData.
466+
*
467+
* When this flag is not present or set to `true`, the deprecations from the 6.x branch
468+
* will not print their messages and the deprecation cannot be resolved.
469+
*
470+
* When this flag is present and set to `false`, the deprecations from the 6.x branch will
471+
* print and can be resolved.
472+
*
473+
* @property DISABLE_7X_DEPRECATIONS
474+
* @since 5.3
475+
* @until 7.0
476+
* @public
477+
*/
478+
export const DISABLE_7X_DEPRECATIONS = '7.0';

‎packages/build-config/src/deprecations.ts

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ export const DEPRECATE_MANY_ARRAY_DUPLICATES: boolean = true;
1010
export const DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: boolean = true;
1111
export const ENABLE_LEGACY_SCHEMA_SERVICE: boolean = true;
1212
export const DEPRECATE_EMBER_INFLECTOR: boolean = true;
13+
export const DISABLE_7X_DEPRECATIONS: boolean = true;

‎packages/codemods/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
"ignore": "^5.3.2",
3737
"jscodeshift": "^0.15.2",
3838
"strip-ansi": "^7.1.0",
39-
"typescript": "^5.4.5",
39+
"typescript": "^5.7.2",
4040
"winston": "^3.13.0"
4141
},
4242
"devDependencies": {
4343
"@types/bun": "^1.1.4",
4444
"@types/jscodeshift": "0.11.11",
45-
"@warp-drive/internal-config": "workspace:5.4.0-alpha.122",
45+
"@warp-drive/internal-config": "workspace:*",
4646
"eslint": "^9.12.0",
4747
"pnpm-sync-dependencies-meta-injected": "0.0.14",
4848
"qunit": "^2.20.1"

‎packages/core-types/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
},
4040
"dependencies": {
4141
"@embroider/macros": "^1.16.6",
42-
"@warp-drive/build-config": "workspace:0.0.0-alpha.59"
42+
"@warp-drive/build-config": "workspace:*"
4343
},
4444
"devDependencies": {
4545
"@babel/core": "^7.24.5",
4646
"@babel/plugin-transform-typescript": "^7.24.5",
4747
"@babel/preset-typescript": "^7.24.1",
48-
"@warp-drive/internal-config": "workspace:5.4.0-alpha.122",
48+
"@warp-drive/internal-config": "workspace:*",
4949
"pnpm-sync-dependencies-meta-injected": "0.0.14",
50-
"typescript": "^5.4.5",
50+
"typescript": "^5.7.2",
5151
"vite": "^5.2.11"
5252
},
5353
"engines": {

‎packages/debug/package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
},
4242
"peerDependencies": {
4343
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
44-
"@ember-data/store": "workspace:5.4.0-alpha.122",
45-
"@ember-data/model": "workspace:5.4.0-alpha.122",
46-
"@ember-data/request-utils": "workspace:5.4.0-alpha.122",
47-
"@warp-drive/core-types": "workspace:0.0.0-alpha.108"
44+
"@ember-data/store": "workspace:*",
45+
"@ember-data/model": "workspace:*",
46+
"@ember-data/request-utils": "workspace:*",
47+
"@warp-drive/core-types": "workspace:*"
4848
},
4949
"dependenciesMeta": {
5050
"@ember-data/store": {
@@ -75,27 +75,27 @@
7575
"dependencies": {
7676
"@ember/edition-utils": "^1.2.0",
7777
"@embroider/macros": "^1.16.6",
78-
"@warp-drive/build-config": "workspace:0.0.0-alpha.59"
78+
"@warp-drive/build-config": "workspace:*"
7979
},
8080
"devDependencies": {
8181
"@babel/core": "^7.24.5",
8282
"@babel/plugin-transform-typescript": "^7.24.5",
8383
"@babel/preset-env": "^7.24.5",
8484
"@babel/preset-typescript": "^7.24.1",
85-
"@ember-data/request": "workspace:5.4.0-alpha.122",
86-
"@ember-data/legacy-compat": "workspace:5.4.0-alpha.122",
87-
"@ember-data/request-utils": "workspace:5.4.0-alpha.122",
88-
"@ember-data/store": "workspace:5.4.0-alpha.122",
89-
"@ember-data/model": "workspace:5.4.0-alpha.122",
90-
"@ember-data/tracking": "workspace:5.4.0-alpha.122",
85+
"@ember-data/request": "workspace:*",
86+
"@ember-data/legacy-compat": "workspace:*",
87+
"@ember-data/request-utils": "workspace:*",
88+
"@ember-data/store": "workspace:*",
89+
"@ember-data/model": "workspace:*",
90+
"@ember-data/tracking": "workspace:*",
9191
"@ember/test-waiters": "^3.1.0",
9292
"@glimmer/component": "^1.1.2",
93-
"@warp-drive/core-types": "workspace:0.0.0-alpha.108",
94-
"@warp-drive/internal-config": "workspace:5.4.0-alpha.122",
93+
"@warp-drive/core-types": "workspace:*",
94+
"@warp-drive/internal-config": "workspace:*",
9595
"ember-source": "~5.12.0",
9696
"decorator-transforms": "^2.2.2",
9797
"pnpm-sync-dependencies-meta-injected": "0.0.14",
98-
"typescript": "^5.4.5",
98+
"typescript": "^5.7.2",
9999
"vite": "^5.2.11"
100100
},
101101
"engines": {

0 commit comments

Comments
 (0)