fix mixing es6 and commonjs module systems

visnup · visnup · commit f062bcc6c24c · 2016-07-07T22:30:33.000-07:00
diff --git a/index.js b/index.js
@@ -4,13 +4,13 @@ import angular from 'angular'
 import {} from './index.css'
 
 angular.module('wafflejs', [
-  require('./routes/index').default,
-  require('./routes/metrics').default,
-  require('./routes/performers').default,
-  require('./routes/speakers').default,
-  require('./routes/sponsorship').default,
-  require('./routes/tickets').default,
-  require('./title').default,
+  require('./routes/index'),
+  require('./routes/metrics'),
+  require('./routes/performers'),
+  require('./routes/speakers'),
+  require('./routes/sponsorship'),
+  require('./routes/tickets'),
+  require('./title'),
 ])
 .config(($locationProvider) => {
   $locationProvider.html5Mode(true)
diff --git a/models/calendar.js b/models/calendar.js
@@ -24,6 +24,6 @@ Object.defineProperty(calendar, 'on', {
   }
 })
 
-export default angular.module('wafflejs.models.calendar', [])
+module.exports = angular.module('wafflejs.models.calendar', [])
 .constant('calendar', calendar)
 .name
diff --git a/routes/index/index.js b/routes/index/index.js
@@ -2,10 +2,10 @@ import angular from 'angular'
 import { map, some, values, chain } from 'lodash'
 import css from './index.css'
 
-export default angular.module('wafflejs.routes.index', [
+module.exports = angular.module('wafflejs.routes.index', [
   require('angular-ui-router'),
   require('angular-marked'),
-  require('models/calendar').default,
+  require('models/calendar'),
 ])
 .config(($stateProvider) => {
   $stateProvider.state('index', {
diff --git a/routes/metrics/chart-gender.js b/routes/metrics/chart-gender.js
@@ -13,7 +13,7 @@ import {} from './chart-gender.css'
 
 const margin = { top: 0, right: 60.5, bottom: 30.5, left: 40.5 }
 
-export default angular.module('wafflejs.routes.metrics.chart-gender', [])
+module.exports = angular.module('wafflejs.routes.metrics.chart-gender', [])
 .component('chartGender', {
   bindings: { tickets: '<' },
   controllerAs: 'chartGender',
diff --git a/routes/metrics/chart-retention.js b/routes/metrics/chart-retention.js
@@ -12,7 +12,7 @@ import {
 
 const margin = { top: 0, right: 60.5, bottom: 30.5, left: 40.5 }
 
-export default angular.module('wafflejs.routes.metrics.chart-retention', [])
+module.exports = angular.module('wafflejs.routes.metrics.chart-retention', [])
 .component('chartRetention', {
   bindings: { tickets: '<' },
   controllerAs: 'chartRetention',
diff --git a/routes/metrics/chart-tickets.js b/routes/metrics/chart-tickets.js
@@ -6,7 +6,7 @@ import {} from './chart-tickets.css'
 
 const margin = { top: 0, right: 60.5, bottom: 30.5, left: 40.5 }
 
-export default angular.module('wafflejs.routes.metrics.chart-tickets', [])
+module.exports = angular.module('wafflejs.routes.metrics.chart-tickets', [])
 .component('chartTickets', {
   bindings: { tickets: '<' },
   controllerAs: 'chartTickets',
diff --git a/routes/metrics/index.js b/routes/metrics/index.js
@@ -4,12 +4,12 @@ import moment from 'moment'
 import { reverse, transform } from 'lodash'
 import css from './index.css'
 
-export default angular.module('wafflejs.routes.metrics', [
+module.exports = angular.module('wafflejs.routes.metrics', [
   require('angular-ui-router'),
-  require('models/calendar').default,
-  require('./chart-gender').default,
-  require('./chart-retention').default,
-  require('./chart-tickets').default,
+  require('models/calendar'),
+  require('./chart-gender'),
+  require('./chart-retention'),
+  require('./chart-tickets'),
 ])
 .config(($stateProvider) => {
   $stateProvider.state('metrics', {
diff --git a/routes/performers/index.js b/routes/performers/index.js
@@ -1,9 +1,9 @@
 import angular from 'angular'
 import html from './index.md'
 
-export default angular.module('wafflejs.routes.performers', [
+module.exports = angular.module('wafflejs.routes.performers', [
   require('angular-ui-router'),
-  require('models/calendar').default,
+  require('models/calendar'),
 ])
 .config(($stateProvider) => {
   $stateProvider.state('performers', {
diff --git a/routes/speakers/index.js b/routes/speakers/index.js
@@ -1,9 +1,9 @@
 import angular from 'angular'
 import html from './index.md'
 
-export default angular.module('wafflejs.routes.speakers', [
+module.exports = angular.module('wafflejs.routes.speakers', [
   require('angular-ui-router'),
-  require('models/calendar').default,
+  require('models/calendar'),
 ])
 .config(($stateProvider) => {
   $stateProvider.state('speakers', {
diff --git a/routes/sponsorship/index.js b/routes/sponsorship/index.js
@@ -2,9 +2,9 @@ import angular from 'angular'
 import { groupBy } from 'lodash'
 import html from './index.md'
 
-export default angular.module('wafflejs.routes.sponsorship', [
+module.exports = angular.module('wafflejs.routes.sponsorship', [
   require('angular-ui-router'),
-  require('models/calendar').default,
+  require('models/calendar'),
 ])
 .config(($stateProvider) => {
   $stateProvider.state('sponsorship', {
diff --git a/routes/tickets/index.js b/routes/tickets/index.js
@@ -1,9 +1,9 @@
 import angular from 'angular'
 import css from './index.css'
 
-export default angular.module('wafflejs.routes.tickets', [
+module.exports = angular.module('wafflejs.routes.tickets', [
   require('angular-ui-router'),
-  require('models/calendar').default,
+  require('models/calendar'),
 ])
 .config(($stateProvider) => {
   $stateProvider.state('tickets', {
diff --git a/title.js b/title.js
@@ -1,6 +1,6 @@
 import angular from 'angular'
 
-export default angular.module('title', [])
+module.exports = angular.module('title', [])
 .directive('title', function($document, $timeout) {
   const title = angular.element($document[0].querySelector('title')).clone()
 

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ Object.defineProperty(calendar, 'on', {`
`24`	`24`	`}`
`25`	`25`	`})`
`26`	`26`
`27`		`-export default angular.module('wafflejs.models.calendar', [])`
	`27`	`+module.exports = angular.module('wafflejs.models.calendar', [])`
`28`	`28`	`.constant('calendar', calendar)`
`29`	`29`	`.name`