update ember-cli to 1.13.8
This commit is contained in:
jelhan
parent
b5ae0c47da
commit
149cf7fe8b
6 changed files with 114 additions and 111 deletions
85
Brocfile.js
85
Brocfile.js
|
|
@ -1,85 +0,0 @@
|
|||
/* global require, module */
|
||||
|
||||
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
|
||||
var pickFiles = require('broccoli-static-compiler');
|
||||
var unwatchedTree = require('broccoli-unwatched-tree');
|
||||
var trees = [];
|
||||
|
||||
var app = new EmberApp({
|
||||
'buildInfoOptions': {
|
||||
'metaTemplate': 'version={SEMVER}'
|
||||
}
|
||||
});
|
||||
|
||||
// Use `app.import` to add additional libraries to the generated
|
||||
// output files.
|
||||
//
|
||||
// If you need to use different assets in different
|
||||
// environments, specify an object as the first parameter. That
|
||||
// object's keys should be the environment name and the values
|
||||
// should be the asset to use in that environment.
|
||||
//
|
||||
// If the library that you are including contains AMD or ES6
|
||||
// modules that you would like to import into your application
|
||||
// please specify an object with the list of modules as keys
|
||||
// along with the exports of each module as its value.
|
||||
|
||||
app.import({
|
||||
development: 'bower_components/bootstrap/dist/js/bootstrap.js',
|
||||
production: 'bower_components/bootstrap/dist/js/bootstrap.min.js'
|
||||
});
|
||||
app.import({
|
||||
development: 'bower_components/bootstrap/dist/css/bootstrap.css',
|
||||
production: 'bower_components/bootstrap/dist/css/bootstrap.min.css'
|
||||
});
|
||||
if (app.env === 'development' || app.env === 'test') {
|
||||
app.import('bower_components/bootstrap/dist/css/bootstrap.css.map', {
|
||||
destDir: 'assets'
|
||||
});
|
||||
}
|
||||
// include bootstrap fonts in dist
|
||||
trees.push(
|
||||
pickFiles('bower_components/bootstrap/dist/fonts', {
|
||||
srcDir: '/',
|
||||
destDir: '/fonts'
|
||||
})
|
||||
);
|
||||
|
||||
app.import('bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js');
|
||||
app.import('bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.de.js');
|
||||
|
||||
app.import('bower_components/ember-i18n/lib/i18n.js');
|
||||
app.import('bower_components/ember-i18n/lib/i18n-plurals.js');
|
||||
|
||||
app.import({
|
||||
development: 'bower_components/floatThead/dist/jquery.floatThead.js',
|
||||
production: 'bower_components/floatThead/dist/jquery.floatThead.min.js'
|
||||
});
|
||||
|
||||
app.import('bower_components/sjcl/sjcl.js');
|
||||
|
||||
app.import('bower_components/modernizr/modernizr.js');
|
||||
|
||||
app.import('bower_components/jstimezonedetect/jstz.js');
|
||||
|
||||
// include api files into dist
|
||||
trees.push(
|
||||
pickFiles(unwatchedTree('api'), {
|
||||
srcDir: '/',
|
||||
destDir: '/api',
|
||||
files: ['index.php', 'cron.php', 'classes/*', 'vendor/*']
|
||||
})
|
||||
);
|
||||
|
||||
if (app.env === 'development' || app.env === 'test') {
|
||||
trees.push(
|
||||
pickFiles('tests/dummyData', {
|
||||
srcDir: '/',
|
||||
destDir: '/data'
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
trees.push(app.toTree());
|
||||
var mergeTrees = require('broccoli-merge-trees');
|
||||
module.exports = mergeTrees(trees);
|
||||
16
bower.json
16
bower.json
|
|
@ -1,17 +1,17 @@
|
|||
{
|
||||
"name": "croodle",
|
||||
"dependencies": {
|
||||
"ember": "1.12.0",
|
||||
"ember": "1.13.7",
|
||||
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
|
||||
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
|
||||
"ember-data": "1.0.0-beta.18",
|
||||
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
|
||||
"ember-qunit": "0.4.0",
|
||||
"ember-data": "1.13.8",
|
||||
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
|
||||
"ember-qunit": "0.4.9",
|
||||
"ember-qunit-notifications": "0.0.7",
|
||||
"ember-resolver": "~0.1.15",
|
||||
"jquery": "^1.11.1",
|
||||
"loader.js": "ember-cli/loader.js#3.2.0",
|
||||
"qunit": "~1.17.1",
|
||||
"ember-resolver": "~0.1.18",
|
||||
"jquery": "^1.11.3",
|
||||
"loader.js": "ember-cli/loader.js#3.2.1",
|
||||
"qunit": "~1.18.0",
|
||||
"ember-i18n": "~3.0.1",
|
||||
"sjcl": "~1.0.0",
|
||||
"bootstrap": "~3.3.4",
|
||||
|
|
|
|||
87
ember-cli-build.js
Normal file
87
ember-cli-build.js
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
/* global require, module */
|
||||
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
|
||||
|
||||
module.exports = function(defaults) {
|
||||
var pickFiles = require('broccoli-static-compiler');
|
||||
var unwatchedTree = require('broccoli-unwatched-tree');
|
||||
var trees = [];
|
||||
|
||||
var app = new EmberApp({
|
||||
'buildInfoOptions': {
|
||||
'metaTemplate': 'version={SEMVER}'
|
||||
}
|
||||
});
|
||||
|
||||
// Use `app.import` to add additional libraries to the generated
|
||||
// output files.
|
||||
//
|
||||
// If you need to use different assets in different
|
||||
// environments, specify an object as the first parameter. That
|
||||
// object's keys should be the environment name and the values
|
||||
// should be the asset to use in that environment.
|
||||
//
|
||||
// If the library that you are including contains AMD or ES6
|
||||
// modules that you would like to import into your application
|
||||
// please specify an object with the list of modules as keys
|
||||
// along with the exports of each module as its value.
|
||||
|
||||
app.import({
|
||||
development: 'bower_components/bootstrap/dist/js/bootstrap.js',
|
||||
production: 'bower_components/bootstrap/dist/js/bootstrap.min.js'
|
||||
});
|
||||
app.import({
|
||||
development: 'bower_components/bootstrap/dist/css/bootstrap.css',
|
||||
production: 'bower_components/bootstrap/dist/css/bootstrap.min.css'
|
||||
});
|
||||
if (app.env === 'development' || app.env === 'test') {
|
||||
app.import('bower_components/bootstrap/dist/css/bootstrap.css.map', {
|
||||
destDir: 'assets'
|
||||
});
|
||||
}
|
||||
// include bootstrap fonts in dist
|
||||
trees.push(
|
||||
pickFiles('bower_components/bootstrap/dist/fonts', {
|
||||
srcDir: '/',
|
||||
destDir: '/fonts'
|
||||
})
|
||||
);
|
||||
|
||||
app.import('bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js');
|
||||
app.import('bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.de.js');
|
||||
|
||||
app.import('bower_components/ember-i18n/lib/i18n.js');
|
||||
app.import('bower_components/ember-i18n/lib/i18n-plurals.js');
|
||||
|
||||
app.import({
|
||||
development: 'bower_components/floatThead/dist/jquery.floatThead.js',
|
||||
production: 'bower_components/floatThead/dist/jquery.floatThead.min.js'
|
||||
});
|
||||
|
||||
app.import('bower_components/sjcl/sjcl.js');
|
||||
|
||||
app.import('bower_components/modernizr/modernizr.js');
|
||||
|
||||
app.import('bower_components/jstimezonedetect/jstz.js');
|
||||
|
||||
// include api files into dist
|
||||
trees.push(
|
||||
pickFiles(unwatchedTree('api'), {
|
||||
srcDir: '/',
|
||||
destDir: '/api',
|
||||
files: ['index.php', 'cron.php', 'classes/*', 'vendor/*']
|
||||
})
|
||||
);
|
||||
|
||||
if (app.env === 'development' || app.env === 'test') {
|
||||
trees.push(
|
||||
pickFiles('tests/dummyData', {
|
||||
srcDir: '/',
|
||||
destDir: '/data'
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
trees.push(app.toTree());
|
||||
var mergeTrees = require('broccoli-merge-trees');
|
||||
return mergeTrees(trees);
|
||||
};
|
||||
31
package.json
31
package.json
|
|
@ -7,8 +7,8 @@
|
|||
"test": "tests"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "ember server",
|
||||
"build": "ember build",
|
||||
"start": "ember server",
|
||||
"test": "ember test"
|
||||
},
|
||||
"repository": "https://github.com/jelhan/croodle",
|
||||
|
|
@ -19,34 +19,35 @@
|
|||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"body-parser": "^1.2.0",
|
||||
"broccoli-asset-rev": "^2.0.2",
|
||||
"broccoli-asset-rev": "^2.1.2",
|
||||
"broccoli-merge-trees": "^0.2.1",
|
||||
"broccoli-static-compiler": "~0.2.1",
|
||||
"broccoli-unwatched-tree": "^0.1.1",
|
||||
"connect-restreamer": "^1.0.1",
|
||||
"cors": "^2.5.3",
|
||||
"ember-cli": "0.2.7",
|
||||
"ember-cli-app-version": "0.4",
|
||||
"ember-cli-babel": "^5.0.0",
|
||||
"ember-cli": "1.13.8",
|
||||
"ember-cli-app-version": "0.5.0",
|
||||
"ember-cli-babel": "^5.1.3",
|
||||
"ember-cli-bootstrap-datepicker": "0.5.3",
|
||||
"ember-cli-build-info": "0.2.0",
|
||||
"ember-cli-content-security-policy": "0.4.0",
|
||||
"ember-cli-dependency-checker": "^1.0.0",
|
||||
"ember-cli-htmlbars": "0.7.6",
|
||||
"ember-cli-htmlbars-inline-precompile": "0.3.1",
|
||||
"ember-cli-ic-ajax": "0.1.1",
|
||||
"ember-cli-inject-live-reload": "^1.3.0",
|
||||
"ember-cli-dependency-checker": "^1.0.1",
|
||||
"ember-cli-htmlbars": "0.7.9",
|
||||
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
|
||||
"ember-cli-ic-ajax": "0.2.1",
|
||||
"ember-cli-inject-live-reload": "^1.3.1",
|
||||
"ember-cli-less": "1.3.0",
|
||||
"ember-cli-moment-shim": "0.6.2",
|
||||
"ember-cli-pretender": "0.3.2",
|
||||
"ember-cli-qunit": "^0.3.15",
|
||||
"ember-cli-sri": "1.0.3",
|
||||
"ember-cli-uglify": "^1.0.1",
|
||||
"ember-cli-qunit": "^1.0.0",
|
||||
"ember-cli-release": "0.2.3",
|
||||
"ember-cli-sri": "^1.0.3",
|
||||
"ember-cli-uglify": "^1.2.0",
|
||||
"ember-cp-validations": "2.1.0",
|
||||
"ember-data": "1.0.0-beta.18",
|
||||
"ember-data": "1.13.8",
|
||||
"ember-data-model-fragments": "0.3.3",
|
||||
"ember-disable-proxy-controllers": "^1.0.0",
|
||||
"ember-export-application-global": "^1.0.2",
|
||||
"ember-export-application-global": "^1.0.3",
|
||||
"ember-form-master-2000": "0.2.0",
|
||||
"ember-get-helper": "1.0.4",
|
||||
"ember-moment": "3.6.4",
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
"node": false,
|
||||
"browser": false,
|
||||
"boss": true,
|
||||
"curly": false,
|
||||
"curly": true,
|
||||
"debug": false,
|
||||
"devel": false,
|
||||
"eqeqeq": true,
|
||||
|
|
@ -56,5 +56,6 @@
|
|||
"strict": false,
|
||||
"white": false,
|
||||
"eqnull": true,
|
||||
"esnext": true
|
||||
"esnext": true,
|
||||
"unused": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import Ember from 'ember';
|
||||
import Application from '../../app';
|
||||
import Router from '../../router';
|
||||
import config from '../../config/environment';
|
||||
import './poll-title-equal';
|
||||
import './poll-description-equal';
|
||||
|
|
|
|||
Loading…
Reference in a new issue