Skip to content

Commit bee63ea

Browse files
committed
fix old lts
1 parent fa0ac86 commit bee63ea

File tree

5 files changed

+66
-11
lines changed

5 files changed

+66
-11
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
- name: Setup ember-try scenario
117117
run: pnpm ember-debug:try:one ${{ matrix.scenario }} --skip-cleanup --- cat package.json
118118
- name: Run test
119-
run: pnpm ember-debug:test
119+
run: pnpm ember-debug:try:one ${{ matrix.scenario }} --skip-cleanup
120120

121121
build:
122122
name: Build extensions

pnpm-lock.yaml

Lines changed: 52 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-apps/embroider-static-source/config/ember-try.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ const getChannelURL = require('ember-source-channel-url');
44

55
module.exports = async function () {
66
return {
7-
usePnpm: true,
7+
packageManager: 'pnpm',
8+
// hack to override
89
scenarios: [
910
{
1011
name: 'ember-lts-3.16',
12+
command: 'pnpm run test-lts-3',
1113
npm: {
1214
devDependencies: {
1315
'@ember/test-helpers': '^2.4.0',
@@ -20,6 +22,7 @@ module.exports = async function () {
2022
},
2123
{
2224
name: 'ember-lts-3.20',
25+
command: 'pnpm run test-lts-3',
2326
npm: {
2427
devDependencies: {
2528
'@ember/test-helpers': '^2.4.0',
@@ -32,6 +35,7 @@ module.exports = async function () {
3235
},
3336
{
3437
name: 'ember-lts-3.24',
38+
command: 'pnpm run test-lts-3',
3539
npm: {
3640
devDependencies: {
3741
'@ember/test-helpers': '^2.4.0',
@@ -44,13 +48,15 @@ module.exports = async function () {
4448
},
4549
{
4650
name: 'ember-lts-3.28',
51+
command: 'pnpm run test-lts-3',
4752
npm: {
4853
devDependencies: {
4954
'@ember/test-helpers': '^2.4.0',
5055
'ember-cli': '^3.28.0',
5156
'ember-source': '~3.28.0',
5257
'ember-resolver': '^11.0.1',
5358
'ember-qunit': '^5.1.5',
59+
'babel-plugin-ember-template-compilation': '^1.0.2',
5460
},
5561
},
5662
},

test-apps/embroider-static-source/ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ module.exports = function (defaults) {
2828
});
2929

3030
return compatBuild(app, require('@embroider/webpack').Webpack, {
31-
emberStaticSource: true,
31+
staticEmberSource: true,
3232
});
3333
};

test-apps/embroider-static-source/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "classic-test-app",
2+
"name": "embroider-static-source-test-app",
33
"version": "0.0.0",
44
"private": true,
55
"description": "Small description for test-app goes here",
@@ -14,6 +14,9 @@
1414
"build": "ember build --environment=testing",
1515
"test": "EMBER_ENV=test ember test",
1616
"ember-debug-test": "pnpm test",
17+
"lts-3-apply-override": "jq '.pnpm.overrides.\"babel-plugin-ember-template-compilation\" = \"^1.0.2\"' ../../package.json > tmp.json && mv tmp.json ../../package.json",
18+
"lts-3-remove-override": "jq 'del(.pnpm)' ../../package.json > tmp.json && mv tmp.json ../../package.json",
19+
"test-lts-3": "pnpm lts-3-apply-override; pnpm test; pnpm lts-3-remove-override",
1720
"ember:try:one": "ember try:one",
1821
"test-server:ember": "ember test --serve --watcher node"
1922
},
@@ -52,7 +55,7 @@
5255
"ember-template-lint": "^6.0.0",
5356
"ember-welcome-page": "^7.0.2",
5457
"ember-wormhole": "^0.6.0",
55-
"ember-try": "^3.0.0",
58+
"ember-try": "^4.0.0",
5659
"loader.js": "^4.7.0",
5760
"tracked-built-ins": "^3.4.0",
5861
"ember-in-element-polyfill": "^1.0.1",

0 commit comments

Comments
 (0)