diff --git a/@salix/app/src/app.js b/@salix/app/src/app.js index 45d0680d4c..a4cf9ee7cd 100644 --- a/@salix/app/src/app.js +++ b/@salix/app/src/app.js @@ -1,7 +1,3 @@ -<<<<<<< HEAD import {bootstrap} from './bootstrap'; import * as spliting from './spliting' bootstrap(); -======= -import {ng} from '@salix/vendor'; ->>>>>>> 123932ba64bf824cbdc2bd9fe04663b2e539eea3 diff --git a/@salix/core/src/module.js b/@salix/core/src/module.js index 3472e0b4d9..43b13f4444 100644 --- a/@salix/core/src/module.js +++ b/@salix/core/src/module.js @@ -1,17 +1,7 @@ -<<<<<<< HEAD import * as vendors from '@salix/vendor'; import {getModuleName,getVendorDependencies} from './util'; const DEPENDENCIES = getVendorDependencies(vendors) export const NAME = getModuleName('core'); 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 diff --git a/index.html b/index.html index 609da2b6e9..48130766f5 100644 --- a/index.html +++ b/index.html @@ -8,14 +8,6 @@
{{1+1}}
-<<<<<<< HEAD -======= - - - - - ->>>>>>> 123932ba64bf824cbdc2bd9fe04663b2e539eea3 diff --git a/webpack.config.js b/webpack.config.js index 81ce4aa49b..a14c565e95 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,49 +3,15 @@ var webpack = require('webpack'); var path = require('path'); 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: { - 'salix.core': ['@salix/core'], 'salix.app': ['@salix/app'] }, output: { - path: path.join (__dirname, 'build'), + path: path.join(__dirname, 'build'), filename: '[name].js', - publicPath: 'build/' + publicPath: 'build/', + chunkFilename: "[name].js" }, module: { loaders: [ @@ -56,7 +22,7 @@ module.exports = query: { presets: ['es2015'] } - },{ + }, { test: /\.html$/, loader: 'raw' } @@ -67,12 +33,5 @@ module.exports = __dirname, 'node_modules' ] - }, - plugins: [ - new webpack.optimize.CommonsChunkPlugin ({ - name: 'salix.core' - }) - ] + } }; ->>>>>>> 123932ba64bf824cbdc2bd9fe04663b2e539eea3 -