Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
public
/
sequelize
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
不要怂,就是干,撸起袖子干!
Commit 6eefaf5c
authored
Aug 28, 2016
by
Felix Becker
Committed by
Mick Hansen
Aug 28, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Babel devDependency (#6507)
1 parent
c712a97a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
13 deletions
lib/sequelize.js
package.json
test/integration/assets/es6project.es6 → test/integration/assets/es6project.js
test/integration/sequelize.test.js
lib/sequelize.js
View file @
6eefaf5
...
...
@@ -401,9 +401,9 @@ class Sequelize {
if
(
!
this
.
importCache
[
path
])
{
let
defineCall
=
arguments
.
length
>
1
?
arguments
[
1
]
:
require
(
path
);
if
(
typeof
defineCall
===
'object'
&&
defineCall
.
__esModule
)
{
//
Babel/
ES6 module compatability
defineCall
=
defineCall
[
'default'
]
;
if
(
typeof
defineCall
===
'object'
)
{
// ES6 module compatability
defineCall
=
defineCall
.
default
;
}
this
.
importCache
[
path
]
=
defineCall
(
this
,
DataTypes
);
}
...
...
package.json
View file @
6eefaf5
...
...
@@ -55,8 +55,6 @@
"wkx"
:
"0.3.0"
},
"devDependencies"
:
{
"babel-core"
:
"^6.10.4"
,
"babel-preset-es2015"
:
"^6.6.0"
,
"chai"
:
"^3.5.0"
,
"chai-as-promised"
:
"^5.1.0"
,
"chai-datetime"
:
"^1.4.0"
,
...
...
test/integration/assets/es6project.
es6
→
test/integration/assets/es6project.
js
View file @
6eefaf5
export default function(sequelize, DataTypes) {
'use strict'
;
exports
.
default
=
function
(
sequelize
,
DataTypes
)
{
return
sequelize
.
define
(
'Project'
+
parseInt
(
Math
.
random
()
*
9999999999999999
),
{
name
:
DataTypes
.
STRING
});
...
...
test/integration/sequelize.test.js
View file @
6eefaf5
...
...
@@ -14,7 +14,6 @@ var chai = require('chai')
,
moment
=
require
(
'moment'
)
,
Transaction
=
require
(
__dirname
+
'/../../lib/transaction'
)
,
sinon
=
require
(
'sinon'
)
,
babel
=
require
(
'babel-core'
)
,
fs
=
require
(
'fs'
)
,
current
=
Support
.
sequelize
;
...
...
@@ -1171,14 +1170,9 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
expect
(
Project
).
to
.
exist
;
});
it
(
'imports a dao definition from a file compiled with babel'
,
function
()
{
var
es6project
=
babel
.
transformFileSync
(
__dirname
+
'/assets/es6project.es6'
,
{
presets
:
[
'es2015'
]
}).
code
;
fs
.
writeFileSync
(
__dirname
+
'/assets/es6project.js'
,
es6project
);
it
(
'imports a dao definition with a default export'
,
function
()
{
var
Project
=
this
.
sequelize
.
import
(
__dirname
+
'/assets/es6project'
);
expect
(
Project
).
to
.
exist
;
});
after
(
function
(){
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment