Merge pull request #438 from NullVoxPopuli/upgrade-addon-dev

Upgrade addon-dev, drop TS < v5

Author: NullVoxPopuli

.github/workflows/ci.yml

@@ -77,6 +77,8 @@ jobs:
       - uses: wyvox/action@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - run: pnpm build
+      - run: pnpm i -f # injected deps
       - run: pnpm lint
 
 
@@ -89,6 +91,8 @@ jobs:
       - uses: wyvox/action@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - run: pnpm build
+      - run: pnpm i -f # injected deps
       - run: pnpm turbo test:ember --filter test-app
 
   floating:
@@ -101,6 +105,8 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           pnpm-args: --no-lockfile
+      - run: pnpm build
+      - run: pnpm i -f # injected deps
       - run: pnpm turbo test:ember --filter test-app
 
   try-scenarios:
@@ -134,39 +140,13 @@ jobs:
       - uses: wyvox/action@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - run: pnpm build
+      - run: pnpm i -f # injected deps
       - name: Run Tests
         run: pnpm turbo test:scenario --filter ${{ matrix.test-app }} --log-prefix none -- --skip-cleanup
         env:
           SCENARIO: ${{ matrix.try-scenario }}
 
-  typecheck_v4:
-    name: '4.* ${{ matrix.typescript-scenario }}'
-    runs-on: ubuntu-latest
-    # if: ${{ fromJSON(needs.setup.outputs.pending).atAll.typecheck }}
-    timeout-minutes: 2
-    needs: [test]
-    continue-on-error: true
-    strategy:
-      fail-fast: true
-      matrix:
-        typescript-scenario:
-          - typescript@4.8
-          - typescript@4.9
-
-    steps:
-      - uses: wyvox/action@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: 'Change TS to ${{ matrix.typescript-scenario }}'
-        run: |
-          pnpm add --save-dev ${{ matrix.typescript-scenario}}
-          pnpm remove @tsconfig/ember
-          pnpm add @tsconfig/ember@^2.0.0
-        working-directory: ./test-app
-      - name: 'Type checking'
-        run: pnpm turbo --filter 'test-app' lint:types
-
-
   typecheck_v5:
     name: '5.* ${{ matrix.typescript-scenario }}'
     runs-on: ubuntu-latest
@@ -189,6 +169,8 @@ jobs:
       - uses: wyvox/action@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - run: pnpm build
+      - run: pnpm i -f # injected deps
       - name: 'Change TS to ${{ matrix.typescript-scenario }}'
         run: 'pnpm add --save-dev ${{ matrix.typescript-scenario}}'
         working-directory: ./test-app

README.md

@@ -8,7 +8,7 @@ Resources for reactive data fetching with ember-data's `store` service.
 * ember-data v3.28 or above
 * ember-auto-import v2 or above
 * ember-resources v5.3 or above
-* typescript v4.8 or above
+* typescript v5 or above
 
 ## Installation
 

dev/package.json

@@ -28,7 +28,7 @@
     "@typescript-eslint/eslint-plugin": "^6.19.0",
     "@typescript-eslint/parser": "^6.19.0",
     "eslint": "^8.41.0",
-    "prettier": "^3.2.4",
+    "prettier": "^3.5.3",
     "typescript": "^5.1.3"
   },
   "scripts": {

dev/pnpm-lock.yaml

@@ -1,9 +1,20 @@
 {
-  "presets": [["@babel/preset-typescript"]],
   "plugins": [
-    "@embroider/addon-dev/template-colocation-plugin",
-    ["@babel/plugin-transform-typescript", { "allowDeclareFields": true }],
-    ["@babel/plugin-proposal-decorators", { "version": "legacy" }],
-    "@babel/plugin-proposal-class-properties"
+    [
+      "@babel/plugin-transform-typescript",
+      {
+        "allExtensions": true,
+        "allowDeclareFields": true,
+        "onlyRemoveTypeImports": true
+      }
+    ],
+    [
+      "module:decorator-transforms",
+      {
+        "runtime": {
+          "import": "decorator-transforms/runtime-esm"
+        }
+      }
+    ]
   ]
 }

ember-data-resources/babel.config.json

@@ -14,9 +14,8 @@
     "dist-types"
   ],
   "scripts": {
-    "build": "concurrently 'npm:build:*'",
-    "build:js": "rollup --config",
-    "build:types": "rm -rf dist-types; pnpm glint --build",
+    "prepare": "pnpm build",
+    "build": "rollup --config",
     "lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'",
     "lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
     "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern",
@@ -36,6 +35,7 @@
     "@ember/string": "^3.1.1",
     "@ember/test-waiters": "^3.1.0",
     "@embroider/addon-shim": "^1.0.0",
+    "decorator-transforms": "^2.3.0",
     "ember-modify-based-class-resource": "^1.1.0"
   },
   "devDependencies": {
@@ -47,13 +47,15 @@
     "@babel/runtime": "^7.22.5",
     "@ember-data/store": "^5.0.0",
     "@ember-data/tracking": "^5.3.0",
-    "@embroider/addon-dev": "^3.1.1",
+    "@ember/library-tsconfig": "^1.1.3",
+    "@embroider/addon-dev": "^8.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@glint/core": "^1.3.0",
     "@glint/environment-ember-loose": "^1.0.2",
     "@glint/template": "^1.0.2",
     "@nullvoxpopuli/eslint-configs": "^3.1.3",
+    "@rollup/plugin-babel": "^6.0.4",
     "@tsconfig/ember": "^3.0.3",
     "@types/ember": "^4.0.0",
     "@types/ember-data__store": "^4.0.3",
@@ -76,7 +78,7 @@
     "@types/ember__utils": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^6.19.0",
     "@typescript-eslint/parser": "^6.19.0",
-    "concurrently": "^8.2.0",
+    "concurrently": "^9.1.2",
     "ember-resources": "^6.0.0",
     "ember-source": "~5.6.0",
     "ember-template-lint": "^5.10.3",
@@ -87,13 +89,12 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-qunit": "^8.0.1",
     "execa": "^8.0.1",
-    "prettier": "^3.2.4",
-    "prettier-plugin-ember-template-tag": "^2.0.0",
+    "prettier": "^3.5.3",
+    "prettier-plugin-ember-template-tag": "^2.0.5",
     "publint": "^0.2.7",
-    "rollup": "~4.11.0",
+    "rollup": "~4.40.2",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-delete": "^2.0.0",
-    "rollup-plugin-ts": "^3.4.5",
     "typescript": "^5.3.3"
   },
   "publishConfig": {