Adopt pnpm

- Move test app to use ember-prism and updated ember-code-snippet
yapplabs · Sep 30, 2024 · 4badb14 · 4badb14
1 parent 46d5b8e
commit 4badb14
Show file tree

Hide file tree

Showing 17 changed files with 17,900 additions and 12,292 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -23,3 +23,4 @@
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+/pnpm-lock.yaml.ember-try
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,8 @@
 name: CI
 
+env:
+  VOLTA_FEATURE_PNPM: 1
+
 on:
   push:
     branches:
@@ -17,33 +20,64 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Install Node
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - name: Install volta
+        uses: volta-cli/action@v4
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path -s)" >> $GITHUB_OUTPUT
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        id: cache
         with:
-          node-version: 16.x
-          cache: yarn
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        shell: bash
+        run: pnpm install --frozen-lockfile
+      - name: Prune pnpm store
+        if: ${{ steps.cache.outputs.cache-hit != 'true' }}
+        shell: bash
+        run: pnpm store prune
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
       - name: Run Tests
-        run: yarn test:ember
+        run: pnpm test:ember
 
   floating:
     name: "Floating Dependencies"
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - name: Install volta
+        uses: volta-cli/action@v4
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path -s)" >> $GITHUB_OUTPUT
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        id: cache
         with:
-          node-version: 16.x
-          cache: yarn
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       - name: Install Dependencies
-        run: yarn install --no-lockfile
+        shell: bash
+        run: pnpm install --no-frozen-lockfile
+      - name: Prune pnpm store
+        if: ${{ steps.cache.outputs.cache-hit != 'true' }}
+        shell: bash
+        run: pnpm store prune
       - name: Run Tests
-        run: yarn test:ember
+        run: pnpm test:ember
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
@@ -56,22 +90,40 @@ jobs:
         try-scenario:
           - ember-lts-3.24
           - ember-lts-3.28
+          - ember-lts-4.4
+          - ember-lts-4.8
+          - ember-lts-4.12
+          - ember-lts-5.4
+          - ember-lts-5.8
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-classic
-          - ember-default-with-jquery
           - embroider-safe
           - embroider-optimized
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Install Node
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - name: Install volta
+        uses: volta-cli/action@v4
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path -s)" >> $GITHUB_OUTPUT
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        id: cache
         with:
-          node-version: 16.x
-          cache: yarn
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        shell: bash
+        run: pnpm install --frozen-lockfile
+      - name: Prune pnpm store
+        if: ${{ steps.cache.outputs.cache-hit != 'true' }}
+        shell: bash
+        run: pnpm store prune
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+/pnpm-lock.yaml.ember-try
diff --git a/.npmignore b/.npmignore
@@ -29,6 +29,7 @@
 /tests/
 /yarn-error.log
 /yarn.lock
+/pnpm-lock.yaml
 .gitkeep
 
 # ember-try
@@ -38,3 +39,4 @@
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+/pnpm-lock.yaml.ember-try
diff --git a/.prettierignore b/.prettierignore
@@ -23,3 +23,4 @@
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+/pnpm-lock.yaml.ember-try
diff --git a/README.md b/README.md
@@ -8,30 +8,32 @@ Unlike some other modal libraries for Ember, ember-modal-dialog uses solutions l
 
 <!-- toc -->
 
-- [Live Demo and Test Examples](#live-demo-and-test-examples)
-- [Including In An Ember Application](#including-in-an-ember-application)
-- [Upgrading](#upgrading)
-- [Controller-bound Usage](#controller-bound-usage)
-- [Routable Usage](#routable-usage)
-- [Configurable Properties](#configurable-properties)
-  * [modal-dialog](#modal-dialog)
-    + [Tethering](#tethering)
-    + [Animation](#animation)
-  * [Optional Dependencies](#optional-dependencies)
-- [Which Component Should I Use?](#which-component-should-i-use)
-- [Positioning](#positioning)
-    + [Caveats](#caveats)
-- [Wormholes](#wormholes)
-- [Configuring the Modal Root Element Id](#configuring-the-modal-root-element-id)
-- [Configuring Styles](#configuring-styles)
-- [Keyboard shortcuts](#keyboard-shortcuts)
-- [iOS](#ios)
-- [Custom Modals](#custom-modals)
-- [Using as a nested addon](#using-as-a-nested-addon)
-- [Dependencies](#dependencies)
-- [Additional Resources](#additional-resources)
-- [Contributing](#contributing)
-- [Credits](#credits)
+- [Ember Modal Dialog  ](#ember-modal-dialog--)
+  - [Table of Contents](#table-of-contents)
+  - [Live Demo and Test Examples](#live-demo-and-test-examples)
+  - [Including In An Ember Application](#including-in-an-ember-application)
+  - [Upgrading](#upgrading)
+  - [Controller-bound Usage](#controller-bound-usage)
+  - [Routable Usage](#routable-usage)
+  - [Configurable Properties](#configurable-properties)
+    - [modal-dialog](#modal-dialog)
+      - [Tethering](#tethering)
+      - [Animation](#animation)
+    - [Optional Dependencies](#optional-dependencies)
+  - [Which Component Should I Use?](#which-component-should-i-use)
+  - [Positioning](#positioning)
+      - [Caveats](#caveats)
+  - [Wormholes](#wormholes)
+  - [Configuring the Modal Root Element Id](#configuring-the-modal-root-element-id)
+  - [Configuring Styles](#configuring-styles)
+  - [Keyboard shortcuts](#keyboard-shortcuts)
+  - [iOS](#ios)
+  - [Custom Modals](#custom-modals)
+  - [Using as a nested addon](#using-as-a-nested-addon)
+  - [Compatibility \& Dependencies](#compatibility--dependencies)
+  - [Additional Resources](#additional-resources)
+  - [Contributing](#contributing)
+  - [Credits](#credits)
 
 <!-- tocstop -->
 
@@ -384,7 +386,7 @@ module.exports = {
 };
 ```
 
-## Dependencies
+## Compatibility & Dependencies
 
 * For Ember versions >= 3.20, use the latest published version
 * For Ember versions >= 2.8 and < 3.20, use the latest 3.x version (Note that ember-cli >= 2.13 is required, though your ember version may be >= 2.8)

diff --git a/RELEASE.md b/RELEASE.md
@@ -33,7 +33,7 @@ Once the prep work is completed, the actual release is straight forward:
 * First, ensure that you have installed your projects dependencies:
 
 ```
-yarn install
+pnpm install
 ```
 
 * Second, ensure that you have obtained a

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -5,7 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function () {
   return {
-    useYarn: true,
+    usePnpm: true,
     scenarios: [
       {
         name: 'ember-lts-3.24',
@@ -24,57 +24,66 @@ module.exports = async function () {
         },
       },
       {
-        name: 'ember-release',
+        name: 'ember-lts-4.4',
         npm: {
           devDependencies: {
-            'ember-source': await getChannelURL('release'),
+            'ember-source': '~4.4.0',
           },
         },
       },
       {
-        name: 'ember-beta',
+        name: 'ember-lts-4.8',
         npm: {
           devDependencies: {
-            'ember-source': await getChannelURL('beta'),
+            'ember-source': '~4.8.0',
           },
         },
       },
       {
-        name: 'ember-canary',
+        name: 'ember-lts-4.12',
         npm: {
           devDependencies: {
-            'ember-source': await getChannelURL('canary'),
+            'ember-source': '~4.12.0',
           },
         },
       },
       {
-        name: 'ember-default-with-jquery',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'jquery-integration': true,
-          }),
+        name: 'ember-lts-5.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~5.4.0',
+          },
         },
+      },
+      {
+        name: 'ember-lts-5.8',
         npm: {
           devDependencies: {
-            '@ember/jquery': '^1.1.0',
+            'ember-source': '~5.8.0',
           },
         },
       },
       {
-        name: 'ember-classic',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'application-template-wrapper': true,
-            'default-async-observers': false,
-            'template-only-glimmer-components': false,
-          }),
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release'),
+          },
         },
+      },
+      {
+        name: 'ember-beta',
         npm: {
           devDependencies: {
-            'ember-source': '~3.28.0',
+            'ember-source': await getChannelURL('beta'),
           },
-          ember: {
-            edition: 'classic',
+        },
+      },
+      {
+        name: 'ember-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('canary'),
           },
         },
       },

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -5,6 +5,10 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 module.exports = function (defaults) {
   let app = new EmberAddon(defaults, {
     snippetSearchPaths: ['tests/dummy/app'],
+    'ember-prism': {
+      theme: 'twilight',
+      components: ['scss', 'javascript', 'markup'],
+    },
   });
 
   /*