verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge II

This commit is contained in:
PedroHurtado 2016-10-05 08:08:36 +02:00
parent 4a05f021b6
commit d1a86633fc
4 changed files with 5 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
@salix/app/src/app.js
View File

@ -1,7 +1,3 @@
<<<<<<< HEAD
import {bootstrap} from './bootstrap'; import {bootstrap} from './bootstrap';
import * as spliting from './spliting' import * as spliting from './spliting'
bootstrap(); bootstrap();
=======
import {ng} from '@salix/vendor';
>>>>>>> 123932ba64bf824cbdc2bd9fe04663b2e539eea3

10
@salix/core/src/module.js
View File

@ -1,17 +1,7 @@
<<<<<<< HEAD
import * as vendors from '@salix/vendor'; import * as vendors from '@salix/vendor';
import {getModuleName,getVendorDependencies} from './util'; import {getModuleName,getVendorDependencies} from './util';
const DEPENDENCIES = getVendorDependencies(vendors) const DEPENDENCIES = getVendorDependencies(vendors)
export const NAME = getModuleName('core'); export const NAME = getModuleName('core');
export const module = vendors.ng.module(NAME,DEPENDENCIES); export const module = vendors.ng.module(NAME,DEPENDENCIES);
=======
import {ng} from '@salix/vendor';
import {EMPTY_DEPENDECIES} from './constants';
import {getModuleName} from './util';
export const NAME = getModuleName('core');
export const module = ng.module(NAME,EMPTY_DEPENDECIES);
>>>>>>> 123932ba64bf824cbdc2bd9fe04663b2e539eea3

8
index.html
View File

@ -8,14 +8,6 @@
<div id="app"> <div id="app">
{{1+1}} {{1+1}}
</div> </div>
<<<<<<< HEAD
<script type="text/javascript" src="build/salix.app.js" selector="#app"></script> <script type="text/javascript" src="build/salix.app.js" selector="#app"></script>
</body> </body>
</html> </html>
=======
<body>
<script type="text/javascript" src="build/salix.core.js"></script>
<script type="text/javascript" src="build/salix.app.js"></script>
</body>
</html>
>>>>>>> 123932ba64bf824cbdc2bd9fe04663b2e539eea3

51
webpack.config.js
View File

@ -3,49 +3,15 @@ var webpack = require('webpack');
var path = require('path'); var path = require('path');
module.exports = module.exports =
<<<<<<< HEAD
{
entry: {
'salix.app': ['@salix/app']
},
output: {
path: path.join(__dirname, 'build'),
filename: '[name].js',
publicPath: 'build/',
chunkFilename: "[name].js"
},
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
exclude: /node_modules/,
query: {
presets: ['es2015']
}
}, {
test: /\.html$/,
loader: 'raw'
}
]
},
resolve: {
modulesDirectories: [
__dirname,
'node_modules'
]
}
};
=======
{ {
entry: { entry: {
'salix.core': ['@salix/core'],
'salix.app': ['@salix/app'] 'salix.app': ['@salix/app']
}, },
output: { output: {
path: path.join (__dirname, 'build'), path: path.join(__dirname, 'build'),
filename: '[name].js', filename: '[name].js',
publicPath: 'build/' publicPath: 'build/',
chunkFilename: "[name].js"
}, },
module: { module: {
loaders: [ loaders: [
@ -56,7 +22,7 @@ module.exports =
query: { query: {
presets: ['es2015'] presets: ['es2015']
} }
},{ }, {
test: /\.html$/, test: /\.html$/,
loader: 'raw' loader: 'raw'
} }
@ -67,12 +33,5 @@ module.exports =
__dirname, __dirname,
'node_modules' 'node_modules'
] ]
}, }
plugins: [
new webpack.optimize.CommonsChunkPlugin ({
name: 'salix.core'
})
]
}; };
>>>>>>> 123932ba64bf824cbdc2bd9fe04663b2e539eea3