Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
bekzod committed May 21, 2018
1 parent eb32b00 commit 71ab9f6
Show file tree
Hide file tree
Showing 5 changed files with 755 additions and 591 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,6 @@ node_js:
- "9"
- "8"
- "6"
- "4"

before_install:
- nvm install 6
Expand Down
135 changes: 0 additions & 135 deletions Brocfile.js

This file was deleted.

137 changes: 137 additions & 0 deletions ember-cli-build.js
@@ -0,0 +1,137 @@
'use strict';
/* jshint node:true, undef:true, unused:true */
const Rollup = require('broccoli-rollup');
const Babel = require('broccoli-babel-transpiler');
const merge = require('broccoli-merge-trees');
const funnel = require('broccoli-funnel');
const uglify = require('broccoli-uglify-js');
const version = require('git-repo-version');
const watchify = require('broccoli-watchify');
const concat = require('broccoli-concat');
const stew = require('broccoli-stew');

const env = stew.env;
const map = stew.map;

module.exports = function (app) {
const lib = funnel('lib', { destDir: 'lib' });

const testDir = funnel('test', { destDir: 'test' });
const testFiles = funnel('test', {
files: ['index.html','worker.js'],
destDir: 'test'
});

const mocha = funnel('node_modules/mocha', {
files: ['mocha.css','mocha.js'],
destDir: 'test'
});

const es5 = new Babel(lib, {
plugins: [
'transform-es2015-arrow-functions',
'transform-es2015-computed-properties',
'transform-es2015-shorthand-properties',
'transform-es2015-template-literals',
'transform-es2015-parameters',
'transform-es2015-destructuring',
'transform-es2015-spread',
'transform-es2015-block-scoping',
'transform-es2015-constants',
['transform-es2015-classes', { loose: true }],
'babel6-plugin-strip-class-callcheck'
]
});

// build RSVP itself
const rsvp = new Rollup(es5, {
rollup: {
input: 'lib/rsvp.js',
output: [
{
format: 'umd',
name: 'RSVP',
file: 'rsvp.js',
sourcemap: 'inline'
},
{
format: 'es',
file: 'rsvp.es.js',
sourcemap: 'inline'
}
]
}
});

const rsvpES6 = new Rollup(lib, {
rollup: {
input: 'lib/rsvp.js',
output: [
{
format: 'es',
file: 'es6/rsvp.es.js',
sourcemap: 'inline'
}
]
}
});

const testBundle = watchify(merge([
funnel(rsvp, { destDir: 'test' }),
testDir
]), {
browserify: { debug: true, entries: ['./test/index.js'] }
});

const header = map(
funnel('config', { files: ['versionTemplate.txt'], destDir: 'config' }),
content => content.replace(/VERSION_PLACEHOLDER_STRING/, version())
);

function concatAs(tree, outputFile) {
return concat(merge([tree, header]), {
headerFiles: ['config/versionTemplate.txt'],
inputFiles: ['rsvp.js'],
outputFile: outputFile
});
}

function production(dist, header) {
let result;
env('production', () => {
result = uglify(concatAs(dist, 'rsvp.min.js'), {
compress: {
negate_iife: false,
sequences: false
},
mangle: true
});
})
return result;
}

function development(dist, header) {
return concatAs(dist, 'rsvp.js');
}

return merge([
merge([
production(rsvp, header),
development(rsvp, header),
concat(merge([rsvp, header]), {
headerFiles: ['config/versionTemplate.txt'],
inputFiles: ['rsvp.es.js'],
outputFile: 'rsvp.es.js'
}),
concat(merge([rsvpES6, header]), {
headerFiles: ['config/versionTemplate.txt'],
inputFiles: ['es6/rsvp.es.js'],
outputFile: 'es6/rsvp.es.js'
})
].filter(Boolean)),
// test stuff
testFiles,
mocha,
funnel(testBundle, { destDir: 'test' })
]);
}
12 changes: 6 additions & 6 deletions package.json
Expand Up @@ -27,18 +27,18 @@
"babel-plugin-transform-es2015-template-literals": "^6.22.0",
"babel-preset-env": "1.6.1",
"babel6-plugin-strip-class-callcheck": "^6.0.0",
"broccoli-babel-transpiler": "6.1.2",
"broccoli-babel-transpiler": "6.1.4",
"broccoli-concat": "^3.2.2",
"broccoli-funnel": "2.0.1",
"broccoli-merge-trees": "^2.0.0",
"broccoli-rollup": "2.0.0",
"broccoli-merge-trees": "^3.0.0",
"broccoli-rollup": "2.1.0",
"broccoli-stew": "^1.5.0",
"broccoli-uglify-js": "^0.2.0",
"broccoli-watchify": "1.0.1",
"ember-cli": "2.18.0",
"ember-cli": "3.0.2",
"ember-cli-dependency-checker": "2.1.0",
"git-repo-version": "1.0.1",
"mocha": "4.1.0",
"git-repo-version": "1.0.2",
"mocha": "5.0.5",
"promises-aplus-tests-phantom": "^2.1.0-revise"
},
"scripts": {
Expand Down

0 comments on commit 71ab9f6

Please sign in to comment.