Skip to content

Commit a3b9b48

Browse files
Awk34Awk34
committed
Merge pull request angular-fullstack#1705 from angular-fullstack/chore/gen-babel-6
chore(gen): update to Babel 6
2 parents 4f3f9dc + fdd8bdf commit a3b9b48

25 files changed

+60
-45
lines changed

Diff for: ‎.babelrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"presets": ["es2015"],
3+
"plugins": ["transform-class-properties"]
4+
}

Diff for: ‎app/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

33
// Register the Babel require hook
4-
require('babel-core/register')({
4+
require('babel-register')({
55
only: /generator-angular-fullstack\/(?!node_modules)/
66
});
77

88
// Export the generator
9-
exports = module.exports = require('./generator');
9+
module.exports = require('./generator').default;

Diff for: ‎app/templates/Gruntfile(grunt).js

+5-5
Original file line numberDiff line numberDiff line change
@@ -619,10 +619,7 @@ module.exports = function (grunt) {
619619
// Compiles ES6 to JavaScript using Babel
620620
babel: {
621621
options: {
622-
sourceMap: true,
623-
optional: [
624-
'es7.classProperties'
625-
]
622+
sourceMap: true
626623
},<% if(filters.babel) { %>
627624
client: {
628625
files: [{
@@ -634,7 +631,10 @@ module.exports = function (grunt) {
634631
},<% } %>
635632
server: {
636633
options: {
637-
optional: ['runtime']
634+
plugins: [
635+
'transform-class-properties',
636+
'transform-runtime'
637+
]
638638
},
639639
files: [{
640640
expand: true,

Diff for: ‎app/templates/_.babelrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"presets": ["es2015"],
3+
"plugins": ["transform-class-properties"]
4+
}

Diff for: ‎app/templates/_package.json

+12-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"composable-middleware": "^0.3.0",
1515
"lodash": "^3.10.1",
1616
"lusca": "^1.3.0",
17-
"babel-runtime": "^5.8.20",<% if (filters.jade) { %>
17+
"babel-runtime": "^6.6.1",
18+
"babel-polyfill": "^6.7.2",<% if (filters.jade) { %>
1819
"jade": "^1.11.0",<% } %><% if (filters.html) { %>
1920
"ejs": "^2.3.3",<% } %><% if (filters.mongoose) { %>
2021
"mongoose": "^4.1.2",
@@ -37,13 +38,17 @@
3738
},
3839
"devDependencies": {
3940
"autoprefixer": "^6.0.0",
40-
"babel-core": "^5.6.4",<% if(filters.gulp) { %>
41+
"babel-core": "^6.6.5",
42+
"babel-register": "^6.6.5",
43+
"babel-plugin-transform-class-properties": "^6.6.0",
44+
"babel-plugin-transform-runtime": "^6.6.0",
45+
"babel-preset-es2015": "^6.6.0",<% if(filters.gulp) { %>
4146
"del": "^2.0.2",
42-
"gulp": "^3.9.0",
47+
"gulp": "^3.9.1",
4348
"gulp-add-src": "^0.2.0",
4449
"gulp-angular-templatecache": "^1.7.0",
4550
"gulp-autoprefixer": "2.3.1",
46-
"gulp-babel": "^5.1.0",<% if(filters.ts) { %>
51+
"gulp-babel": "^6.1.2",<% if(filters.ts) { %>
4752
"gulp-typescript": "~2.10.0",
4853
"gulp-tsd": "~0.0.4",
4954
"gulp-tslint": "~4.2.1",<% } %>
@@ -83,7 +88,7 @@
8388
"gulp-scss-lint": "^0.2.1",<% } if(filters.less) { %>
8489
"gulp-less": "^3.0.3",
8590
"gulp-recess": "^1.1.2",<% } %>
86-
"isparta": "^3.5.3",
91+
"isparta": "^4.0.0",
8792
"utile": "~0.3.0",
8893
"nodemon": "^1.3.7",
8994
"run-sequence": "^1.1.0",
@@ -102,7 +107,7 @@
102107
"grunt-contrib-watch": "~0.6.1",<% if (filters.jade) { %>
103108
"grunt-contrib-jade": "^0.15.0",<% } %><% if (filters.less) { %>
104109
"grunt-contrib-less": "^1.0.0",<% } %>
105-
"grunt-babel": "~5.0.0",<% if(filters.ts) { %>
110+
"grunt-babel": "~6.0.0",<% if(filters.ts) { %>
106111
"grunt-ts": "~5.2.0",
107112
"grunt-tsd": "~0.1.0",
108113
"grunt-tslint": "~3.0.1",<% } %>
@@ -157,7 +162,7 @@
157162
"jasmine-core": "^2.3.4",
158163
"karma-jasmine": "~0.3.0",
159164
"jasmine-spec-reporter": "^2.4.0",<% } if(filters.babel) { %>
160-
"karma-babel-preprocessor": "^5.2.1",<% } %>
165+
"karma-babel-preprocessor": "^6.0.1",<% } %>
161166
"requirejs": "~2.1.11",
162167
"phantomjs-prebuilt": "^2.1.4",
163168
"proxyquire": "^1.0.1",

Diff for: ‎app/templates/e2e/account(auth)/login/login.spec(jasmine).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
var config = browser.params;<% if (filters.mongooseModels) { %>
4-
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model');<% } %><% if (filters.sequelizeModels) { %>
4+
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model').default;<% } %><% if (filters.sequelizeModels) { %>
55
var UserModel = require(config.serverConfig.root + '/server/sqldb').User;<% } %>
66

77
describe('Login View', function() {

Diff for: ‎app/templates/e2e/account(auth)/login/login.spec(mocha).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
var config = browser.params;<% if (filters.mongooseModels) { %>
4-
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model');<% } %><% if (filters.sequelizeModels) { %>
4+
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model').default;<% } %><% if (filters.sequelizeModels) { %>
55
var UserModel = require(config.serverConfig.root + '/server/sqldb').User;<% } %>
66

77
describe('Login View', function() {

Diff for: ‎app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
var config = browser.params;<% if (filters.mongooseModels) { %>
4-
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model');<% } %><% if (filters.sequelizeModels) { %>
4+
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model').default;<% } %><% if (filters.sequelizeModels) { %>
55
var UserModel = require(config.serverConfig.root + '/server/sqldb').User;<% } %>
66

77
describe('Logout View', function() {

Diff for: ‎app/templates/e2e/account(auth)/logout/logout.spec(mocha).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
var config = browser.params;<% if (filters.mongooseModels) { %>
4-
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model');<% } %><% if (filters.sequelizeModels) { %>
4+
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model').default;<% } %><% if (filters.sequelizeModels) { %>
55
var UserModel = require(config.serverConfig.root + '/server/sqldb').User;<% } %>
66

77
describe('Logout View', function() {

Diff for: ‎app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
var config = browser.params;<% if (filters.mongooseModels) { %>
4-
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model');<% } %><% if (filters.sequelizeModels) { %>
4+
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model').default;<% } %><% if (filters.sequelizeModels) { %>
55
var UserModel = require(config.serverConfig.root + '/server/sqldb').User;<% } %>
66

77
describe('Signup View', function() {

Diff for: ‎app/templates/e2e/account(auth)/signup/signup.spec(mocha).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
var config = browser.params;<% if (filters.mongooseModels) { %>
4-
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model');<% } %><% if (filters.sequelizeModels) { %>
4+
var UserModel = require(config.serverConfig.root + '/server/api/user/user.model').default;<% } %><% if (filters.sequelizeModels) { %>
55
var UserModel = require(config.serverConfig.root + '/server/sqldb').User;<% } %>
66

77
describe('Signup View', function() {

Diff for: ‎app/templates/gulpfile.babel(gulp).js

+5-4
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,16 @@ let styles = lazypipe()
140140

141141
let transpileClient = lazypipe()
142142
.pipe(plugins.sourcemaps.init)
143-
.pipe(plugins.babel, {
144-
optional: ['es7.classProperties']
145-
})
143+
.pipe(plugins.babel)
146144
.pipe(plugins.sourcemaps.write, '.');<% } %>
147145

148146
let transpileServer = lazypipe()
149147
.pipe(plugins.sourcemaps.init)
150148
.pipe(plugins.babel, {
151-
optional: ['runtime']
149+
plugins: [
150+
'transform-class-properties',
151+
'transform-runtime'
152+
]
152153
})
153154
.pipe(plugins.sourcemaps.write, '.');
154155

Diff for: ‎app/templates/karma.conf.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ module.exports = function(config) {
4747

4848
babelPreprocessor: {
4949
options: {
50-
sourceMap: 'inline',
51-
optional: [
52-
'es7.classProperties'
53-
]
50+
sourceMap: 'inline'
5451
},
5552
filename: function (file) {
5653
return file.originalPath.replace(/\.js$/, '.es5.js');

Diff for: ‎app/templates/protractor.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var config = {
6565
},
6666

6767
onPrepare: function() {
68-
require('babel-core/register');<% if (filters.mocha) { %>
68+
require('babel-register');<% if (filters.mocha) { %>
6969
// Load Mocha and Chai + plugins
7070
require('./mocha.conf');
7171

Diff for: ‎app/templates/server/api/user(auth)/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ router.put('/:id/password', auth.isAuthenticated(), controller.changePassword);
1313
router.get('/:id', auth.isAuthenticated(), controller.show);
1414
router.post('/', controller.create);
1515

16-
export default router;
16+
module.exports = router;

Diff for: ‎app/templates/server/app.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ var socketio = require('socket.io')(server, {
2828
serveClient: config.env !== 'production',
2929
path: '/socket.io-client'
3030
});
31-
require('./config/socketio')(socketio);<% } %>
32-
require('./config/express')(app);
33-
require('./routes')(app);
31+
require('./config/socketio').default(socketio);<% } %>
32+
require('./config/express').default(app);
33+
require('./routes').default(app);
3434

3535
// Start server
3636
function startServer() {

Diff for: ‎app/templates/server/auth(auth)/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ require('./twitter/passport').setup(User, config);<% } %>
1414

1515
var router = express.Router();
1616

17-
router.use('/local', require('./local'));<% if (filters.facebookAuth) { %>
18-
router.use('/facebook', require('./facebook'));<% } %><% if (filters.twitterAuth) { %>
19-
router.use('/twitter', require('./twitter'));<% } %><% if (filters.googleAuth) { %>
20-
router.use('/google', require('./google'));<% } %>
17+
router.use('/local', require('./local').default);<% if (filters.facebookAuth) { %>
18+
router.use('/facebook', require('./facebook').default);<% } %><% if (filters.twitterAuth) { %>
19+
router.use('/twitter', require('./twitter').default);<% } %><% if (filters.googleAuth) { %>
20+
router.use('/google', require('./google').default);<% } %>
2121

2222
export default router;

Diff for: ‎app/templates/server/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var env = process.env.NODE_ENV = process.env.NODE_ENV || 'development';
55

66
if (env === 'development' || env === 'test') {
77
// Register the Babel require hook
8-
require('babel-core/register');
8+
require('babel-register');
99
}
1010

1111
// Export the application

Diff for: ‎app/templates/server/routes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function(app) {
1111
// Insert routes below<% if (filters.auth) { %>
1212
app.use('/api/users', require('./api/user'));
1313

14-
app.use('/auth', require('./auth'));
14+
app.use('/auth', require('./auth').default);
1515
<% } %>
1616
// All undefined asset or api routes should return a 404
1717
app.route('/:url(api|auth|components|app|bower_components|assets)/*')

Diff for: ‎app/templates/server/sqldb(sequelize)/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ var db = {
1616
// Insert models below<% if (filters.sequelizeModels && filters.auth) { %>
1717
db.User = db.sequelize.import('../api/user/user.model');<% } %>
1818

19-
export default db;
19+
module.exports = db;

Diff for: ‎endpoint/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

33
// Register the Babel require hook
4-
require('babel-core/register')({
4+
require('babel-register')({
55
only: /generator-angular-fullstack\/(?!node_modules)/
66
});
77

88
// Export the generator
9-
exports = module.exports = require('./generator');
9+
module.exports = require('./generator').default;

Diff for: ‎endpoint/templates/basename.events(models).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict';
66

77
import {EventEmitter} from 'events';<% if (filters.mongooseModels) { %>
8-
var <%= classedName %> = require('./<%= basename %>.model');<% } if (filters.sequelizeModels) { %>
8+
import <%= classedName %> from './<%= basename %>.model';<% } if (filters.sequelizeModels) { %>
99
var <%= classedName %> = require('<%= relativeRequire(config.get('registerModelsFile')) %>').<%= classedName %>;<% } %>
1010
var <%= classedName %>Events = new EventEmitter();
1111

Diff for: ‎endpoint/templates/basename.socket(socketio).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
'use strict';
66

7-
var <%= classedName %>Events = require('./<%= basename %>.events');
7+
import <%= classedName %>Events from './<%= basename %>.events';
88

99
// Model events to emit
1010
var events = ['save', 'remove'];

Diff for: ‎package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
"test": "grunt test"
3535
},
3636
"dependencies": {
37-
"babel-core": "^5.8.23",
37+
"babel-core": "^6.7.0",
38+
"babel-plugin-transform-class-properties": "^6.6.0",
39+
"babel-preset-es2015": "^6.6.0",
40+
"babel-register": "^6.6.5",
3841
"chalk": "^1.1.0",
3942
"generator-ng-component": "~0.2.1",
4043
"glob": "^7.0.3",

Diff for: ‎test/test-file-creation.js

+1
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ describe('angular-fullstack generator', function () {
207207
'e2e/main/main.po.js',
208208
'e2e/main/main.spec.js',
209209
'e2e/components/navbar/navbar.po.js',
210+
'.babelrc',
210211
'.bowerrc',
211212
'.buildignore',
212213
'.editorconfig',

0 commit comments

Comments
 (0)