Move to ember-cli@5.11 (#663)

onechiporenko · Sep 15, 2024 · 059693c · 059693c
1 parent 9a501ab
commit 059693c
Show file tree

Hide file tree

Showing 43 changed files with 16,129 additions and 15,504 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -21,5 +21,6 @@
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+/pnpm.lock.ember-try.yaml
 
 /docs/
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -31,7 +31,7 @@
 - `ember-data` version: 
 - `ember-cli` version:  
 - `node` version:
-- `npm` or `yarn` version:
+- `npm` or `pnpm` version:
 
 
 * **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,17 +19,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9
       - name: Install Node
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
       - name: Run Tests
-        run: yarn test:ember
+        run: pnpm test:ember
 
   floating:
     name: "Floating Dependencies"
@@ -38,14 +41,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --no-lockfile
+        run: pnpm install --no-lockfile
       - name: Run Tests
-        run: yarn test:ember
+        run: pnpm test:ember
 
   node-tests:
     name: "Node Tests"
@@ -54,14 +60,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Run Node Tests
-        run: yarn run nodetest
+        run: pnpm run nodetest
 
   docs:
     name: "Docs"
@@ -70,14 +79,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Generate docs
-        run: yarn run docs
+        run: pnpm run docs
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}, ${{ matrix.browser}}
@@ -124,13 +136,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9
       - name: Install Node
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup=true --- ember test --launch ${{ matrix.browser }}
 
@@ -152,15 +167,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9
       - name: Install Node
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Generate Coverage Report
-        run: yarn run test:cov:${{ matrix.try-scenario }}
+        run: pnpm run test:cov:${{ matrix.try-scenario }}
       - uses: actions/upload-artifact@v3
         with:
           name: lcov-${{ matrix.try-scenario }}.info
@@ -173,13 +191,16 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9
       - name: Install Node
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Download coverage report parts
         uses: actions/download-artifact@v3
         with:

diff --git a/.github/workflows/deploy-demo-and-docs.yml b/.github/workflows/deploy-demo-and-docs.yml
@@ -21,17 +21,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9
       - name: Install Node
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Generate Production Build
         run: |
           sed -i "s|.*ENV\.rootURL.*|\t\tENV.rootURL = '/ember-models-table/v.5/${{ matrix.try-scenario }}/';|" ./tests/dummy/config/environment.js
-          yarn run build:gh-pages:${{ matrix.try-scenario }}
+          pnpm run build:gh-pages:${{ matrix.try-scenario }}
           tar -zcvf ${{ matrix.try-scenario }}.tar.gz dist
       - name: Upload built project to artifacts
         uses: actions/upload-artifact@v3
@@ -44,13 +47,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9
       - name: Install Node
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Download builds
         uses: actions/download-artifact@v3
         with:

diff --git a/.gitignore b/.gitignore
@@ -16,13 +16,15 @@
 /npm-debug.log*
 /testem.log
 /yarn-error.log
+/pnpm-error.log
 
 # ember-try
 /.node_modules.ember-try/
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+/pnpm.lock.ember-try.yaml
 
 # broccoli-debug
 /DEBUG/

diff --git a/.npmignore b/.npmignore
@@ -27,6 +27,8 @@
 /tsconfig.json
 /yarn-error.log
 /yarn.lock
+/pnpm-error.log
+/pnpm.lock
 .gitkeep
 
 # ember-try
@@ -35,6 +37,7 @@
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+/pnpm.lock.ember-try.yaml
 
 /docs
 /.idea

diff --git a/.prettierignore b/.prettierignore
@@ -19,3 +19,4 @@
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+/pnpm.lock.ember-try.yaml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,24 +2,24 @@
 
 ## Installation
 
-* `git clone <repository-url>`
-* `cd ember-models-table`
-* `yarn install`
+- `git clone <repository-url>`
+- `cd ember-models-table`
+- `pnpm install`
 
 ## Linting
 
-* `yarn lint`
-* `yarn lint:fix`
+- `pnpm lint`
+- `pnpm lint:fix`
 
 ## Running tests
 
-* `yarn test` – Runs the test suite on the current Ember version
-* `yarn test:ember --server` – Runs the test suite in "watch mode"
-* `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
+- `pnpm test` – Runs the test suite on the current Ember version
+- `pnpm test:ember --server` – Runs the test suite in "watch mode"
+- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `yarn start`
-* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+- `pnpm start`
+- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
diff --git a/config/environment.js b/config/environment.js
@@ -4,7 +4,7 @@ module.exports = function (/* environment, appConfig */) {
   const ENV = {
     APP: {},
   };
-  ENV.APP.uiFramework = process.env.EMT_UI;
+  ENV.APP.uiFramework = process?.env.EMT_UI;
 
   ENV['ember-a11y-testing'] = {
     componentOptions: {

diff --git a/coverage.sh b/coverage.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-yarn run ember:reset
-yarn run test:cov:$1
+pnpm run ember:reset
+pnpm run test:cov:$1
 mv coverage/lcov.info lcov-$1.info
 rm -rf coverage
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,8 +1,8 @@
 'use strict';
-
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
-module.exports = function (defaults) {
+module.exports = async function (defaults) {
+  const { setConfig } = await import('@warp-drive/build-config');
   const options = {
     babel: {
       sourceMaps: 'inline',
@@ -41,7 +41,7 @@ module.exports = function (defaults) {
       only: ['html-safe'],
     },
   };
-  switch (process.env.EMT_UI) {
+  switch (process?.env.EMT_UI) {
     case 'plain-html': {
       options.outputPaths.app.css['plain-html'] = '/assets/plain-html.css';
       options['ember-models-table-floating-filter'] = {
@@ -73,7 +73,12 @@ module.exports = function (defaults) {
     }
   }
   let app = new EmberAddon(defaults, options);
-  if (process.env.EMT_UI === 'plain-html') {
+
+  setConfig(app, __dirname, {
+    ___legacy_support: true,
+  });
+
+  if (process?.env.EMT_UI === 'plain-html') {
     app.import('vendor/ember-models-table/plain-html.css');
   }
   /*