update: vuejs-templates/webpack to 1.3.1

This commit is contained in:
xidedix
2018-03-29 17:16:08 +02:00
parent bc16f142d6
commit 18d7f18af3
192 changed files with 21580 additions and 2056 deletions
+7 -1
View File
@@ -1,5 +1,11 @@
## [vue](./README.md) version `changelog` ## [vue](./README.md) version `changelog`
##### `v1.0.11`
- refactor: project directory structure
- update: vuejs-templates/webpack to `1.3.1`
- update: vue to `2.5.13`
- chore: dependencies update
##### `v1.0.10` ##### `v1.0.10`
- fix: `className` -> `class` - fix: `className` -> `class`
- refactor: `<b-input-group-prepend>` - refactor: `<b-input-group-prepend>`
@@ -33,7 +39,7 @@
- refactor: Modal's ok-button variants - refactor: Modal's ok-button variants
- refactor: forms with validation feedback - refactor: forms with validation feedback
- update: bootstrap-vue to `1.1.0` - update: bootstrap-vue to `1.1.0`
- update: to vue: `2.5.6` - update: vue to `2.5.6`
###### `v1.0.5` ###### `v1.0.5`
- update: bootstrap-vue to `1.0.x` - update: bootstrap-vue to `1.0.x`
+8 -4
View File
@@ -1,14 +1,18 @@
{ {
"presets": [ "presets": [
["env", { "modules": false }], ["env", {
"modules": false,
"targets": {
"browsers": ["> 1%", "last 2 versions", "not ie <= 9"]
}
}],
"stage-2" "stage-2"
], ],
"plugins": ["transform-runtime"], "plugins": ["transform-vue-jsx", "transform-runtime"],
"comments": false,
"env": { "env": {
"test": { "test": {
"presets": ["env", "stage-2"], "presets": ["env", "stage-2"],
"plugins": [ "istanbul" ] "plugins": ["transform-vue-jsx", "istanbul"]
} }
} }
} }
+6 -2
View File
@@ -1,2 +1,6 @@
build/*.js /build/
config/*.js /config/
/dist/
/*.js
/test/unit/coverage/
/test/e2e/specs
+13 -11
View File
@@ -1,27 +1,29 @@
// http://eslint.org/docs/user-guide/configuring // https://eslint.org/docs/user-guide/configuring
module.exports = { module.exports = {
root: true, root: true,
parser: 'babel-eslint',
parserOptions: { parserOptions: {
sourceType: 'module' parser: 'babel-eslint'
}, },
env: { env: {
browser: true, browser: true,
}, },
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style extends: [
extends: 'standard', // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
'plugin:vue/essential',
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
'standard'
],
// required to lint *.vue files // required to lint *.vue files
plugins: [ plugins: [
'html' 'vue'
], ],
// add your custom rules here // add your custom rules here
'rules': { rules: {
// allow paren-less arrow functions
'arrow-parens': 0,
// allow async-await // allow async-await
'generator-star-spacing': 0, 'generator-star-spacing': 'off',
// allow debugger during development // allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
} }
} }
+11 -3
View File
@@ -1,9 +1,17 @@
.DS_Store .DS_Store
node_modules/ node_modules/
dist/ /dist/
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
test/unit/coverage /test/unit/coverage/
test/e2e/reports /test/e2e/reports/
selenium-debug.log selenium-debug.log
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
+3 -1
View File
@@ -2,7 +2,9 @@
module.exports = { module.exports = {
"plugins": { "plugins": {
// to edit target browsers: use "browserlist" field in package.json "postcss-import": {},
"postcss-url": {},
// to edit target browsers: use "browserslist" field in package.json
"autoprefixer": {} "autoprefixer": {}
} }
} }
+7 -1
View File
@@ -1,5 +1,11 @@
## [vue](./README.md) version `changelog` ## [vue](./README.md) version `changelog`
##### `v1.0.11`
- refactor: project directory structure
- update: vuejs-templates/webpack to `1.3.1`
- update: vue to `2.5.13`
- chore: dependencies update
##### `v1.0.10` ##### `v1.0.10`
- fix: `className` -> `class` - fix: `className` -> `class`
- refactor: `<b-input-group-prepend>` - refactor: `<b-input-group-prepend>`
@@ -33,7 +39,7 @@
- refactor: Modal's ok-button variants - refactor: Modal's ok-button variants
- refactor: forms with validation feedback - refactor: forms with validation feedback
- update: bootstrap-vue to `1.1.0` - update: bootstrap-vue to `1.1.0`
- update: to vue: `2.5.6` - update: vue to `2.5.6`
###### `v1.0.5` ###### `v1.0.5`
- update: bootstrap-vue to `1.0.x` - update: bootstrap-vue to `1.0.x`
+3 -3
View File
@@ -1,6 +1,6 @@
# core-ui # CoreUI Vue
> Open Source Admin Template > CoreUI Vue Open Source Bootsrtap 4 Admin Template
## Build Setup ## Build Setup
@@ -27,4 +27,4 @@ npm run e2e
npm test npm test
``` ```
For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+16 -10
View File
@@ -1,31 +1,37 @@
'use strict'
require('./check-versions')() require('./check-versions')()
process.env.NODE_ENV = 'production' process.env.NODE_ENV = 'production'
var ora = require('ora') const ora = require('ora')
var rm = require('rimraf') const rm = require('rimraf')
var path = require('path') const path = require('path')
var chalk = require('chalk') const chalk = require('chalk')
var webpack = require('webpack') const webpack = require('webpack')
var config = require('../config') const config = require('../config')
var webpackConfig = require('./webpack.prod.conf') const webpackConfig = require('./webpack.prod.conf')
var spinner = ora('building for production...') const spinner = ora('building for production...')
spinner.start() spinner.start()
rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
if (err) throw err if (err) throw err
webpack(webpackConfig, function (err, stats) { webpack(webpackConfig, (err, stats) => {
spinner.stop() spinner.stop()
if (err) throw err if (err) throw err
process.stdout.write(stats.toString({ process.stdout.write(stats.toString({
colors: true, colors: true,
modules: false, modules: false,
children: false, children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
chunks: false, chunks: false,
chunkModules: false chunkModules: false
}) + '\n\n') }) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n')) console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow( console.log(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' + ' Tip: built files are meant to be served over an HTTP server.\n' +
+17 -11
View File
@@ -1,17 +1,19 @@
var chalk = require('chalk') 'use strict'
var semver = require('semver') const chalk = require('chalk')
var packageConfig = require('../package.json') const semver = require('semver')
var shell = require('shelljs') const packageConfig = require('../package.json')
const shell = require('shelljs')
function exec (cmd) { function exec (cmd) {
return require('child_process').execSync(cmd).toString().trim() return require('child_process').execSync(cmd).toString().trim()
} }
var versionRequirements = [ const versionRequirements = [
{ {
name: 'node', name: 'node',
currentVersion: semver.clean(process.version), currentVersion: semver.clean(process.version),
versionRequirement: packageConfig.engines.node versionRequirement: packageConfig.engines.node
}, }
] ]
if (shell.which('npm')) { if (shell.which('npm')) {
@@ -23,9 +25,11 @@ if (shell.which('npm')) {
} }
module.exports = function () { module.exports = function () {
var warnings = [] const warnings = []
for (var i = 0; i < versionRequirements.length; i++) {
var mod = versionRequirements[i] for (let i = 0; i < versionRequirements.length; i++) {
const mod = versionRequirements[i]
if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
warnings.push(mod.name + ': ' + warnings.push(mod.name + ': ' +
chalk.red(mod.currentVersion) + ' should be ' + chalk.red(mod.currentVersion) + ' should be ' +
@@ -38,10 +42,12 @@ module.exports = function () {
console.log('') console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:')) console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log() console.log()
for (var i = 0; i < warnings.length; i++) {
var warning = warnings[i] for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning) console.log(' ' + warning)
} }
console.log() console.log()
process.exit(1) process.exit(1)
} }
-9
View File
@@ -1,9 +0,0 @@
/* eslint-disable */
require('eventsource-polyfill')
var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
hotClient.subscribe(function (event) {
if (event.action === 'reload') {
window.location.reload()
}
})
-91
View File
@@ -1,91 +0,0 @@
require('./check-versions')()
var config = require('../config')
if (!process.env.NODE_ENV) {
process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
}
var opn = require('opn')
var path = require('path')
var express = require('express')
var webpack = require('webpack')
var proxyMiddleware = require('http-proxy-middleware')
var webpackConfig = process.env.NODE_ENV === 'testing'
? require('./webpack.prod.conf')
: require('./webpack.dev.conf')
// default port where dev server listens for incoming traffic
var port = process.env.PORT || config.dev.port
// automatically open browser, if not set will be false
var autoOpenBrowser = !!config.dev.autoOpenBrowser
// Define HTTP proxies to your custom API backend
// https://github.com/chimurai/http-proxy-middleware
var proxyTable = config.dev.proxyTable
var app = express()
var compiler = webpack(webpackConfig)
var devMiddleware = require('webpack-dev-middleware')(compiler, {
publicPath: webpackConfig.output.publicPath,
quiet: true
})
var hotMiddleware = require('webpack-hot-middleware')(compiler, {
log: () => {}
})
// force page reload when html-webpack-plugin template changes
compiler.plugin('compilation', function (compilation) {
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
hotMiddleware.publish({ action: 'reload' })
cb()
})
})
// proxy api requests
Object.keys(proxyTable).forEach(function (context) {
var options = proxyTable[context]
if (typeof options === 'string') {
options = { target: options }
}
app.use(proxyMiddleware(options.filter || context, options))
})
// handle fallback for HTML5 history API
app.use(require('connect-history-api-fallback')())
// serve webpack bundle output
app.use(devMiddleware)
// enable hot-reload and state-preserving
// compilation error display
app.use(hotMiddleware)
// serve pure static assets
var staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
app.use(staticPath, express.static('./static'))
var uri = 'http://localhost:' + port
var _resolve
var readyPromise = new Promise(resolve => {
_resolve = resolve
})
console.log('> Starting dev server...')
devMiddleware.waitUntilValid(() => {
console.log('> Listening at ' + uri + '\n')
// when env is testing, don't need open it
if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
opn(uri)
}
_resolve()
})
var server = app.listen(port)
module.exports = {
ready: readyPromise,
close: () => {
server.close()
}
}
+42 -13
View File
@@ -1,29 +1,38 @@
var path = require('path') 'use strict'
var config = require('../config') const path = require('path')
var ExtractTextPlugin = require('extract-text-webpack-plugin') const config = require('../config')
const ExtractTextPlugin = require('extract-text-webpack-plugin')
const packageConfig = require('../package.json')
exports.assetsPath = function (_path) { exports.assetsPath = function (_path) {
var assetsSubDirectory = process.env.NODE_ENV === 'production' const assetsSubDirectory = process.env.NODE_ENV === 'production'
? config.build.assetsSubDirectory ? config.build.assetsSubDirectory
: config.dev.assetsSubDirectory : config.dev.assetsSubDirectory
return path.posix.join(assetsSubDirectory, _path) return path.posix.join(assetsSubDirectory, _path)
} }
exports.cssLoaders = function (options) { exports.cssLoaders = function (options) {
options = options || {} options = options || {}
var cssLoader = { const cssLoader = {
loader: 'css-loader', loader: 'css-loader',
options: { options: {
minimize: process.env.NODE_ENV === 'production', sourceMap: options.sourceMap
sourceMap: options.sourceMap, }
alias: { '../img': '../static/img' } }
const postcssLoader = {
loader: 'postcss-loader',
options: {
sourceMap: options.sourceMap
} }
} }
// generate loader string to be used with extract text plugin // generate loader string to be used with extract text plugin
function generateLoaders (loader, loaderOptions) { function generateLoaders (loader, loaderOptions) {
var loaders = [cssLoader] const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
if (loader) { if (loader) {
loaders.push({ loaders.push({
loader: loader + '-loader', loader: loader + '-loader',
@@ -59,14 +68,34 @@ exports.cssLoaders = function (options) {
// Generate loaders for standalone style files (outside of .vue) // Generate loaders for standalone style files (outside of .vue)
exports.styleLoaders = function (options) { exports.styleLoaders = function (options) {
var output = [] const output = []
var loaders = exports.cssLoaders(options) const loaders = exports.cssLoaders(options)
for (var extension in loaders) {
var loader = loaders[extension] for (const extension in loaders) {
const loader = loaders[extension]
output.push({ output.push({
test: new RegExp('\\.' + extension + '$'), test: new RegExp('\\.' + extension + '$'),
use: loader use: loader
}) })
} }
return output return output
} }
exports.createNotifierCallback = () => {
const notifier = require('node-notifier')
return (severity, errors) => {
if (severity !== 'error') return
const error = errors[0]
const filename = error.file && error.file.split('!').pop()
notifier.notify({
title: packageConfig.name,
message: severity + ': ' + error.name,
subtitle: filename || '',
icon: path.join(__dirname, 'logo.png')
})
}
}
+17 -7
View File
@@ -1,12 +1,22 @@
var utils = require('./utils') 'use strict'
var config = require('../config') const utils = require('./utils')
var isProduction = process.env.NODE_ENV === 'production' const config = require('../config')
const isProduction = process.env.NODE_ENV === 'production'
const sourceMapEnabled = isProduction
? config.build.productionSourceMap
: config.dev.cssSourceMap
module.exports = { module.exports = {
loaders: utils.cssLoaders({ loaders: utils.cssLoaders({
sourceMap: isProduction sourceMap: sourceMapEnabled,
? config.build.productionSourceMap
: config.dev.cssSourceMap,
extract: isProduction extract: isProduction
}) }),
cssSourceMap: sourceMapEnabled,
cacheBusting: config.dev.cacheBusting,
transformToRequire: {
video: ['src', 'poster'],
source: 'src',
img: 'src',
image: 'xlink:href'
}
} }
+46 -30
View File
@@ -1,13 +1,26 @@
var path = require('path') 'use strict'
var utils = require('./utils') const path = require('path')
var config = require('../config') const utils = require('./utils')
var vueLoaderConfig = require('./vue-loader.conf') const config = require('../config')
const vueLoaderConfig = require('./vue-loader.conf')
function resolve (dir) { function resolve (dir) {
return path.join(__dirname, '..', dir) return path.join(__dirname, '..', dir)
} }
const createLintingRule = () => ({
test: /\.(js|vue)$/,
loader: 'eslint-loader',
enforce: 'pre',
include: [resolve('src'), resolve('test')],
options: {
formatter: require('eslint-friendly-formatter'),
emitWarning: !config.dev.showEslintErrorsInOverlay
}
})
module.exports = { module.exports = {
context: path.resolve(__dirname, '../'),
entry: { entry: {
app: './src/main.js' app: './src/main.js'
}, },
@@ -22,20 +35,12 @@ module.exports = {
extensions: ['.js', '.vue', '.json'], extensions: ['.js', '.vue', '.json'],
alias: { alias: {
'vue$': 'vue/dist/vue.esm.js', 'vue$': 'vue/dist/vue.esm.js',
'@': resolve('src') '@': resolve('src'),
} }
}, },
module: { module: {
rules: [ rules: [
{ ...(config.dev.useEslint ? [createLintingRule()] : []),
test: /\.(js|vue)$/,
loader: 'eslint-loader',
enforce: 'pre',
include: [resolve('src'), resolve('test')],
options: {
formatter: require('eslint-friendly-formatter')
}
},
{ {
test: /\.vue$/, test: /\.vue$/,
loader: 'vue-loader', loader: 'vue-loader',
@@ -44,33 +49,44 @@ module.exports = {
{ {
test: /\.js$/, test: /\.js$/,
loader: 'babel-loader', loader: 'babel-loader',
include: [resolve('src'), resolve('test')] include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
}, },
{ {
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
exclude: [/fonts/], loader: 'url-loader',
use: {
loader: 'file-loader',
options: { options: {
name: '[name].[hash:7].[ext]', limit: 10000,
publicPath: '../../', name: utils.assetsPath('img/[name].[hash:7].[ext]')
outputPath: utils.assetsPath('img/'),
emitFile: true
}
} }
}, },
{ {
test: /\.(woff2?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
exclude: [/flags/], loader: 'url-loader',
use: {
loader: 'file-loader',
options: { options: {
name: '[name].[hash:7].[ext]', limit: 10000,
publicPath: '../../', name: utils.assetsPath('media/[name].[hash:7].[ext]')
outputPath: utils.assetsPath('fonts/')
} }
},
{
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
loader: 'url-loader',
options: {
limit: 10000,
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
} }
} }
] ]
},
node: {
// prevent webpack from injecting useless setImmediate polyfill because Vue
// source contains it (although only uses it if it's native).
setImmediate: false,
// prevent webpack from injecting mocks to Node native modules
// that does not make sense for the client
dgram: 'empty',
fs: 'empty',
net: 'empty',
tls: 'empty',
child_process: 'empty'
} }
} }
+70 -20
View File
@@ -1,30 +1,55 @@
var path = require('path') 'use strict'
var utils = require('./utils') const utils = require('./utils')
var webpack = require('webpack') const webpack = require('webpack')
var config = require('../config') const config = require('../config')
var merge = require('webpack-merge') const merge = require('webpack-merge')
var baseWebpackConfig = require('./webpack.base.conf') const path = require('path')
var CopyWebpackPlugin = require('copy-webpack-plugin') const baseWebpackConfig = require('./webpack.base.conf')
var HtmlWebpackPlugin = require('html-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin')
const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
const portfinder = require('portfinder')
// add hot-reload related code to entry chunks const HOST = process.env.HOST
Object.keys(baseWebpackConfig.entry).forEach(function (name) { const PORT = process.env.PORT && Number(process.env.PORT)
baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name])
})
module.exports = merge(baseWebpackConfig, { const devWebpackConfig = merge(baseWebpackConfig, {
module: { module: {
rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap }) rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
}, },
// cheap-module-eval-source-map is faster for development // cheap-module-eval-source-map is faster for development
devtool: '#cheap-module-eval-source-map', devtool: config.dev.devtool,
// these devServer options should be customized in /config/index.js
devServer: {
clientLogLevel: 'warning',
historyApiFallback: {
rewrites: [
{ from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
],
},
hot: true,
contentBase: false, // since we use CopyWebpackPlugin.
compress: true,
host: HOST || config.dev.host,
port: PORT || config.dev.port,
open: config.dev.autoOpenBrowser,
overlay: config.dev.errorOverlay
? { warnings: false, errors: true }
: false,
publicPath: config.dev.assetsPublicPath,
proxy: config.dev.proxyTable,
quiet: true, // necessary for FriendlyErrorsPlugin
watchOptions: {
poll: config.dev.poll,
}
},
plugins: [ plugins: [
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': config.dev.env 'process.env': require('../config/dev.env')
}), }),
// https://github.com/glenjamin/webpack-hot-middleware#installation--usage
new webpack.HotModuleReplacementPlugin(), new webpack.HotModuleReplacementPlugin(),
new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
new webpack.NoEmitOnErrorsPlugin(), new webpack.NoEmitOnErrorsPlugin(),
// https://github.com/ampedandwired/html-webpack-plugin // https://github.com/ampedandwired/html-webpack-plugin
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
@@ -32,14 +57,39 @@ module.exports = merge(baseWebpackConfig, {
template: 'index.html', template: 'index.html',
inject: true inject: true
}), }),
new FriendlyErrorsPlugin(),
// copy custom static assets // copy custom static assets
new CopyWebpackPlugin([ new CopyWebpackPlugin([
{ {
from: path.resolve(__dirname, '../static'), from: path.resolve(__dirname, '../static'),
to: config.build.assetsSubDirectory, to: config.dev.assetsSubDirectory,
ignore: ['.*'] ignore: ['.*']
} }
]) ])
] ]
}) })
module.exports = new Promise((resolve, reject) => {
portfinder.basePort = process.env.PORT || config.dev.port
portfinder.getPort((err, port) => {
if (err) {
reject(err)
} else {
// publish the new Port, necessary for e2e tests
process.env.PORT = port
// add port to devServer config
devWebpackConfig.devServer.port = port
// Add FriendlyErrorsPlugin
devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
compilationSuccessInfo: {
messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
},
onErrors: config.dev.notifyOnErrors
? utils.createNotifierCallback()
: undefined
}))
resolve(devWebpackConfig)
}
})
})
+50 -25
View File
@@ -1,26 +1,29 @@
var path = require('path') 'use strict'
var utils = require('./utils') const path = require('path')
var webpack = require('webpack') const utils = require('./utils')
var config = require('../config') const webpack = require('webpack')
var merge = require('webpack-merge') const config = require('../config')
var baseWebpackConfig = require('./webpack.base.conf') const merge = require('webpack-merge')
var CopyWebpackPlugin = require('copy-webpack-plugin') const baseWebpackConfig = require('./webpack.base.conf')
var HtmlWebpackPlugin = require('html-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
var ExtractTextPlugin = require('extract-text-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin')
var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') const ExtractTextPlugin = require('extract-text-webpack-plugin')
const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
var env = process.env.NODE_ENV === 'testing' const env = process.env.NODE_ENV === 'testing'
? require('../config/test.env') ? require('../config/test.env')
: config.build.env : require('../config/prod.env')
var webpackConfig = merge(baseWebpackConfig, { const webpackConfig = merge(baseWebpackConfig, {
module: { module: {
rules: utils.styleLoaders({ rules: utils.styleLoaders({
sourceMap: config.build.productionSourceMap, sourceMap: config.build.productionSourceMap,
extract: true extract: true,
usePostCSS: true
}) })
}, },
devtool: config.build.productionSourceMap ? '#source-map' : false, devtool: config.build.productionSourceMap ? config.build.devtool : false,
output: { output: {
path: config.build.assetsRoot, path: config.build.assetsRoot,
filename: utils.assetsPath('js/[name].[chunkhash].js'), filename: utils.assetsPath('js/[name].[chunkhash].js'),
@@ -31,22 +34,30 @@ var webpackConfig = merge(baseWebpackConfig, {
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': env 'process.env': env
}), }),
new webpack.optimize.UglifyJsPlugin({ new UglifyJsPlugin({
uglifyOptions: {
compress: { compress: {
warnings: false warnings: false
}
}, },
sourceMap: true sourceMap: config.build.productionSourceMap,
parallel: true
}), }),
// extract css into its own file // extract css into its own file
new ExtractTextPlugin({ new ExtractTextPlugin({
filename: utils.assetsPath('css/[name].[contenthash].css') filename: utils.assetsPath('css/[name].[contenthash].css'),
// Setting the following option to `false` will not extract CSS from codesplit chunks.
// Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
// It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
// increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
allChunks: true,
}), }),
// Compress extracted CSS. We are using this plugin so that possible // Compress extracted CSS. We are using this plugin so that possible
// duplicated CSS from different components can be deduped. // duplicated CSS from different components can be deduped.
new OptimizeCSSPlugin({ new OptimizeCSSPlugin({
cssProcessorOptions: { cssProcessorOptions: config.build.productionSourceMap
safe: true ? { safe: true, map: { inline: false } }
} : { safe: true }
}), }),
// generate dist index.html with correct asset hash for caching. // generate dist index.html with correct asset hash for caching.
// you can customize output by editing /index.html // you can customize output by editing /index.html
@@ -67,10 +78,14 @@ var webpackConfig = merge(baseWebpackConfig, {
// necessary to consistently work with multiple chunks via CommonsChunkPlugin // necessary to consistently work with multiple chunks via CommonsChunkPlugin
chunksSortMode: 'dependency' chunksSortMode: 'dependency'
}), }),
// keep module.id stable when vendor modules does not change
new webpack.HashedModuleIdsPlugin(),
// enable scope hoisting
new webpack.optimize.ModuleConcatenationPlugin(),
// split vendor js into its own file // split vendor js into its own file
new webpack.optimize.CommonsChunkPlugin({ new webpack.optimize.CommonsChunkPlugin({
name: 'vendor', name: 'vendor',
minChunks: function (module, count) { minChunks (module) {
// any required modules inside node_modules are extracted to vendor // any required modules inside node_modules are extracted to vendor
return ( return (
module.resource && module.resource &&
@@ -85,8 +100,18 @@ var webpackConfig = merge(baseWebpackConfig, {
// prevent vendor hash from being updated whenever app bundle is updated // prevent vendor hash from being updated whenever app bundle is updated
new webpack.optimize.CommonsChunkPlugin({ new webpack.optimize.CommonsChunkPlugin({
name: 'manifest', name: 'manifest',
chunks: ['vendor'] minChunks: Infinity
}), }),
// This instance extracts shared chunks from code splitted chunks and bundles them
// in a separate chunk, similar to the vendor chunk
// see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
new webpack.optimize.CommonsChunkPlugin({
name: 'app',
async: 'vendor-async',
children: true,
minChunks: 3
}),
// copy custom static assets // copy custom static assets
new CopyWebpackPlugin([ new CopyWebpackPlugin([
{ {
@@ -99,7 +124,7 @@ var webpackConfig = merge(baseWebpackConfig, {
}) })
if (config.build.productionGzip) { if (config.build.productionGzip) {
var CompressionWebpackPlugin = require('compression-webpack-plugin') const CompressionWebpackPlugin = require('compression-webpack-plugin')
webpackConfig.plugins.push( webpackConfig.plugins.push(
new CompressionWebpackPlugin({ new CompressionWebpackPlugin({
@@ -117,7 +142,7 @@ if (config.build.productionGzip) {
} }
if (config.build.bundleAnalyzerReport) { if (config.build.bundleAnalyzerReport) {
var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
webpackConfig.plugins.push(new BundleAnalyzerPlugin()) webpackConfig.plugins.push(new BundleAnalyzerPlugin())
} }
+6 -5
View File
@@ -1,11 +1,12 @@
'use strict'
// This is the webpack config used for unit tests. // This is the webpack config used for unit tests.
var utils = require('./utils') const utils = require('./utils')
var webpack = require('webpack') const webpack = require('webpack')
var merge = require('webpack-merge') const merge = require('webpack-merge')
var baseConfig = require('./webpack.base.conf') const baseWebpackConfig = require('./webpack.base.conf')
var webpackConfig = merge(baseConfig, { const webpackConfig = merge(baseWebpackConfig, {
// use inline sourcemap for karma-sourcemap-loader // use inline sourcemap for karma-sourcemap-loader
module: { module: {
rules: utils.styleLoaders() rules: utils.styleLoaders()
+3 -2
View File
@@ -1,5 +1,6 @@
var merge = require('webpack-merge') 'use strict'
var prodEnv = require('./prod.env') const merge = require('webpack-merge')
const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"' NODE_ENV: '"development"'
+55 -17
View File
@@ -1,38 +1,76 @@
'use strict'
// Template version: 1.3.1
// see http://vuejs-templates.github.io/webpack for documentation. // see http://vuejs-templates.github.io/webpack for documentation.
var path = require('path')
const path = require('path')
module.exports = { module.exports = {
dev: {
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {},
// Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST
port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
notifyOnErrors: true,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
useEslint: true,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
/**
* Source Maps
*/
// https://webpack.js.org/configuration/devtool/#development
devtool: 'cheap-module-eval-source-map',
// If you have problems debugging vue-files in devtools,
// set this to false - it *may* help
// https://vue-loader.vuejs.org/en/options.html#cachebusting
cacheBusting: true,
cssSourceMap: true
},
build: { build: {
env: require('./prod.env'), // Template for index.html
index: path.resolve(__dirname, '../dist/index.html'), index: path.resolve(__dirname, '../dist/index.html'),
// Paths
assetsRoot: path.resolve(__dirname, '../dist'), assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: './', assetsPublicPath: '/',
/**
* Source Maps
*/
productionSourceMap: true, productionSourceMap: true,
// https://webpack.js.org/configuration/devtool/#production
devtool: '#source-map',
// Gzip off by default as many popular static hosts such as // Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you. // Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to: // Before setting to `true`, make sure to:
// npm install --save-dev compression-webpack-plugin // npm install --save-dev compression-webpack-plugin
productionGzip: false, productionGzip: false,
productionGzipExtensions: ['js', 'css'], productionGzipExtensions: ['js', 'css'],
// Run the build command with an extra argument to // Run the build command with an extra argument to
// View the bundle analyzer report after build finishes: // View the bundle analyzer report after build finishes:
// `npm run build --report` // `npm run build --report`
// Set to `true` or `false` to always turn it on or off // Set to `true` or `false` to always turn it on or off
bundleAnalyzerReport: process.env.npm_config_report bundleAnalyzerReport: process.env.npm_config_report
},
dev: {
env: require('./dev.env'),
port: 8080,
autoOpenBrowser: true,
assetsSubDirectory: 'static',
assetsPublicPath: '',
proxyTable: {},
// CSS Sourcemaps off by default because relative paths are "buggy"
// with this option, according to the CSS-Loader README
// (https://github.com/webpack/css-loader#sourcemaps)
// In our experience, they generally work as expected,
// just be aware of this issue when enabling this option.
cssSourceMap: false
} }
} }
+1
View File
@@ -1,3 +1,4 @@
'use strict'
module.exports = { module.exports = {
NODE_ENV: '"production"' NODE_ENV: '"production"'
} }
+3 -2
View File
@@ -1,5 +1,6 @@
var merge = require('webpack-merge') 'use strict'
var devEnv = require('./dev.env') const merge = require('webpack-merge')
const devEnv = require('./dev.env')
module.exports = merge(devEnv, { module.exports = merge(devEnv, {
NODE_ENV: '"testing"' NODE_ENV: '"testing"'
+1
View File
@@ -5,6 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>CoreUI - Open Source Bootstrap Admin Template</title> <title>CoreUI - Open Source Bootstrap Admin Template</title>
<link rel="shortcut icon" href="/static/img/favicon.png">
</head> </head>
<!-- BODY options, add following classes to body to change options <!-- BODY options, add following classes to body to change options
+3344 -596
View File
File diff suppressed because it is too large Load Diff
+82 -72
View File
@@ -1,103 +1,113 @@
{ {
"name": "@coreui/vue", "name": "@coreui/vue",
"version": "1.0.10", "version": "1.0.11",
"description": "Open Source Bootstrap Admin Template", "description": "CoreUI Vue Open Source Bootstrap 4 Admin Template",
"author": "Łukasz Holeczek", "author": "Łukasz Holeczek",
"homepage": "http://coreui.io", "homepage": "http://coreui.io",
"copyright": "Copyright 2018 creativeLabs Łukasz Holeczek", "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
"license": "MIT", "license": "MIT",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "node build/dev-server.js", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"start": "node build/dev-server.js", "start": "npm run dev",
"build": "node build/build.js",
"unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run", "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
"e2e": "node test/e2e/runner.js", "e2e": "node test/e2e/runner.js",
"test": "npm run unit && npm run e2e", "test": "npm run unit && npm run e2e",
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs" "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs",
"build": "node build/build.js"
}, },
"dependencies": { "dependencies": {
"bootstrap": "4.0.0", "bootstrap": "4.0.0",
"bootstrap-vue": "2.0.0-rc.1", "bootstrap-vue": "2.0.0-rc.1",
"chart.js": "2.7.1", "chart.js": "^2.7.2",
"flag-icon-css": "2.9.0", "flag-icon-css": "^3.0.0",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"simple-line-icons": "^2.4.1", "simple-line-icons": "^2.4.1",
"vue": "2.5.13", "vue": "2.5.13",
"vue-chartjs": "3.1.0", "vue-chartjs": "^3.3.1",
"vue-router": "3.0.1" "vue-router": "^3.0.1"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "7.2.5", "autoprefixer": "7.2.5",
"babel-core": "6.26.0", "babel-core": "6.26.0",
"babel-eslint": "8.2.1", "babel-eslint": "8.2.2",
"babel-loader": "7.1.2", "babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-plugin-transform-runtime": "6.23.0", "babel-loader": "^7.1.4",
"babel-preset-env": "1.6.1", "babel-plugin-istanbul": "^4.1.5",
"babel-preset-stage-2": "6.24.1", "babel-plugin-syntax-jsx": "^6.18.0",
"babel-register": "6.26.0", "babel-plugin-transform-runtime": "^6.23.0",
"chalk": "2.3.0", "babel-plugin-transform-vue-jsx": "^3.5.0",
"babel-preset-env": "^1.6.1",
"babel-preset-stage-2": "^6.24.1",
"babel-register": "^6.26.0",
"chai": "^4.1.2",
"chalk": "^2.3.2",
"chromedriver": "^2.27.2",
"copy-webpack-plugin": "^4.5.1",
"cross-env": "^5.0.1",
"cross-spawn": "^5.0.1",
"connect-history-api-fallback": "1.5.0", "connect-history-api-fallback": "1.5.0",
"copy-webpack-plugin": "4.3.1", "css-loader": "^0.28.11",
"css-loader": "0.28.9", "eslint": "^4.19.1",
"eslint": "4.16.0", "eslint-config-standard": "^11.0.0",
"eslint-friendly-formatter": "3.0.0", "eslint-friendly-formatter": "^4.0.0",
"eslint-loader": "1.9.0", "eslint-loader": "^2.0.0",
"eslint-plugin-html": "4.0.2", "eslint-plugin-import": "^2.9.0",
"eslint-plugin-import": "2.8.0", "eslint-plugin-html": "^4.0.2",
"eslint-plugin-node": "5.2.1", "eslint-plugin-node": "^6.0.1",
"eslint-config-standard": "11.0.0-beta.0", "eslint-plugin-promise": "^3.7.0",
"eslint-plugin-promise": "3.6.0", "eslint-plugin-standard": "^3.0.1",
"eslint-plugin-standard": "3.0.1", "eslint-plugin-vue": "^4.4.0",
"eventsource-polyfill": "0.9.6", "extract-text-webpack-plugin": "^3.0.2",
"express": "4.16.2", "file-loader": "^1.1.11",
"extract-text-webpack-plugin": "3.0.2", "friendly-errors-webpack-plugin": "^1.6.1",
"file-loader": "1.1.6", "html-webpack-plugin": "^2.30.1",
"friendly-errors-webpack-plugin": "1.6.1", "inject-loader": "^3.0.1",
"html-webpack-plugin": "2.30.1", "karma": "^2.0.0",
"http-proxy-middleware": "0.17.4", "karma-coverage": "^1.1.1",
"cross-env": "5.1.3", "karma-mocha": "^1.3.0",
"karma": "2.0.0", "karma-phantomjs-launcher": "^1.0.4",
"karma-coverage": "1.1.1", "karma-phantomjs-shim": "^1.5.0",
"karma-mocha": "1.3.0", "karma-sinon-chai": "^1.3.3",
"karma-phantomjs-launcher": "1.0.4", "karma-sourcemap-loader": "^0.3.7",
"karma-phantomjs-shim": "1.5.0", "karma-spec-reporter": "^0.0.32",
"karma-sinon-chai": "1.3.3", "karma-webpack": "^2.0.9",
"karma-sourcemap-loader": "0.3.7",
"karma-spec-reporter": "0.0.32",
"karma-webpack": "2.0.9",
"lolex": "2.3.2", "lolex": "2.3.2",
"mocha": "5.0.0", "mocha": "^5.0.5",
"chai": "4.1.2", "nightwatch": "^0.9.20",
"sinon": "4.2.2", "node-notifier": "^5.2.1",
"sinon-chai": "2.14.0", "optimize-css-assets-webpack-plugin": "^3.2.0",
"inject-loader": "3.0.1", "ora": "^1.2.0",
"babel-plugin-istanbul": "4.1.5",
"phantomjs-prebuilt": "^2.1.16", "phantomjs-prebuilt": "^2.1.16",
"chromedriver": "2.35.0", "portfinder": "^1.0.13",
"cross-spawn": "6.0.4", "postcss-import": "^11.1.0",
"nightwatch": "0.9.19", "postcss-loader": "^2.1.3",
"node-sass": "4.7.2", "postcss-url": "^7.3.1",
"sass-loader": "6.0.6", "rimraf": "^2.6.2",
"selenium-server": "3.8.1", "selenium-server": "^3.11.0",
"semver": "5.5.0", "semver": "^5.5.0",
"shelljs": "0.8.1", "shelljs": "^0.8.1",
"opn": "5.2.0", "sinon": "^4.4.9",
"optimize-css-assets-webpack-plugin": "3.2.0", "sinon-chai": "^3.0.0",
"ora": "1.4.0", "uglifyjs-webpack-plugin": "^1.2.4",
"rimraf": "2.6.2", "url-loader": "^1.0.1",
"url-loader": "0.6.2", "vue-loader": "^14.2.2",
"vue-loader": "14.1.1", "vue-style-loader": "^4.1.0",
"vue-style-loader": "3.1.2",
"vue-template-compiler": "2.5.13", "vue-template-compiler": "2.5.13",
"webpack": "3.10.0", "webpack": "^3.11.0",
"webpack-bundle-analyzer": "2.10.0", "webpack-bundle-analyzer": "^2.11.1",
"webpack-dev-middleware": "2.0.4", "webpack-dev-server": "^2.11.2",
"webpack-hot-middleware": "2.21.0", "webpack-merge": "^4.1.2",
"webpack-merge": "4.1.1" "node-sass": "^4.8.3",
"sass-loader": "^6.0.7"
}, },
"engines": { "engines": {
"node": ">= 8.9.4", "node": ">= 8.9.4",
"npm": ">= 5.6.0" "npm": ">= 5.6.0"
} },
"browserslist": [
"> 1%",
"last 2 versions",
"not ie <= 9"
]
} }
+9 -7
View File
@@ -8,19 +8,21 @@ export default {
} }
</script> </script>
<style> <style lang="scss">
/* Import Font Awesome Icons Set */
@import '~flag-icon-css/css/flag-icon.min.css';
/* Import Font Awesome Icons Set */ /* Import Font Awesome Icons Set */
$fa-font-path: '~font-awesome/fonts/'; $fa-font-path: '~font-awesome/fonts/';
@import '~font-awesome/css/font-awesome.min.css'; @import '~font-awesome/scss/font-awesome.scss';
/* Import Simple Line Icons Set */ /* Import Simple Line Icons Set */
$simple-line-font-path: '~simple-line-icons/fonts/'; $simple-line-font-path: '~simple-line-icons/fonts/';
@import '~simple-line-icons/css/simple-line-icons.css'; @import '~simple-line-icons/scss/simple-line-icons.scss';
</style>
<style>
/* Import Flag Icons Set */
@import 'flag-icon-css/css/flag-icon.min.css';
/* Import Bootstrap Vue Styles */ /* Import Bootstrap Vue Styles */
@import '~bootstrap-vue/dist/bootstrap-vue.css'; @import 'bootstrap-vue/dist/bootstrap-vue.css';
</style> </style>
<style lang="scss"> <style lang="scss">
// Import Main styles for this application // Import Main styles for this application
@import './scss/style'; @import './assets/scss/style';
</style> </style>
Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

@@ -48,7 +48,7 @@ $navbar-border: (
) !default; ) !default;
$navbar-brand-width: 155px !default; $navbar-brand-width: 155px !default;
$navbar-brand-bg: #fff !default; $navbar-brand-bg: #fff !default;
$navbar-brand-logo: url('../img/logo.png') !default; $navbar-brand-logo: url('/static/img/logo.png') !default;
$navbar-brand-logo-size: 70px auto !default; $navbar-brand-logo-size: 70px auto !default;
$navbar-brand-border: ( $navbar-brand-border: (
bottom: ( bottom: (
@@ -60,7 +60,7 @@ $navbar-brand-border: (
$navbar-brand-minimized-width: 50px !default; $navbar-brand-minimized-width: 50px !default;
$navbar-brand-minimized-bg: $navbar-brand-bg !default; $navbar-brand-minimized-bg: $navbar-brand-bg !default;
$navbar-brand-minimized-logo: url('../img/logo-symbol.png') !default; $navbar-brand-minimized-logo: url('/static/img/logo-symbol.png') !default;
$navbar-brand-minimized-logo-size: 24px !default; $navbar-brand-minimized-logo-size: 24px !default;
$navbar-brand-minimized-border: $navbar-brand-border !default; $navbar-brand-minimized-border: $navbar-brand-border !default;
@@ -1,6 +1,6 @@
/*! /*!
* CoreUI - Open Source Bootstrap Admin Template * CoreUI - Open Source Bootstrap Admin Template
* @version v1.0.10 * @version v1.0.11
* @link http://coreui.io * @link http://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek * Copyright (c) 2018 creativeLabs Łukasz Holeczek
* @license MIT * @license MIT
@@ -10,7 +10,7 @@
@import "bootstrap-variables"; @import "bootstrap-variables";
// Import Bootstrap source files // Import Bootstrap source files
@import "node_modules/bootstrap/scss/bootstrap"; @import "~bootstrap/scss/bootstrap";
// Override core variables // Override core variables
@import "core-variables"; @import "core-variables";
@@ -1,6 +1,6 @@
<template> <template>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item" v-for="(item, index) in list"> <li class="breadcrumb-item" :key="index" v-for="(item, index) in list">
<span class="active" v-if="isLast(index)">{{ showName(item) }}</span> <span class="active" v-if="isLast(index)">{{ showName(item) }}</span>
<router-link :to="item" v-else>{{ showName(item) }}</router-link> <router-link :to="item" v-else>{{ showName(item) }}</router-link>
</li> </li>
@@ -26,4 +26,3 @@
} }
} }
</script> </script>
@@ -7,29 +7,29 @@
<ul class="nav"> <ul class="nav">
<template v-for="(item, index) in navItems"> <template v-for="(item, index) in navItems">
<template v-if="item.title"> <template v-if="item.title">
<SidebarNavTitle :name="item.name" :classes="item.class" :wrapper="item.wrapper"/> <SidebarNavTitle :key="index" :name="item.name" :classes="item.class" :wrapper="item.wrapper"/>
</template> </template>
<template v-else-if="item.divider"> <template v-else-if="item.divider">
<SidebarNavDivider :classes="item.class"/> <SidebarNavDivider :key="index" :classes="item.class"/>
</template> </template>
<template v-else-if="item.label"> <template v-else-if="item.label">
<SidebarNavLabel :name="item.name" :url="item.url" :icon="item.icon" :label="item.label" :classes="item.class"/> <SidebarNavLabel :key="index" :name="item.name" :url="item.url" :icon="item.icon" :label="item.label" :classes="item.class"/>
</template> </template>
<template v-else> <template v-else>
<template v-if="item.children"> <template v-if="item.children">
<!-- First level dropdown --> <!-- First level dropdown -->
<SidebarNavDropdown :name="item.name" :url="item.url" :icon="item.icon"> <SidebarNavDropdown :key="index" :name="item.name" :url="item.url" :icon="item.icon">
<template v-for="(childL1, index) in item.children"> <template v-for="(childL1, index1) in item.children">
<template v-if="childL1.children"> <template v-if="childL1.children">
<!-- Second level dropdown --> <!-- Second level dropdown -->
<SidebarNavDropdown :name="childL1.name" :url="childL1.url" :icon="childL1.icon"> <SidebarNavDropdown :key="index1" :name="childL1.name" :url="childL1.url" :icon="childL1.icon">
<li class="nav-item" v-for="(childL2, index) in childL1.children"> <li class="nav-item" :key="index2" v-for="(childL2, index2) in childL1.children">
<SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="item.variant"/> <SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="item.variant"/>
</li> </li>
</SidebarNavDropdown> </SidebarNavDropdown>
</template> </template>
<template v-else> <template v-else>
<SidebarNavItem :classes="item.class"> <SidebarNavItem :key="index1" :classes="item.class">
<SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="item.variant"/> <SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="item.variant"/>
</SidebarNavItem> </SidebarNavItem>
</template> </template>
@@ -37,7 +37,7 @@
</SidebarNavDropdown> </SidebarNavDropdown>
</template> </template>
<template v-else> <template v-else>
<SidebarNavItem :classes="item.class"> <SidebarNavItem :key="index" :classes="item.class">
<SidebarNavLink :name="item.name" :url="item.url" :icon="item.icon" :badge="item.badge" :variant="item.variant"/> <SidebarNavLink :name="item.name" :url="item.url" :icon="item.icon" :badge="item.badge" :variant="item.variant"/>
</SidebarNavItem> </SidebarNavItem>
</template> </template>
@@ -1,4 +1,5 @@
<template> <template>
<div></div>
<!-- <div class="sidebar-footer"></div> --> <!-- <div class="sidebar-footer"></div> -->
</template> </template>
<script> <script>
@@ -1,4 +1,5 @@
<template> <template>
<div></div>
<!-- <div class="sidebar-form"></div> --> <!-- <div class="sidebar-form"></div> -->
</template> </template>
<script> <script>
@@ -1,4 +1,5 @@
<template> <template>
<div></div>
<!-- <div class="sidebar-header"></div> --> <!-- <div class="sidebar-header"></div> -->
</template> </template>
<script> <script>
@@ -39,4 +39,3 @@
} }
} }
</script> </script>
@@ -91,4 +91,3 @@
} }
} }
</script> </script>
@@ -3,9 +3,7 @@
<div class="animated fadeIn"> <div class="animated fadeIn">
<b-row> <b-row>
<b-col cols="12" md="6"> <b-col cols="12" md="6">
<b-card <b-card header-tag="header" footer-tag="footer">
header-tag="header"
footer-tag="footer">
<div slot="header"> <div slot="header">
<i class="fa fa-align-justify"></i> <strong>Bootstrap Collapse</strong> <i class="fa fa-align-justify"></i> <strong>Bootstrap Collapse</strong>
<div class="card-actions"> <div class="card-actions">
@@ -117,6 +117,12 @@
:horizontal="true"> :horizontal="true">
<b-form-input id="basicText" type="text" placeholder="Text"></b-form-input> <b-form-input id="basicText" type="text" placeholder="Text"></b-form-input>
</b-form-group> </b-form-group>
<b-form-group
label="Date" label-for="date"
:label-cols="3"
:horizontal="true">
<b-form-input type="date" id="date"></b-form-input>
</b-form-group>
<b-form-group <b-form-group
description="Please enter your email" description="Please enter your email"
label="Email Input" label="Email Input"
@@ -207,4 +207,3 @@
} }
} }
</script> </script>
@@ -78,7 +78,7 @@
<i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>variants</small> <i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>variants</small>
</div> </div>
<div> <div>
<div v-for="bar in bars" class="row mb-1"> <div :key="index" v-for="(bar, index) in bars" class="row mb-1">
<div class="col-sm-2">{{ bar.variant }}:</div> <div class="col-sm-2">{{ bar.variant }}:</div>
<div class="col-sm-10 pt-1"> <div class="col-sm-10 pt-1">
<b-progress :value="bar.value" <b-progress :value="bar.value"
@@ -133,12 +133,12 @@
<b-progress-bar variant="success" :value="values[1]"></b-progress-bar> <b-progress-bar variant="success" :value="values[1]"></b-progress-bar>
<b-progress-bar variant="info" :value="values[2]"></b-progress-bar> <b-progress-bar variant="info" :value="values[2]"></b-progress-bar>
</b-progress> </b-progress>
<b-progress show-progress :max="max3" class="mb-3"></b-progress-bar> <b-progress show-progress :max="max3" class="mb-3">
<b-progress-bar variant="primary" :value="values[0]"></b-progress-bar> <b-progress-bar variant="primary" :value="values[0]"></b-progress-bar>
<b-progress-bar variant="success" :value="values[1]"></b-progress-bar> <b-progress-bar variant="success" :value="values[1]"></b-progress-bar>
<b-progress-bar variant="info" :value="values[2]"></b-progress-bar> <b-progress-bar variant="info" :value="values[2]"></b-progress-bar>
</b-progress> </b-progress>
<b-progress show-value striped :max="max3" class="mb-3"></b-progress-bar> <b-progress show-value striped :max="max3" class="mb-3">
<b-progress-bar variant="primary" :value="values[0]"></b-progress-bar> <b-progress-bar variant="primary" :value="values[0]"></b-progress-bar>
<b-progress-bar variant="success" :value="values[1]"></b-progress-bar> <b-progress-bar variant="success" :value="values[1]"></b-progress-bar>
<b-progress-bar variant="info" :value="values[2]"></b-progress-bar> <b-progress-bar variant="info" :value="values[2]"></b-progress-bar>
@@ -194,4 +194,3 @@
name: 'button-groups' name: 'button-groups'
} }
</script> </script>
+1 -1
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="animated fadeIn"> <div class="animated fadeIn">
<b-card no-body id="new47"> <b-card no-body id="flags">
<div slot="header"> <div slot="header">
<i class="fa fa-font-awesome"></i> Flags <i class="fa fa-font-awesome"></i> Flags
</div> </div>
@@ -31,8 +31,7 @@
header-tag="header" header-tag="header"
footer-tag="footer"> footer-tag="footer">
<div slot="header"> <div slot="header">
<i class="fa fa-align-justify"></i> Alert <i class="fa fa-align-justify"></i> Alert <small> use <code>.alert-link</code> to provide links</small>
<small> use <code>.alert-link</code> to provide links</small>
</div> </div>
<div> <div>
<b-alert show variant="primary"> <b-alert show variant="primary">
@@ -69,8 +68,7 @@
header-tag="header" header-tag="header"
footer-tag="footer"> footer-tag="footer">
<div slot="header"> <div slot="header">
<i class="fa fa-align-justify"></i>Alerts</strong> <i class="fa fa-align-justify"></i> Alerts <small>with additional content</small>
<small>with additional content</small>
</div> </div>
<b-alert show variant="success"> <b-alert show variant="success">
<h4 class="alert-heading">Well done!</h4> <h4 class="alert-heading">Well done!</h4>
@@ -91,8 +89,7 @@
header-tag="header" header-tag="header"
footer-tag="footer"> footer-tag="footer">
<div slot="header"> <div slot="header">
<i class="fa fa-align-justify"></i>Alerts</strong> <i class="fa fa-align-justify"></i> Alerts <small>dismissible</small>
<small>dismissible</small>
</div> </div>
<div> <div>
<b-alert show dismissible> <b-alert show dismissible>
@@ -113,8 +110,7 @@
header-tag="header" header-tag="header"
footer-tag="footer"> footer-tag="footer">
<div slot="header"> <div slot="header">
<i class="fa fa-align-justify"></i>Alerts</strong> <i class="fa fa-align-justify"></i> Alerts <small>auto dismissible</small>
<small>auto dismissible</small>
</div> </div>
<div> <div>
<b-alert :show="dismissCountDown" <b-alert :show="dismissCountDown"
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@@ -1,11 +1,12 @@
// A custom Nightwatch assertion. // A custom Nightwatch assertion.
// the name of the method is the filename. // The assertion name is the filename.
// can be used in tests like this: // Example usage:
// //
// browser.assert.elementCount(selector, count) // browser.assert.elementCount(selector, count)
// //
// for how to write custom assertions see // For more information on custom assertions see:
// http://nightwatchjs.org/guide#writing-custom-assertions // http://nightwatchjs.org/guide#writing-custom-assertions
exports.assertion = function (selector, count) { exports.assertion = function (selector, count) {
this.message = 'Testing if element <' + selector + '> has count: ' + count this.message = 'Testing if element <' + selector + '> has count: ' + count
this.expected = count this.expected = count
+4 -1
View File
@@ -31,7 +31,10 @@ module.exports = {
desiredCapabilities: { desiredCapabilities: {
browserName: 'chrome', browserName: 'chrome',
javascriptEnabled: true, javascriptEnabled: true,
acceptSslCerts: true acceptSslCerts: true,
chromeOptions : {
args : ["start-maximized", "--incognito"]
}
} }
}, },
+21 -6
View File
@@ -1,16 +1,31 @@
// 1. start the dev server using production config // 1. start the dev server using production config
process.env.NODE_ENV = 'testing' process.env.NODE_ENV = 'testing'
var server = require('../../build/dev-server.js')
server.ready.then(() => { const webpack = require('webpack')
const DevServer = require('webpack-dev-server')
const webpackConfig = require('../../build/webpack.prod.conf')
const devConfigPromise = require('../../build/webpack.dev.conf')
let server
devConfigPromise.then(devConfig => {
const devServerOptions = devConfig.devServer
const compiler = webpack(webpackConfig)
server = new DevServer(compiler, devServerOptions)
const port = devServerOptions.port
const host = devServerOptions.host
return server.listen(port, host)
})
.then(() => {
// 2. run the nightwatch test suite against it // 2. run the nightwatch test suite against it
// to run in additional browsers: // to run in additional browsers:
// 1. add an entry in test/e2e/nightwatch.conf.json under "test_settings" // 1. add an entry in test/e2e/nightwatch.conf.js under "test_settings"
// 2. add it to the --env flag below // 2. add it to the --env flag below
// or override the environment flag, for example: `npm run e2e -- --env chrome,firefox` // or override the environment flag, for example: `npm run e2e -- --env chrome,firefox`
// For more information on Nightwatch's config file, see // For more information on Nightwatch's config file, see
// http://nightwatchjs.org/guide#settings-file // http://nightwatchjs.org/guide#settings-file
var opts = process.argv.slice(2) let opts = process.argv.slice(2)
if (opts.indexOf('--config') === -1) { if (opts.indexOf('--config') === -1) {
opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js']) opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js'])
} }
@@ -18,8 +33,8 @@ server.ready.then(() => {
opts = opts.concat(['--env', 'chrome']) opts = opts.concat(['--env', 'chrome'])
} }
var spawn = require('cross-spawn') const spawn = require('cross-spawn')
var runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }) const runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' })
runner.on('exit', function (code) { runner.on('exit', function (code) {
server.close() server.close()
+23 -26
View File
@@ -4,11 +4,11 @@
module.exports = { module.exports = {
before: function (browser) { before: function (browser) {
console.log('Setting up...'); console.log('Setting up...')
}, },
after: function (browser) { after: function (browser) {
console.log('Closing down...'); console.log('Closing down...')
}, },
'CoreUI Vue e2e tests': function (browser) { 'CoreUI Vue e2e tests': function (browser) {
@@ -16,12 +16,9 @@ module.exports = {
// default: http://localhost:8080 // default: http://localhost:8080
// see nightwatch.conf.js // see nightwatch.conf.js
const devServer = browser.globals.devServerURL; const devServer = browser.globals.devServerURL
browser browser.url(devServer).pause(500).expect.element('body').to.be.present;
.url(devServer)
.pause(500)
.expect.element('body').to.be.present;
browser.waitForElementVisible('.app > .app', 3000) browser.waitForElementVisible('.app > .app', 3000)
.assert.elementPresent('.app-header') .assert.elementPresent('.app-header')
@@ -36,47 +33,47 @@ module.exports = {
.assert.containsText('.app-footer > span.ml-auto', 'Powered by') .assert.containsText('.app-footer > span.ml-auto', 'Powered by')
.assert.elementCount('button', 18) .assert.elementCount('button', 18)
.resizeWindow(1024, 800) .resizeWindow(1024, 800)
.pause(500); .pause(500)
browser.click('body > div > header > button.navbar-toggler.aside-menu-toggler.d-md-down-none', function (response) { browser.click('body > div > header > button.navbar-toggler.aside-menu-toggler.d-md-down-none', function (response) {
this.assert.ok(browser === this, 'Check if the context is right.'); this.assert.ok(browser === this, 'Check if the context is right.')
this.assert.cssClassNotPresent('body', 'aside-menu-hidden'); this.assert.cssClassNotPresent('body', 'aside-menu-hidden')
}); })
browser.pause(500); browser.pause(500)
browser.click('body > div > header > button.navbar-toggler.aside-menu-toggler.d-md-down-none', function (response) { browser.click('body > div > header > button.navbar-toggler.aside-menu-toggler.d-md-down-none', function (response) {
this.assert.cssClassPresent('body', 'aside-menu-hidden'); this.assert.cssClassPresent('body', 'aside-menu-hidden')
}); })
browser.pause(500); browser.pause(500)
browser browser
.useXpath() .useXpath()
.click('/html/body/div/header/button[2]', function (response) { .click('/html/body/div/header/button[2]', function (response) {
this.assert.cssClassPresent('/html/body', 'sidebar-hidden'); this.assert.cssClassPresent('/html/body', 'sidebar-hidden')
}); })
browser browser
.pause(500) .pause(500)
.click('/html/body/div/header/button[2]', function (response) { .click('/html/body/div/header/button[2]', function (response) {
this.assert.cssClassNotPresent('/html/body', 'sidebar-hidden'); this.assert.cssClassNotPresent('/html/body', 'sidebar-hidden')
}); })
browser browser
.pause(500) .pause(500)
.click('/html/body/div/div/div/button', function (response) { .click('/html/body/div/div/div/button', function (response) {
this.assert.cssClassPresent('/html/body', 'sidebar-minimized'); this.assert.cssClassPresent('/html/body', 'sidebar-minimized')
this.assert.cssClassPresent('/html/body', 'brand-minimized'); this.assert.cssClassPresent('/html/body', 'brand-minimized')
}) })
.pause(500) .pause(500)
.click('/html/body/div/div/div/button', function (response) { .click('/html/body/div/div/div/button', function (response) {
this.assert.cssClassNotPresent('/html/body', 'sidebar-minimized'); this.assert.cssClassNotPresent('/html/body', 'sidebar-minimized')
this.assert.cssClassNotPresent('/html/body', 'brand-minimized'); this.assert.cssClassNotPresent('/html/body', 'brand-minimized')
}); })
browser browser
.pause(3000) .pause(3000)
.end(); .end()
}
} }
};
+1 -1
View File
@@ -9,5 +9,5 @@ testsContext.keys().forEach(testsContext)
// require all src files except main.js for coverage. // require all src files except main.js for coverage.
// you can also change this to match only the subset of files that // you can also change this to match only the subset of files that
// you want coverage for. // you want coverage for.
const srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/) const srcContext = require.context('../../src', false, /^\.\/(?!main(\.js)?$)/)
srcContext.keys().forEach(srcContext) srcContext.keys().forEach(srcContext)
+1 -1
View File
@@ -5,7 +5,7 @@
var webpackConfig = require('../../build/webpack.test.conf') var webpackConfig = require('../../build/webpack.test.conf')
module.exports = function (config) { module.exports = function karmaConfig (config) {
config.set({ config.set({
// to run in additional browsers: // to run in additional browsers:
// 1. install corresponding karma launcher // 1. install corresponding karma launcher
+8 -4
View File
@@ -1,14 +1,18 @@
{ {
"presets": [ "presets": [
["env", { "modules": false }], ["env", {
"modules": false,
"targets": {
"browsers": ["> 1%", "last 2 versions", "not ie <= 9"]
}
}],
"stage-2" "stage-2"
], ],
"plugins": ["transform-runtime"], "plugins": ["transform-vue-jsx", "transform-runtime"],
"comments": false,
"env": { "env": {
"test": { "test": {
"presets": ["env", "stage-2"], "presets": ["env", "stage-2"],
"plugins": [ "istanbul" ] "plugins": ["transform-vue-jsx", "istanbul"]
} }
} }
} }
+6 -2
View File
@@ -1,2 +1,6 @@
build/*.js /build/
config/*.js /config/
/dist/
/*.js
/test/unit/coverage/
/test/e2e/specs
+13 -11
View File
@@ -1,27 +1,29 @@
// http://eslint.org/docs/user-guide/configuring // https://eslint.org/docs/user-guide/configuring
module.exports = { module.exports = {
root: true, root: true,
parser: 'babel-eslint',
parserOptions: { parserOptions: {
sourceType: 'module' parser: 'babel-eslint'
}, },
env: { env: {
browser: true, browser: true,
}, },
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style extends: [
extends: 'standard', // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
'plugin:vue/essential',
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
'standard'
],
// required to lint *.vue files // required to lint *.vue files
plugins: [ plugins: [
'html' 'vue'
], ],
// add your custom rules here // add your custom rules here
'rules': { rules: {
// allow paren-less arrow functions
'arrow-parens': 0,
// allow async-await // allow async-await
'generator-star-spacing': 0, 'generator-star-spacing': 'off',
// allow debugger during development // allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
} }
} }
+11 -3
View File
@@ -1,9 +1,17 @@
.DS_Store .DS_Store
node_modules/ node_modules/
dist/ /dist/
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
test/unit/coverage /test/unit/coverage/
test/e2e/reports /test/e2e/reports/
selenium-debug.log selenium-debug.log
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
+3 -1
View File
@@ -2,7 +2,9 @@
module.exports = { module.exports = {
"plugins": { "plugins": {
// to edit target browsers: use "browserlist" field in package.json "postcss-import": {},
"postcss-url": {},
// to edit target browsers: use "browserslist" field in package.json
"autoprefixer": {} "autoprefixer": {}
} }
} }
+3 -3
View File
@@ -1,6 +1,6 @@
# core-ui # CoreUI Vue
> Open Source Admin Template > CoreUI Vue Open Source Bootsrtap 4 Admin Template
## Build Setup ## Build Setup
@@ -27,4 +27,4 @@ npm run e2e
npm test npm test
``` ```
For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+16 -10
View File
@@ -1,31 +1,37 @@
'use strict'
require('./check-versions')() require('./check-versions')()
process.env.NODE_ENV = 'production' process.env.NODE_ENV = 'production'
var ora = require('ora') const ora = require('ora')
var rm = require('rimraf') const rm = require('rimraf')
var path = require('path') const path = require('path')
var chalk = require('chalk') const chalk = require('chalk')
var webpack = require('webpack') const webpack = require('webpack')
var config = require('../config') const config = require('../config')
var webpackConfig = require('./webpack.prod.conf') const webpackConfig = require('./webpack.prod.conf')
var spinner = ora('building for production...') const spinner = ora('building for production...')
spinner.start() spinner.start()
rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
if (err) throw err if (err) throw err
webpack(webpackConfig, function (err, stats) { webpack(webpackConfig, (err, stats) => {
spinner.stop() spinner.stop()
if (err) throw err if (err) throw err
process.stdout.write(stats.toString({ process.stdout.write(stats.toString({
colors: true, colors: true,
modules: false, modules: false,
children: false, children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
chunks: false, chunks: false,
chunkModules: false chunkModules: false
}) + '\n\n') }) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n')) console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow( console.log(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' + ' Tip: built files are meant to be served over an HTTP server.\n' +
+17 -11
View File
@@ -1,17 +1,19 @@
var chalk = require('chalk') 'use strict'
var semver = require('semver') const chalk = require('chalk')
var packageConfig = require('../package.json') const semver = require('semver')
var shell = require('shelljs') const packageConfig = require('../package.json')
const shell = require('shelljs')
function exec (cmd) { function exec (cmd) {
return require('child_process').execSync(cmd).toString().trim() return require('child_process').execSync(cmd).toString().trim()
} }
var versionRequirements = [ const versionRequirements = [
{ {
name: 'node', name: 'node',
currentVersion: semver.clean(process.version), currentVersion: semver.clean(process.version),
versionRequirement: packageConfig.engines.node versionRequirement: packageConfig.engines.node
}, }
] ]
if (shell.which('npm')) { if (shell.which('npm')) {
@@ -23,9 +25,11 @@ if (shell.which('npm')) {
} }
module.exports = function () { module.exports = function () {
var warnings = [] const warnings = []
for (var i = 0; i < versionRequirements.length; i++) {
var mod = versionRequirements[i] for (let i = 0; i < versionRequirements.length; i++) {
const mod = versionRequirements[i]
if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
warnings.push(mod.name + ': ' + warnings.push(mod.name + ': ' +
chalk.red(mod.currentVersion) + ' should be ' + chalk.red(mod.currentVersion) + ' should be ' +
@@ -38,10 +42,12 @@ module.exports = function () {
console.log('') console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:')) console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log() console.log()
for (var i = 0; i < warnings.length; i++) {
var warning = warnings[i] for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning) console.log(' ' + warning)
} }
console.log() console.log()
process.exit(1) process.exit(1)
} }

Some files were not shown because too many files have changed in this diff Show More