Skip to content

Commit

Permalink
Merge pull request #1152 from emberjs/use-latest-embroider
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue authored Oct 25, 2021
2 parents 729b9c6 + 244ac3c commit d87e49d
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 29 deletions.
58 changes: 30 additions & 28 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,41 +1,43 @@
'use strict';

const getChannelURL = require('ember-source-channel-url');
const latestVersion = require('latest-version');

const EMBROIDER_VERSION = '^0.43.4';
const embroider = {
safe: {
name: 'embroider-safe',
npm: {
devDependencies: {
'@embroider/core': EMBROIDER_VERSION,
'@embroider/webpack': EMBROIDER_VERSION,
'@embroider/compat': EMBROIDER_VERSION,
'@embroider/test-setup': EMBROIDER_VERSION,
module.exports = async function () {
const EMBROIDER_VERSION = await latestVersion('@embroider/core');

const embroider = {
safe: {
name: 'embroider-safe',
npm: {
devDependencies: {
'@embroider/core': EMBROIDER_VERSION,
'@embroider/webpack': EMBROIDER_VERSION,
'@embroider/compat': EMBROIDER_VERSION,
'@embroider/test-setup': EMBROIDER_VERSION,
},
},
env: {
EMBROIDER_TEST_SETUP_OPTIONS: 'safe',
},
},
env: {
EMBROIDER_TEST_SETUP_OPTIONS: 'safe',
},
},

optimized: {
name: 'embroider-optimized',
npm: {
devDependencies: {
'@embroider/core': EMBROIDER_VERSION,
'@embroider/webpack': EMBROIDER_VERSION,
'@embroider/compat': EMBROIDER_VERSION,
'@embroider/test-setup': EMBROIDER_VERSION,
optimized: {
name: 'embroider-optimized',
npm: {
devDependencies: {
'@embroider/core': EMBROIDER_VERSION,
'@embroider/webpack': EMBROIDER_VERSION,
'@embroider/compat': EMBROIDER_VERSION,
'@embroider/test-setup': EMBROIDER_VERSION,
},
},
env: {
EMBROIDER_TEST_SETUP_OPTIONS: 'optimized',
},
},
env: {
EMBROIDER_TEST_SETUP_OPTIONS: 'optimized',
},
},
};
};

module.exports = async function () {
return {
useYarn: true,
scenarios: [
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"fs-extra": "^9.1.0",
"latest-version": "^5.0.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"pretender": "^3.4.7",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8417,7 +8417,7 @@ konan@^2.1.1:
"@babel/parser" "^7.10.5"
"@babel/traverse" "^7.10.5"

latest-version@^5.1.0:
latest-version@^5.0.0, latest-version@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
Expand Down

0 comments on commit d87e49d

Please sign in to comment.