Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use npm for rsvp instead of bower #14556

Merged
merged 3 commits into from
Oct 31, 2016
Merged

Use npm for rsvp instead of bower #14556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eceeb0
Use npm for rsvp
krisselden Oct 31, 2016
0fd29a8
Use npm for qunit-phantomjs-runner
krisselden Oct 31, 2016
1e16473
Use npm for jquery and qunitjs
krisselden Oct 31, 2016
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
2 changes: 1 addition & 1 deletion bin/run-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function run(queryString) {
}

function runInPhantom(url, retries, resolve, reject) {
var args = ['bower_components/qunit-phantom-runner/runner.js', url];
var args = [require.resolve('qunit-phantomjs-runner'), url, '900'];

console.log('Running: phantomjs ' + args.join(' '));

Expand Down
10 changes: 2 additions & 8 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,8 @@
"type": "git",
"url": "https://github.com/emberjs/ember.js.git"
},
"dependencies": {
"jquery": ">=1.11.1 <4.0.0",
"qunit": "^1.20.0",
"qunit-phantom-runner": "jonkemp/qunit-phantomjs-runner#1.2.0"
},
"devDependencies": {
"rsvp": "https://github.com/tildeio/rsvp.js.git#v3.2.1",
"router.js": "https://github.com/tildeio/router.js.git#f3ff6564cb817b2cdb620ab430964f19e67c4919",
"ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c"
"ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c",
"router.js": "https://github.com/tildeio/router.js.git#f3ff6564cb817b2cdb620ab430964f19e67c4919"
}
}
59 changes: 45 additions & 14 deletions ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ var filterImports = require('babel-plugin-filter-imports');
var vendoredPackage = require('emberjs-build/lib/vendored-package');
var htmlbarsPackage = require('emberjs-build/lib/htmlbars-package');
var vendoredES6Package = require('emberjs-build/lib/es6-vendored-package');
var replaceVersion = require('emberjs-build/lib/utils/replace-version');

var Funnel = require('broccoli-funnel');
var Rollup = require('broccoli-rollup');
var mergeTrees = require('broccoli-merge-trees');

var rollupEnifed = {
transformBundle(code, options) {
Expand Down Expand Up @@ -62,29 +64,24 @@ function backburner() {
format: 'amd',
moduleId: 'backburner',
exports: 'named'
}
},
annotation: 'backburner.js'
});
}

function rsvp() {
// TODO upstream
var version = require('./bower_components/rsvp/package').version;
var banner = fs.readFileSync(
path.resolve(__dirname, 'bower_components/rsvp/config/versionTemplate.txt'),
'utf8');
var rollup = new Rollup('bower_components/rsvp/lib', {
var transpileES6 = require('emberjs-build/lib/utils/transpile-es6');
var lib = path.resolve(path.dirname(require.resolve('rsvp')), '../lib');
var rollup = new Rollup(lib, {
rollup: {
entry: 'rsvp.js',
plugins: [ rollupEnifed ],
banner: banner.replace('VERSION_PLACEHOLDER_STRING', version),
dest: 'rsvp.js',
format: 'amd',
exports: 'named',
moduleId: 'rsvp'
format: 'es',
exports: 'named'
},
annotation: 'rsvp.js'
});
return rollup;
return transpileES6(rollup);
}

function routeRecognizer() {
Expand All @@ -100,7 +97,8 @@ function routeRecognizer() {
format: 'amd',
moduleId: 'route-recognizer',
exports: 'named'
}
},
annotation: 'route-recognizer.js'
});
}

Expand Down Expand Up @@ -238,6 +236,26 @@ function getVersion() {
return prefix + '+' + sha.slice(0, 8);
}

// non bundled vendor
function jquery() {
let jquery = require.resolve('jquery');
return new Funnel(path.dirname(jquery), {
files: ['jquery.js'],
destDir: 'jquery',
annotation: 'jquery/jquery.js'
});
}

// TEST files
function qunit() {
var qunitjs = require.resolve('qunitjs');
return new Funnel(path.dirname(qunitjs), {
files: ['qunit.js', 'qunit.css'],
destDir: 'qunit',
annotation: 'qunit/qunit.{js|css}'
});
}

module.exports = function() {
var features = getFeatures();
var version = getVersion();
Expand All @@ -264,6 +282,19 @@ module.exports = function() {
'handlebars': glimmerPackage('handlebars') // inlined parser
};

// Replace _getBowerTree with one from npm
EmberBuild.prototype._getBowerTree = function getBowerTree() {
return mergeTrees([
qunit(),
jquery(),
replaceVersion(new Funnel('config/package_manager_files', {
destDir: '/'
}), {
version: version
})
]);
};

var emberBuild = new EmberBuild({
babel: {
development: babelConfigFor('development'),
Expand Down
9 changes: 6 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"backburner.js": "^0.3.1",
"bower": "~1.7.7",
"broccoli-funnel": "^1.0.6",
"broccoli-merge-trees": "^1.1.4",
"broccoli-rollup": "^1.0.3",
"broccoli-stew": "^1.2.0",
"chalk": "^1.1.1",
Expand All @@ -47,24 +48,26 @@
"glimmer-engine": "^0.17.6",
"glob": "^5.0.13",
"html-differ": "^1.3.4",
"jquery": "^3.1.1",
"mocha": "^2.4.5",
"qunit-extras": "^1.5.0",
"qunit-phantomjs-runner": "^2.2.0",
"qunitjs": "^1.22.0",
"route-recognizer": "^0.2.8",
"rsvp": "~3.2.1",
"serve-static": "^1.10.0",
"simple-dom": "^0.3.0",
"testem": "^1.8.1"
},
"dependencies": {
"broccoli-stew": "^1.2.0",
"ember-cli-get-component-path-option": "^1.0.0",
"ember-cli-normalize-entity-name": "^1.0.0",
"ember-cli-path-utils": "^1.0.0",
"ember-cli-string-utils": "^1.0.0",
"ember-cli-test-info": "^1.0.0",
"ember-cli-valid-component-name": "^1.0.0",
"simple-dom": "^0.3.0",
"broccoli-stew": "^1.2.0"
"rsvp": "^3.3.3",
"simple-dom": "^0.3.0"
},
"ember-addon": {
"after": "ember-cli-legacy-blueprints"
Expand Down
26 changes: 15 additions & 11 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ ansi-escapes@^1.1.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"

ansi-regex@*, ansi-regex@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.0.0.tgz#c5061b6e0ef8a81775e50f5d66151bf6bf371107"

ansi-regex@^0.2.0, ansi-regex@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
Expand All @@ -74,6 +70,10 @@ ansi-regex@^1.0.0, ansi-regex@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d"

ansi-regex@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.0.0.tgz#c5061b6e0ef8a81775e50f5d66151bf6bf371107"

ansi-styles@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
Expand Down Expand Up @@ -770,7 +770,7 @@ broccoli-kitchen-sink-helpers@^0.3.1:
glob "^5.0.10"
mkdirp "^0.5.1"

broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3:
broccoli-merge-trees, broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3:
version "1.1.4"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.1.4.tgz#ab9eafd30b0dd8136e882ffd8fb08f3817533ea0"
dependencies:
Expand Down Expand Up @@ -3109,7 +3109,7 @@ iferr@^0.1.5:
version "0.1.5"
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"

imurmurhash@*, imurmurhash@^0.1.4:
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"

Expand Down Expand Up @@ -3383,6 +3383,10 @@ jodid25519@^1.0.0:
dependencies:
jsbn "~0.1.0"

jquery:
version "3.1.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.1.1.tgz#347c1c21c7e004115e0a4da32cece041fad3c8a3"

js-string-escape@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
Expand Down Expand Up @@ -4728,6 +4732,10 @@ qunit-extras@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/qunit-extras/-/qunit-extras-1.5.0.tgz#a64d1c5088ab20c01c0e1b04c72132c397b3964c"

qunit-phantomjs-runner:
version "2.2.0"
resolved "https://registry.yarnpkg.com/qunit-phantomjs-runner/-/qunit-phantomjs-runner-2.2.0.tgz#557a0f55d7d83c315312d1b7048ed972ffea4549"

qunit@^0.7.2:
version "0.7.7"
resolved "https://registry.yarnpkg.com/qunit/-/qunit-0.7.7.tgz#f0006f60b31a91c41e58aba92147576879b425bd"
Expand Down Expand Up @@ -5128,18 +5136,14 @@ route-recognizer@^0.2.8:
version "0.2.8"
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.8.tgz#931e2629b09f351ac8e577aea03ad0151781e625"

rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1:
rsvp, rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1:
version "3.3.3"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.3.3.tgz#34633caaf8bc66ceff4be3c2e1dffd032538a813"

rsvp@~3.0.6:
version "3.0.21"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f"

rsvp@~3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"

rsvp@3.0.14:
version "3.0.14"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.14.tgz#9d2968cf36d878d3bb9a9a5a4b8e1ff55a76dd31"
Expand Down