Skip to content

Commit

Permalink
Merge pull request #48 from pzuraq/fix-bower
Browse files Browse the repository at this point in the history
Fix bower
  • Loading branch information
pzuraq committed Mar 23, 2021
2 parents 03d9834 + e04ae01 commit 40c6a50
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
ember-try-scenario:
- ember-babel-6
- node-babel-6
- ember-2.0-babel-7
- ember-babel-7

steps:
Expand Down
16 changes: 16 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,22 @@ module.exports = function() {
}
}
},
{
name: 'ember-2.0-babel-7',
bower: {
dependencies: {
ember: '~2.0.0',
},
},
command: 'ember test',
npm: {
devDependencies: {
'ember-source': null,
'ember-fetch': null,
'ember-data': null,
},
},
},
{
name: 'ember-babel-7',
command: 'ember test',
Expand Down
26 changes: 26 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@
const VersionChecker = require('ember-cli-version-checker');
const extractTrueVersion = require('./utils/extract-true-version');
const getFlags = require('./utils/get-flags');
const fs = require('fs');
const path = require('path');

// from https://github.com/ember-cli/ember-cli-version-checker/blob/70c2d52cde964b1e8acd062411c9f1666180a52c/src/dependency-version-checker.js#L9
function getVersionFromJSONFile(filePath) {
try {
// Use the require cache to avoid file I/O after first call on a given path.
let pkg = require(filePath);
return pkg.version;
} catch (err) {
// file doesn't exist or is not a file or is not parseable.
return null;
}
}

module.exports = {
name: 'ember-compatibility-helpers',
Expand All @@ -16,6 +30,18 @@ module.exports = {
this.projectChecker = new VersionChecker(this.project);
this.emberVersion = this.projectChecker.for('ember-source').version;

if (!this.emberVersion) {
let bowerrcPath = path.join(this.project.root, '.bowerrc');
let bowerDirectory = 'bower_components';
if (fs.existsSync(bowerrcPath)) {
bowerDirectory = fs.readJsonSync(bowerrcPath).directory;
}

this.emberVersion =
getVersionFromJSONFile(path.join(this.project.root, bowerDirectory, 'ember', '.bower.json')) ||
getVersionFromJSONFile(path.join(this.project.root, bowerDirectory, 'ember', 'bower.json'));
}

// Create a parent checker for checking the parent app/addons dependencies (for things like polyfills)
this.parentChecker = new VersionChecker(this.parent);
const emberBabelChecker = this.parentChecker.for('ember-cli-babel', 'npm');
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/gte-smoke-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import { gte } from 'ember-compatibility-helpers';
module('gte-smoke-test', function() {
test('gte generally functions, and avoids an import error', function(assert) {
assert.ok(gte('0.0.0'));
assert.ok(gte('ember-source', '0.0.0'));
assert.ok(gte('semver', '0.0.0'));
});
});

0 comments on commit 40c6a50

Please sign in to comment.