Skip to content

Commit

Permalink
Merge pull request miragejs#2387 from miragejs/bump_embroider
Browse files Browse the repository at this point in the history
Bump `@embroider/*` packages to latest
  • Loading branch information
SergeAstapov authored Apr 13, 2022
2 parents 83a1c95 + ed191ec commit 54e0f0b
Show file tree
Hide file tree
Showing 4 changed files with 321 additions and 187 deletions.
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"@ember/jquery": "^2.0.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^1.0.0",
"@embroider/test-setup": "^1.6.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@types/qunit": "^2.11.3",
Expand Down Expand Up @@ -125,16 +125,20 @@
"webpack": "^5.66.0"
},
"resolutions": {
"favicons": "5.3.0",
"@embroider/core": "1.6.0",
"@embroider/macros": "1.6.0",
"@embroider/shared-internals": "1.6.0",
"@embroider/util": "1.6.0",
"babel-import-util": "1.2.2",
"colors": "1.4.0",
"babel-import-util": "1.1.0"
"favicons": "5.3.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
},
"volta": {
"node": "12.22.7",
"yarn": "1.22.17"
"node": "12.22.12",
"yarn": "1.22.18"
},
"changelog": {
"labels": {
Expand Down
13 changes: 13 additions & 0 deletions tests/dummy/config/addon-docs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
'use strict';

// eslint-disable-next-line node/no-unpublished-require
const AddonDocsConfig = require('ember-cli-addon-docs/lib/config');

module.exports = class extends AddonDocsConfig {
// See https://ember-learn.github.io/ember-cli-addon-docs/docs/deploying
// for details on configuration you can override here.

getRootURL() {
return '';
}
};
31 changes: 31 additions & 0 deletions tests/dummy/config/deploy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/* eslint-env node */
'use strict';

module.exports = function (deployTarget) {
let ENV = {
build: {},
git: {
repo: 'git@github.com:miragejs/ember-cli-mirage.git',
},
};

if (deployTarget === 'development') {
ENV.build.environment = 'development';
// configure other plugins for development deploy target here
}

if (deployTarget === 'staging') {
ENV.build.environment = 'production';
// configure other plugins for staging deploy target here
}

if (deployTarget === 'production') {
ENV.build.environment = 'production';
// configure other plugins for production deploy target here
}

// Note: if you need to build some configuration asynchronously, you can return
// a promise that resolves with the ENV object instead of returning the
// ENV object synchronously.
return ENV;
};
Loading

0 comments on commit 54e0f0b

Please sign in to comment.