Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 27 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v6
with:
node-version: 20.x
- name: install dependencies
run: yarn install --frozen-lockfile
- name: lint:js
run: yarn lint:js
- name: lint:hbs
run: yarn lint:hbs
cache: pnpm
- run: pnpm install --frozen-lockfile
- run: pnpm lint:js
- run: pnpm lint:hbs

test:
name: Tests
Expand All @@ -38,16 +37,15 @@ jobs:
node-version: [20.x, 24.x]

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
- name: install dependencies
run: yarn install --ignore-engines --frozen-lockfile
- name: node tests
run: yarn test:node
- name: ember test
run: yarn test:ember
cache: pnpm
- run: pnpm install
- run: pnpm test:node
- run: pnpm test:ember

floating-dependencies:
name: Floating Deps
Expand All @@ -56,16 +54,15 @@ jobs:
needs: [test, lint]

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v6
with:
node-version: 20.x
- name: install dependencies
run: yarn install --ignore-lockfile
- name: node tests
run: yarn test:node
- name: ember test
run: yarn test:ember
cache: pnpm
- run: pnpm install --no-lockfile
- run: pnpm test:node
- run: pnpm test:ember

try-scenarios:
name: ${{ matrix.ember-try-scenario }}
Expand All @@ -86,13 +83,14 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v6
with:
node-version: 20.x
- name: install dependencies
run: yarn install
cache: pnpm
- run: pnpm install
- name: test
env:
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
run: pnpm ember try:one $EMBER_TRY_SCENARIO
5 changes: 2 additions & 3 deletions node-tests/colocated-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ const ColocatedTemplateCompiler = require('../lib/colocated-broccoli-plugin');
const ColocatedBabelPlugin = require.resolve('../lib/colocated-babel-plugin');
const BroccoliPersistentFilter = require('broccoli-persistent-filter');
const babel = require('@babel/core');
const TypescriptTransform = require.resolve(
'@babel/plugin-transform-typescript',
);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not exactly sure how the prettier rule started failing when moving to pnpm 🤔 unless there was some strange version pinning that prevented a problem from being found 🤷

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prettier changed meaning of rules on everyone, so things that were valid no longer are

const TypescriptTransform =
require.resolve('@babel/plugin-transform-typescript');
const {
createTempDir,
createBuilder: _createBuilder,
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
"loader.js": "^4.7.0",
"mocha": "^8.4.0",
"module-name-inliner": "link:./tests/dummy/lib/module-name-inliner",
"normalize.css": "^8.0.1",
"prettier": "^3.1.1",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
Expand Down Expand Up @@ -134,5 +135,6 @@
"npm": {
"publish": false
}
}
},
"packageManager": "pnpm@10.28.2"
}
Loading