Skip to content
Open
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
64 changes: 44 additions & 20 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,58 +3,82 @@ name: CI
on:
push:
branches:
- main
- master
- 'v*' # older version branches
tags:
- '*'

pull_request: {}
schedule:
- cron: '0 6 * * 0' # weekly, on sundays

concurrency:
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
lint:
name: Lint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: 22
- name: install dependencies
run: yarn install --frozen-lockfile --ignore-engines
run: pnpm install
- name: lint
run: yarn lint
run: pnpm lint

test:
legacy-node-test:
name: Tests
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
node: ['6', '8', '10', '12', '14']
node: ['6', '8', '10', '12', '14', '16', '18']

steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- run: cat <<< $(jq '.packageManager = "yarn@1.22.22"' package.json) > package.json
- name: install dependencies
run: yarn install --frozen-lockfile --ignore-engines
- name: test
run: yarn test

test:
name: Tests
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
node: ['20', '22', '24']

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: pnpm
- name: install dependencies
run: pnpm install
- name: test
run: pnpm run test

floating-test:
name: Floating dependencies
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: 22
- name: install dependencies
run: yarn install --no-lockfile --ignore-engines
run: pnpm install --no-lockfile
- name: test
run: yarn test
run: pnpm test
95 changes: 44 additions & 51 deletions __tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -347,43 +347,36 @@ export { computedPromise, position };

let actual = transformWithPresetEnv(source);

expect(actual).toEqual(
`var ObjectPromiseProxy = Ember.ObjectProxy.extend(Ember.PromiseProxyMixin);
var position = Ember.computed('lat', 'lng', function () {
var _Ember$getProperties = Ember.getProperties(this, 'lat', 'lng'),
lat = _Ember$getProperties.lat,
lng = _Ember$getProperties.lng;

return lat && lng ? new google.maps.LatLng(lat, lng) : undefined;
});

function position2() {
return Ember.computed('lat', 'lng', function () {
var _Ember$getProperties2 = Ember.getProperties(this, 'lat', 'lng'),
lat = _Ember$getProperties2.lat,
lng = _Ember$getProperties2.lng;

return lat && lng ? new google.maps.LatLng(lat, lng) : undefined;
});
}

function computedPromise() {
var _Ember;

for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
args[_key] = arguments[_key];
}

var func = args.pop();
return (_Ember = Ember).computed.apply(_Ember, args.concat([function () {
return ObjectPromiseProxy.create({
promise: func.apply(this)
});
}]));
}

export { computedPromise, position };`
);
expect(actual).toMatchInlineSnapshot(`
"var ObjectPromiseProxy = Ember.ObjectProxy.extend(Ember.PromiseProxyMixin);
var position = Ember.computed('lat', 'lng', function () {
var _Ember$getProperties = Ember.getProperties(this, 'lat', 'lng'),
lat = _Ember$getProperties.lat,
lng = _Ember$getProperties.lng;
return lat && lng ? new google.maps.LatLng(lat, lng) : undefined;
});
function position2() {
return Ember.computed('lat', 'lng', function () {
var _Ember$getProperties2 = Ember.getProperties(this, 'lat', 'lng'),
lat = _Ember$getProperties2.lat,
lng = _Ember$getProperties2.lng;
return lat && lng ? new google.maps.LatLng(lat, lng) : undefined;
});
}
function computedPromise() {
var _Ember;
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
args[_key] = arguments[_key];
}
var func = args.pop();
return (_Ember = Ember).computed.apply(_Ember, args.concat([function () {
return ObjectPromiseProxy.create({
promise: func.apply(this)
});
}]));
}
export { computedPromise, position };"
`);
});
});

Expand All @@ -405,9 +398,10 @@ describe('when used with typescript', () => {
Plugin,
]);

expect(actual).toEqual(
`Ember.RSVP.Promise.resolve().then(() => {});\n\nfunction scheduleSave(identifier, options = {}) {}`
);
expect(actual).toMatchInlineSnapshot(`
"Ember.RSVP.Promise.resolve().then(() => {});
function scheduleSave(identifier, options = {}) {}"
`);
});

it(`works when you use an import as both a type and a TSDeclareFunction`, () => {
Expand Down Expand Up @@ -490,17 +484,16 @@ export default class MyController extends Controller {
['@babel/plugin-proposal-decorators', { legacy: true }],
]);

expect(actual).toEqual(`var _dec, _class;

function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }

let MyController = (_dec = Ember._action, (_class = class MyController extends Ember.Controller {
addAction(action) {
this.actions.pushObject(action);
}

}, (_applyDecoratedDescriptor(_class.prototype, "addAction", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, "addAction"), _class.prototype)), _class));
export { MyController as default };`);
expect(actual).toMatchInlineSnapshot(`
"var _dec, _class;
function _applyDecoratedDescriptor(i, e, r, n, l) { var a = {}; return Object.keys(n).forEach(function (i) { a[i] = n[i]; }), a.enumerable = !!a.enumerable, a.configurable = !!a.configurable, (\\"value\\" in a || a.initializer) && (a.writable = !0), a = r.slice().reverse().reduce(function (r, n) { return n(i, e, r) || r; }, a), l && void 0 !== a.initializer && (a.value = a.initializer ? a.initializer.call(l) : void 0, a.initializer = void 0), void 0 === a.initializer ? (Object.defineProperty(i, e, a), null) : a; }
let MyController = (_dec = Ember._action, _class = class MyController extends Ember.Controller {
addAction(action) {
this.actions.pushObject(action);
}
}, _applyDecoratedDescriptor(_class.prototype, \\"addAction\\", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, \\"addAction\\"), _class.prototype), _class);
export { MyController as default };"
`);
});
});

Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,6 @@
"release": true,
"tokenRef": "GITHUB_AUTH"
}
}
},
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748"
}
Loading