Rename .jsx files to .js
Since we use Babel to transform JSX and Webpack for bundling, ti doesn't make sense anymore to keep a separate .jsx extension for files. Change-Id: If70b512d7a27684d2b9b84b24f19658294cc1505
This commit is contained in:
parent
ae91233ea0
commit
a32537e1fa
|
@ -135,7 +135,6 @@ gulp.task('jison', function() {
|
||||||
|
|
||||||
var jsFiles = [
|
var jsFiles = [
|
||||||
'static/**/*.js',
|
'static/**/*.js',
|
||||||
'static/**/*.jsx',
|
|
||||||
'!static/build/**',
|
'!static/build/**',
|
||||||
'!static/vendor/**',
|
'!static/vendor/**',
|
||||||
'!static/expression/parser.js',
|
'!static/expression/parser.js',
|
||||||
|
|
|
@ -17,14 +17,19 @@ module.exports = {
|
||||||
{test: /\.html$/, loader: 'raw'},
|
{test: /\.html$/, loader: 'raw'},
|
||||||
{test: /\.json$/, loader: 'json'},
|
{test: /\.json$/, loader: 'json'},
|
||||||
{test: /\.jison$/, loader: 'jison'},
|
{test: /\.jison$/, loader: 'jison'},
|
||||||
{test: /\.jsx$/, loader: 'babel', exclude: /(node_modules|bower_components)/},
|
{test: /\.(gif|png)$/, loader: 'file'},
|
||||||
{test: /\.(woff|woff2|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, loader: 'file'},
|
{test: /\.(woff|woff2|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, loader: 'file'},
|
||||||
{test: /\.(gif|png)$/, loader: 'file'}
|
{
|
||||||
|
test: /\.js$/,
|
||||||
|
loader: 'babel',
|
||||||
|
exclude: [/(node_modules|vendor\/custom)\//, /\/expression\/parser\.js$/],
|
||||||
|
query: {cacheDirectory: true}
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
modulesDirectories: ['static', 'node_modules', 'vendor/custom'],
|
modulesDirectories: ['static', 'node_modules', 'vendor/custom'],
|
||||||
extensions: ['', '.js', '.jsx'],
|
extensions: ['', '.js'],
|
||||||
alias: {
|
alias: {
|
||||||
underscore: 'lodash',
|
underscore: 'lodash',
|
||||||
react: 'react/addons',
|
react: 'react/addons',
|
||||||
|
|
Loading…
Reference in New Issue