Comparing version 0.2.2 to 0.2.3
{ | ||
"name": "omi-cli", | ||
"version": "0.2.2", | ||
"version": "0.2.3", | ||
"description": "CLI for scaffolding Omi.js projects.", | ||
@@ -5,0 +5,0 @@ "main": "bin/omi", |
@@ -39,5 +39,5 @@ var del = require('del'), | ||
if(isDist){ | ||
return gulp.src('src/**/*.css') | ||
return gulp.src('src/css/*.css') | ||
.pipe(csso()).pipe(rev()) | ||
.pipe(gulp.dest(ENV)) | ||
.pipe(gulp.dest(ENV+'/css')) | ||
.pipe(rev.manifest()) //- ����һ��rev-manifest.json | ||
@@ -66,3 +66,3 @@ .pipe(gulp.dest('./rev')); | ||
gulp.task('copyComponent', function() { | ||
return gulp.src(['src/component/**','!src/component/**/*.js']).pipe(gulp.dest(ENV+'/component')); | ||
return gulp.src(['src/component/**','!src/component/**/*.js','!src/component/**/*.css','!src/component/**/*.scss','!src/component/**/*.html']).pipe(gulp.dest(ENV+'/component')); | ||
}); | ||
@@ -69,0 +69,0 @@ |
@@ -20,2 +20,3 @@ { | ||
"browser-sync": "^2.18.6", | ||
"cdn-replace-loader": "^0.4.0", | ||
"css-loader": "^0.27.3", | ||
@@ -22,0 +23,0 @@ "del": "^2.2.2", |
@@ -9,2 +9,4 @@ import config from '../../project.js'; | ||
Root.isDev = true; | ||
} | ||
} | ||
export default Root; |
var path = require('path'); | ||
var webpack = require("webpack"); | ||
var commonChunkPlugin = webpack.optimize.CommonsChunkPlugin; | ||
var projectConfig = require('./project.js'); | ||
/** | ||
@@ -40,4 +41,3 @@ * Env | ||
}, | ||
{test: /\.html$/, loader: "string-loader"}, | ||
{test: /\.css$/, loader: "string-loader"}, | ||
{test: /\.html|\.css$/, loader: "string-loader"}, | ||
{ | ||
@@ -51,3 +51,3 @@ test: /\.scss$/, | ||
{ | ||
loader: "css-loader" // translates CSS into CommonJS | ||
loader: "css-loader?-url" // translates CSS into CommonJS | ||
}, { | ||
@@ -71,12 +71,15 @@ loader: "sass-loader" // compiles Sass to CSS | ||
if(ENV === 'dist'){ | ||
if(ENV === 'dist') { | ||
config.plugins.push(new webpack.optimize.UglifyJsPlugin()); | ||
config.entry ={ | ||
config.entry = { | ||
index: './src/js/index.js', | ||
other: './src/js/other.js', | ||
omi : ['omi'], | ||
vendor : ['./src/common/class_list.js'] | ||
omi: ['omi'], | ||
vendor: ['./src/common/class_list.js'] | ||
} | ||
config.plugins[1] = new commonChunkPlugin({name:['omi','vendor'],minChunks:Infinity}); | ||
config.plugins[1] = new commonChunkPlugin({name: ['omi', 'vendor'], minChunks: Infinity}); | ||
config.output.filename = '[name].[chunkhash:8].js'; | ||
config.module.rules[1] = {test: /\.html|\.css$/, loader: "cdn-replace-loader?cdn="+projectConfig.cdn} | ||
config.module.rules[2].use[0] .loader = "cdn-replace-loader?cdn="+projectConfig.cdn | ||
}else{ | ||
@@ -83,0 +86,0 @@ config.entry.vendor = ['omi','./src/common/class_list.js']; |
Sorry, the diff of this file is not supported yet
40365
668