diff --git a/CHANGELOG.md b/CHANGELOG.md index 5336633c..baebacdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## [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` - fix: `className` -> `class` - refactor: `` @@ -33,7 +39,7 @@ - refactor: Modal's ok-button variants - refactor: forms with validation feedback - update: bootstrap-vue to `1.1.0` -- update: to vue: `2.5.6` +- update: vue to `2.5.6` ###### `v1.0.5` - update: bootstrap-vue to `1.0.x` diff --git a/Vue_Full_Project/.babelrc b/Vue_Full_Project/.babelrc index 13f0e471..f23f64af 100644 --- a/Vue_Full_Project/.babelrc +++ b/Vue_Full_Project/.babelrc @@ -1,14 +1,18 @@ { "presets": [ - ["env", { "modules": false }], + ["env", { + "modules": false, + "targets": { + "browsers": ["> 1%", "last 2 versions", "not ie <= 9"] + } + }], "stage-2" ], - "plugins": ["transform-runtime"], - "comments": false, + "plugins": ["transform-vue-jsx", "transform-runtime"], "env": { "test": { "presets": ["env", "stage-2"], - "plugins": [ "istanbul" ] + "plugins": ["transform-vue-jsx", "istanbul"] } } } diff --git a/Vue_Full_Project/.eslintignore b/Vue_Full_Project/.eslintignore index 34af3774..73db570d 100644 --- a/Vue_Full_Project/.eslintignore +++ b/Vue_Full_Project/.eslintignore @@ -1,2 +1,6 @@ -build/*.js -config/*.js +/build/ +/config/ +/dist/ +/*.js +/test/unit/coverage/ +/test/e2e/specs diff --git a/Vue_Full_Project/.eslintrc.js b/Vue_Full_Project/.eslintrc.js index 67c085d6..555acd67 100644 --- a/Vue_Full_Project/.eslintrc.js +++ b/Vue_Full_Project/.eslintrc.js @@ -1,27 +1,29 @@ -// http://eslint.org/docs/user-guide/configuring +// https://eslint.org/docs/user-guide/configuring module.exports = { root: true, - parser: 'babel-eslint', parserOptions: { - sourceType: 'module' + parser: 'babel-eslint' }, env: { browser: true, }, - // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style - extends: 'standard', + extends: [ + // 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 plugins: [ - 'html' + 'vue' ], // add your custom rules here - 'rules': { - // allow paren-less arrow functions - 'arrow-parens': 0, + rules: { // allow async-await - 'generator-star-spacing': 0, + 'generator-star-spacing': 'off', // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0 + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' } } diff --git a/Vue_Full_Project/.gitignore b/Vue_Full_Project/.gitignore index 3e1d210d..dfb4167f 100644 --- a/Vue_Full_Project/.gitignore +++ b/Vue_Full_Project/.gitignore @@ -1,9 +1,17 @@ .DS_Store node_modules/ -dist/ +/dist/ npm-debug.log* yarn-debug.log* yarn-error.log* -test/unit/coverage -test/e2e/reports +/test/unit/coverage/ +/test/e2e/reports/ selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln diff --git a/Vue_Full_Project/.postcssrc.js b/Vue_Full_Project/.postcssrc.js index ea9a5ab8..eee3e92d 100644 --- a/Vue_Full_Project/.postcssrc.js +++ b/Vue_Full_Project/.postcssrc.js @@ -2,7 +2,9 @@ module.exports = { "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": {} } } diff --git a/Vue_Full_Project/CHANGELOG.md b/Vue_Full_Project/CHANGELOG.md index 5336633c..baebacdd 100644 --- a/Vue_Full_Project/CHANGELOG.md +++ b/Vue_Full_Project/CHANGELOG.md @@ -1,5 +1,11 @@ ## [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` - fix: `className` -> `class` - refactor: `` @@ -33,7 +39,7 @@ - refactor: Modal's ok-button variants - refactor: forms with validation feedback - update: bootstrap-vue to `1.1.0` -- update: to vue: `2.5.6` +- update: vue to `2.5.6` ###### `v1.0.5` - update: bootstrap-vue to `1.0.x` diff --git a/Vue_Full_Project/README.md b/Vue_Full_Project/README.md index 86ce704d..629872a8 100644 --- a/Vue_Full_Project/README.md +++ b/Vue_Full_Project/README.md @@ -1,6 +1,6 @@ -# core-ui +# CoreUI Vue -> Open Source Admin Template +> CoreUI Vue Open Source Bootsrtap 4 Admin Template ## Build Setup @@ -27,4 +27,4 @@ npm run e2e 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). diff --git a/Vue_Full_Project/build/build.js b/Vue_Full_Project/build/build.js index 6b8add10..8f2ad8ad 100644 --- a/Vue_Full_Project/build/build.js +++ b/Vue_Full_Project/build/build.js @@ -1,31 +1,37 @@ +'use strict' require('./check-versions')() process.env.NODE_ENV = 'production' -var ora = require('ora') -var rm = require('rimraf') -var path = require('path') -var chalk = require('chalk') -var webpack = require('webpack') -var config = require('../config') -var webpackConfig = require('./webpack.prod.conf') +const ora = require('ora') +const rm = require('rimraf') +const path = require('path') +const chalk = require('chalk') +const webpack = require('webpack') +const config = require('../config') +const webpackConfig = require('./webpack.prod.conf') -var spinner = ora('building for production...') +const spinner = ora('building for production...') spinner.start() rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { if (err) throw err - webpack(webpackConfig, function (err, stats) { + webpack(webpackConfig, (err, stats) => { spinner.stop() if (err) throw err process.stdout.write(stats.toString({ colors: true, 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, chunkModules: false }) + '\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.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + diff --git a/Vue_Full_Project/build/check-versions.js b/Vue_Full_Project/build/check-versions.js index 100f3a0f..3ef972a0 100644 --- a/Vue_Full_Project/build/check-versions.js +++ b/Vue_Full_Project/build/check-versions.js @@ -1,17 +1,19 @@ -var chalk = require('chalk') -var semver = require('semver') -var packageConfig = require('../package.json') -var shell = require('shelljs') +'use strict' +const chalk = require('chalk') +const semver = require('semver') +const packageConfig = require('../package.json') +const shell = require('shelljs') + function exec (cmd) { return require('child_process').execSync(cmd).toString().trim() } -var versionRequirements = [ +const versionRequirements = [ { name: 'node', currentVersion: semver.clean(process.version), versionRequirement: packageConfig.engines.node - }, + } ] if (shell.which('npm')) { @@ -23,9 +25,11 @@ if (shell.which('npm')) { } module.exports = function () { - var warnings = [] - for (var i = 0; i < versionRequirements.length; i++) { - var mod = versionRequirements[i] + const warnings = [] + + for (let i = 0; i < versionRequirements.length; i++) { + const mod = versionRequirements[i] + if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { warnings.push(mod.name + ': ' + chalk.red(mod.currentVersion) + ' should be ' + @@ -38,10 +42,12 @@ module.exports = function () { console.log('') console.log(chalk.yellow('To use this template, you must update following to modules:')) 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() process.exit(1) } diff --git a/Vue_Full_Project/build/dev-client.js b/Vue_Full_Project/build/dev-client.js deleted file mode 100644 index 18aa1e21..00000000 --- a/Vue_Full_Project/build/dev-client.js +++ /dev/null @@ -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() - } -}) diff --git a/Vue_Full_Project/build/dev-server.js b/Vue_Full_Project/build/dev-server.js deleted file mode 100644 index a0481699..00000000 --- a/Vue_Full_Project/build/dev-server.js +++ /dev/null @@ -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() - } -} diff --git a/Vue_Full_Project/build/utils.js b/Vue_Full_Project/build/utils.js index 81bde5c6..e534fb0f 100644 --- a/Vue_Full_Project/build/utils.js +++ b/Vue_Full_Project/build/utils.js @@ -1,29 +1,38 @@ -var path = require('path') -var config = require('../config') -var ExtractTextPlugin = require('extract-text-webpack-plugin') +'use strict' +const path = require('path') +const config = require('../config') +const ExtractTextPlugin = require('extract-text-webpack-plugin') +const packageConfig = require('../package.json') exports.assetsPath = function (_path) { - var assetsSubDirectory = process.env.NODE_ENV === 'production' + const assetsSubDirectory = process.env.NODE_ENV === 'production' ? config.build.assetsSubDirectory : config.dev.assetsSubDirectory + return path.posix.join(assetsSubDirectory, _path) } exports.cssLoaders = function (options) { options = options || {} - var cssLoader = { + const cssLoader = { loader: 'css-loader', options: { - minimize: process.env.NODE_ENV === 'production', - sourceMap: options.sourceMap, - alias: { '../img': '../static/img' } + sourceMap: options.sourceMap + } + } + + const postcssLoader = { + loader: 'postcss-loader', + options: { + sourceMap: options.sourceMap } } // generate loader string to be used with extract text plugin function generateLoaders (loader, loaderOptions) { - var loaders = [cssLoader] + const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader] + if (loader) { loaders.push({ loader: loader + '-loader', @@ -59,14 +68,34 @@ exports.cssLoaders = function (options) { // Generate loaders for standalone style files (outside of .vue) exports.styleLoaders = function (options) { - var output = [] - var loaders = exports.cssLoaders(options) - for (var extension in loaders) { - var loader = loaders[extension] + const output = [] + const loaders = exports.cssLoaders(options) + + for (const extension in loaders) { + const loader = loaders[extension] output.push({ test: new RegExp('\\.' + extension + '$'), use: loader }) } + 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') + }) + } +} diff --git a/Vue_Full_Project/build/vue-loader.conf.js b/Vue_Full_Project/build/vue-loader.conf.js index 7aee79ba..33ed58bc 100644 --- a/Vue_Full_Project/build/vue-loader.conf.js +++ b/Vue_Full_Project/build/vue-loader.conf.js @@ -1,12 +1,22 @@ -var utils = require('./utils') -var config = require('../config') -var isProduction = process.env.NODE_ENV === 'production' +'use strict' +const utils = require('./utils') +const config = require('../config') +const isProduction = process.env.NODE_ENV === 'production' +const sourceMapEnabled = isProduction + ? config.build.productionSourceMap + : config.dev.cssSourceMap module.exports = { loaders: utils.cssLoaders({ - sourceMap: isProduction - ? config.build.productionSourceMap - : config.dev.cssSourceMap, + sourceMap: sourceMapEnabled, extract: isProduction - }) + }), + cssSourceMap: sourceMapEnabled, + cacheBusting: config.dev.cacheBusting, + transformToRequire: { + video: ['src', 'poster'], + source: 'src', + img: 'src', + image: 'xlink:href' + } } diff --git a/Vue_Full_Project/build/webpack.base.conf.js b/Vue_Full_Project/build/webpack.base.conf.js index 49c31b12..1f4f47e4 100644 --- a/Vue_Full_Project/build/webpack.base.conf.js +++ b/Vue_Full_Project/build/webpack.base.conf.js @@ -1,13 +1,26 @@ -var path = require('path') -var utils = require('./utils') -var config = require('../config') -var vueLoaderConfig = require('./vue-loader.conf') +'use strict' +const path = require('path') +const utils = require('./utils') +const config = require('../config') +const vueLoaderConfig = require('./vue-loader.conf') function resolve (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 = { + context: path.resolve(__dirname, '../'), entry: { app: './src/main.js' }, @@ -22,20 +35,12 @@ module.exports = { extensions: ['.js', '.vue', '.json'], alias: { 'vue$': 'vue/dist/vue.esm.js', - '@': resolve('src') + '@': resolve('src'), } }, module: { rules: [ - { - test: /\.(js|vue)$/, - loader: 'eslint-loader', - enforce: 'pre', - include: [resolve('src'), resolve('test')], - options: { - formatter: require('eslint-friendly-formatter') - } - }, + ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', @@ -44,33 +49,44 @@ module.exports = { { test: /\.js$/, 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)(\?.*)?$/, - exclude: [/fonts/], - use: { - loader: 'file-loader', - options: { - name: '[name].[hash:7].[ext]', - publicPath: '../../', - outputPath: utils.assetsPath('img/'), - emitFile: true - } + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('img/[name].[hash:7].[ext]') } }, { - test: /\.(woff2?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, - exclude: [/flags/], - use: { - loader: 'file-loader', - options: { - name: '[name].[hash:7].[ext]', - publicPath: '../../', - outputPath: utils.assetsPath('fonts/') - } + test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/, + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('media/[name].[hash:7].[ext]') + } + }, + { + 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' } } diff --git a/Vue_Full_Project/build/webpack.dev.conf.js b/Vue_Full_Project/build/webpack.dev.conf.js index 0764de2a..070ae221 100644 --- a/Vue_Full_Project/build/webpack.dev.conf.js +++ b/Vue_Full_Project/build/webpack.dev.conf.js @@ -1,30 +1,55 @@ -var path = require('path') -var utils = require('./utils') -var webpack = require('webpack') -var config = require('../config') -var merge = require('webpack-merge') -var baseWebpackConfig = require('./webpack.base.conf') -var CopyWebpackPlugin = require('copy-webpack-plugin') -var HtmlWebpackPlugin = require('html-webpack-plugin') -var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') +'use strict' +const utils = require('./utils') +const webpack = require('webpack') +const config = require('../config') +const merge = require('webpack-merge') +const path = require('path') +const baseWebpackConfig = require('./webpack.base.conf') +const CopyWebpackPlugin = require('copy-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 -Object.keys(baseWebpackConfig.entry).forEach(function (name) { - baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name]) -}) +const HOST = process.env.HOST +const PORT = process.env.PORT && Number(process.env.PORT) -module.exports = merge(baseWebpackConfig, { +const devWebpackConfig = merge(baseWebpackConfig, { 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 - 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: [ 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.NamedModulesPlugin(), // HMR shows correct file names in console on update. new webpack.NoEmitOnErrorsPlugin(), // https://github.com/ampedandwired/html-webpack-plugin new HtmlWebpackPlugin({ @@ -32,14 +57,39 @@ module.exports = merge(baseWebpackConfig, { template: 'index.html', inject: true }), - new FriendlyErrorsPlugin(), // copy custom static assets new CopyWebpackPlugin([ { from: path.resolve(__dirname, '../static'), - to: config.build.assetsSubDirectory, + to: config.dev.assetsSubDirectory, 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) + } + }) +}) diff --git a/Vue_Full_Project/build/webpack.prod.conf.js b/Vue_Full_Project/build/webpack.prod.conf.js index 99713cc4..2f172596 100644 --- a/Vue_Full_Project/build/webpack.prod.conf.js +++ b/Vue_Full_Project/build/webpack.prod.conf.js @@ -1,26 +1,29 @@ -var path = require('path') -var utils = require('./utils') -var webpack = require('webpack') -var config = require('../config') -var merge = require('webpack-merge') -var baseWebpackConfig = require('./webpack.base.conf') -var CopyWebpackPlugin = require('copy-webpack-plugin') -var HtmlWebpackPlugin = require('html-webpack-plugin') -var ExtractTextPlugin = require('extract-text-webpack-plugin') -var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') +'use strict' +const path = require('path') +const utils = require('./utils') +const webpack = require('webpack') +const config = require('../config') +const merge = require('webpack-merge') +const baseWebpackConfig = require('./webpack.base.conf') +const CopyWebpackPlugin = require('copy-webpack-plugin') +const HtmlWebpackPlugin = require('html-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') - : config.build.env + : require('../config/prod.env') -var webpackConfig = merge(baseWebpackConfig, { +const webpackConfig = merge(baseWebpackConfig, { module: { rules: utils.styleLoaders({ 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: { path: config.build.assetsRoot, filename: utils.assetsPath('js/[name].[chunkhash].js'), @@ -31,22 +34,30 @@ var webpackConfig = merge(baseWebpackConfig, { new webpack.DefinePlugin({ 'process.env': env }), - new webpack.optimize.UglifyJsPlugin({ - compress: { - warnings: false + new UglifyJsPlugin({ + uglifyOptions: { + compress: { + warnings: false + } }, - sourceMap: true + sourceMap: config.build.productionSourceMap, + parallel: true }), // extract css into its own file 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 // duplicated CSS from different components can be deduped. new OptimizeCSSPlugin({ - cssProcessorOptions: { - safe: true - } + cssProcessorOptions: config.build.productionSourceMap + ? { safe: true, map: { inline: false } } + : { safe: true } }), // generate dist index.html with correct asset hash for caching. // 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 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 new webpack.optimize.CommonsChunkPlugin({ name: 'vendor', - minChunks: function (module, count) { + minChunks (module) { // any required modules inside node_modules are extracted to vendor return ( module.resource && @@ -85,8 +100,18 @@ var webpackConfig = merge(baseWebpackConfig, { // prevent vendor hash from being updated whenever app bundle is updated new webpack.optimize.CommonsChunkPlugin({ 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 new CopyWebpackPlugin([ { @@ -99,7 +124,7 @@ var webpackConfig = merge(baseWebpackConfig, { }) if (config.build.productionGzip) { - var CompressionWebpackPlugin = require('compression-webpack-plugin') + const CompressionWebpackPlugin = require('compression-webpack-plugin') webpackConfig.plugins.push( new CompressionWebpackPlugin({ @@ -117,7 +142,7 @@ if (config.build.productionGzip) { } if (config.build.bundleAnalyzerReport) { - var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin + const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin webpackConfig.plugins.push(new BundleAnalyzerPlugin()) } diff --git a/Vue_Full_Project/build/webpack.test.conf.js b/Vue_Full_Project/build/webpack.test.conf.js index d6c8c8dd..0d658d9e 100644 --- a/Vue_Full_Project/build/webpack.test.conf.js +++ b/Vue_Full_Project/build/webpack.test.conf.js @@ -1,11 +1,12 @@ +'use strict' // This is the webpack config used for unit tests. -var utils = require('./utils') -var webpack = require('webpack') -var merge = require('webpack-merge') -var baseConfig = require('./webpack.base.conf') +const utils = require('./utils') +const webpack = require('webpack') +const merge = require('webpack-merge') +const baseWebpackConfig = require('./webpack.base.conf') -var webpackConfig = merge(baseConfig, { +const webpackConfig = merge(baseWebpackConfig, { // use inline sourcemap for karma-sourcemap-loader module: { rules: utils.styleLoaders() @@ -13,7 +14,7 @@ var webpackConfig = merge(baseConfig, { devtool: '#inline-source-map', resolveLoader: { alias: { - // necessary to to make lang="scss" work in test when using vue-loader's ?inject option + // necessary to to make lang="scss" work in test when using vue-loader's ?inject option // see discussion at https://github.com/vuejs/vue-loader/issues/724 'scss-loader': 'sass-loader' } diff --git a/Vue_Full_Project/config/dev.env.js b/Vue_Full_Project/config/dev.env.js index efead7c8..1e22973a 100644 --- a/Vue_Full_Project/config/dev.env.js +++ b/Vue_Full_Project/config/dev.env.js @@ -1,5 +1,6 @@ -var merge = require('webpack-merge') -var prodEnv = require('./prod.env') +'use strict' +const merge = require('webpack-merge') +const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"' diff --git a/Vue_Full_Project/config/index.js b/Vue_Full_Project/config/index.js index 51676aa3..926ab364 100644 --- a/Vue_Full_Project/config/index.js +++ b/Vue_Full_Project/config/index.js @@ -1,38 +1,76 @@ +'use strict' +// Template version: 1.3.1 // see http://vuejs-templates.github.io/webpack for documentation. -var path = require('path') + +const path = require('path') 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: { - env: require('./prod.env'), + // Template for index.html index: path.resolve(__dirname, '../dist/index.html'), + + // Paths assetsRoot: path.resolve(__dirname, '../dist'), assetsSubDirectory: 'static', - assetsPublicPath: './', + assetsPublicPath: '/', + + /** + * Source Maps + */ + productionSourceMap: true, + // https://webpack.js.org/configuration/devtool/#production + devtool: '#source-map', + // Gzip off by default as many popular static hosts such as // Surge or Netlify already gzip all static assets for you. // Before setting to `true`, make sure to: // npm install --save-dev compression-webpack-plugin productionGzip: false, productionGzipExtensions: ['js', 'css'], + // Run the build command with an extra argument to // View the bundle analyzer report after build finishes: // `npm run build --report` // Set to `true` or `false` to always turn it on or off 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 } } diff --git a/Vue_Full_Project/config/prod.env.js b/Vue_Full_Project/config/prod.env.js index 773d263d..a6f99761 100644 --- a/Vue_Full_Project/config/prod.env.js +++ b/Vue_Full_Project/config/prod.env.js @@ -1,3 +1,4 @@ +'use strict' module.exports = { NODE_ENV: '"production"' } diff --git a/Vue_Full_Project/config/test.env.js b/Vue_Full_Project/config/test.env.js index 89f90deb..c2824a30 100644 --- a/Vue_Full_Project/config/test.env.js +++ b/Vue_Full_Project/config/test.env.js @@ -1,5 +1,6 @@ -var merge = require('webpack-merge') -var devEnv = require('./dev.env') +'use strict' +const merge = require('webpack-merge') +const devEnv = require('./dev.env') module.exports = merge(devEnv, { NODE_ENV: '"testing"' diff --git a/Vue_Full_Project/index.html b/Vue_Full_Project/index.html index 7246f005..303d9cf5 100644 --- a/Vue_Full_Project/index.html +++ b/Vue_Full_Project/index.html @@ -5,6 +5,7 @@ CoreUI - Open Source Bootstrap Admin Template + - - diff --git a/Vue_Full_Project/src/components/Sidebar/SidebarNavLabel.vue b/Vue_Full_Project/src/components/Sidebar/SidebarNavLabel.vue index 20ed7ced..480f1a16 100644 --- a/Vue_Full_Project/src/components/Sidebar/SidebarNavLabel.vue +++ b/Vue_Full_Project/src/components/Sidebar/SidebarNavLabel.vue @@ -5,55 +5,55 @@ diff --git a/Vue_Full_Project/src/components/Sidebar/SidebarNavLink.vue b/Vue_Full_Project/src/components/Sidebar/SidebarNavLink.vue index cba5d484..2ee0f7da 100644 --- a/Vue_Full_Project/src/components/Sidebar/SidebarNavLink.vue +++ b/Vue_Full_Project/src/components/Sidebar/SidebarNavLink.vue @@ -14,55 +14,55 @@ diff --git a/Vue_Full_Project/src/components/Sidebar/SidebarNavTitle.vue b/Vue_Full_Project/src/components/Sidebar/SidebarNavTitle.vue index 8879614f..6bac6f56 100644 --- a/Vue_Full_Project/src/components/Sidebar/SidebarNavTitle.vue +++ b/Vue_Full_Project/src/components/Sidebar/SidebarNavTitle.vue @@ -12,31 +12,31 @@ diff --git a/Vue_Full_Project/src/views/Widgets.vue b/Vue_Full_Project/src/views/Widgets.vue index a4b041e9..cb687bf1 100644 --- a/Vue_Full_Project/src/views/Widgets.vue +++ b/Vue_Full_Project/src/views/Widgets.vue @@ -390,7 +390,7 @@
972
Comments - + diff --git a/Vue_Full_Project/src/views/base/Breadcrumbs.vue b/Vue_Full_Project/src/views/base/Breadcrumbs.vue index 69c1d81f..90302be5 100644 --- a/Vue_Full_Project/src/views/base/Breadcrumbs.vue +++ b/Vue_Full_Project/src/views/base/Breadcrumbs.vue @@ -21,22 +21,21 @@ - diff --git a/Vue_Full_Project/src/views/base/Carousels.vue b/Vue_Full_Project/src/views/base/Carousels.vue index 240eb62c..75780aa7 100644 --- a/Vue_Full_Project/src/views/base/Carousels.vue +++ b/Vue_Full_Project/src/views/base/Carousels.vue @@ -73,22 +73,21 @@ - diff --git a/Vue_Full_Project/src/views/base/Collapses.vue b/Vue_Full_Project/src/views/base/Collapses.vue index b15cab21..fe1e4175 100644 --- a/Vue_Full_Project/src/views/base/Collapses.vue +++ b/Vue_Full_Project/src/views/base/Collapses.vue @@ -3,9 +3,7 @@
- +
Bootstrap Collapse
@@ -31,7 +29,7 @@ header-tag="header" footer-tag="footer">
- Collapse withv-b-toggledirective + Collapse with v-b-toggle directive
@@ -56,7 +54,7 @@ header-tag="header" footer-tag="footer">
- Collapse withvisibility + Collapse with visibility
Toggle Collapse @@ -73,7 +71,7 @@ header-tag="header" footer-tag="footer">
- Collapse withv-model + Collapse with v-model
- Collapseaccordionsupport + Collapse accordion support
@@ -174,12 +172,12 @@ diff --git a/Vue_Full_Project/src/views/base/Forms.vue b/Vue_Full_Project/src/views/base/Forms.vue index 3eb21f8b..5ce1cb8a 100644 --- a/Vue_Full_Project/src/views/base/Forms.vue +++ b/Vue_Full_Project/src/views/base/Forms.vue @@ -117,6 +117,12 @@ :horizontal="true"> + + + + diff --git a/Vue_Starter/scss/_bootstrap-variables.scss b/Vue_Starter/src/assets/scss/_bootstrap-variables.scss similarity index 100% rename from Vue_Starter/scss/_bootstrap-variables.scss rename to Vue_Starter/src/assets/scss/_bootstrap-variables.scss diff --git a/Vue_Starter/scss/_core-variables.scss b/Vue_Starter/src/assets/scss/_core-variables.scss similarity index 100% rename from Vue_Starter/scss/_core-variables.scss rename to Vue_Starter/src/assets/scss/_core-variables.scss diff --git a/Vue_Starter/scss/_custom.scss b/Vue_Starter/src/assets/scss/_custom.scss similarity index 100% rename from Vue_Starter/scss/_custom.scss rename to Vue_Starter/src/assets/scss/_custom.scss diff --git a/Vue_Starter/scss/core/_animate.scss b/Vue_Starter/src/assets/scss/core/_animate.scss similarity index 100% rename from Vue_Starter/scss/core/_animate.scss rename to Vue_Starter/src/assets/scss/core/_animate.scss diff --git a/Vue_Starter/scss/core/_aside.scss b/Vue_Starter/src/assets/scss/core/_aside.scss similarity index 100% rename from Vue_Starter/scss/core/_aside.scss rename to Vue_Starter/src/assets/scss/core/_aside.scss diff --git a/Vue_Starter/scss/core/_avatars.scss b/Vue_Starter/src/assets/scss/core/_avatars.scss similarity index 100% rename from Vue_Starter/scss/core/_avatars.scss rename to Vue_Starter/src/assets/scss/core/_avatars.scss diff --git a/Vue_Starter/scss/core/_badge.scss b/Vue_Starter/src/assets/scss/core/_badge.scss similarity index 100% rename from Vue_Starter/scss/core/_badge.scss rename to Vue_Starter/src/assets/scss/core/_badge.scss diff --git a/Vue_Starter/scss/core/_breadcrumb-menu.scss b/Vue_Starter/src/assets/scss/core/_breadcrumb-menu.scss similarity index 100% rename from Vue_Starter/scss/core/_breadcrumb-menu.scss rename to Vue_Starter/src/assets/scss/core/_breadcrumb-menu.scss diff --git a/Vue_Starter/scss/core/_breadcrumb.scss b/Vue_Starter/src/assets/scss/core/_breadcrumb.scss similarity index 100% rename from Vue_Starter/scss/core/_breadcrumb.scss rename to Vue_Starter/src/assets/scss/core/_breadcrumb.scss diff --git a/Vue_Starter/scss/core/_buttons.scss b/Vue_Starter/src/assets/scss/core/_buttons.scss similarity index 100% rename from Vue_Starter/scss/core/_buttons.scss rename to Vue_Starter/src/assets/scss/core/_buttons.scss diff --git a/Vue_Starter/scss/core/_callout.scss b/Vue_Starter/src/assets/scss/core/_callout.scss similarity index 100% rename from Vue_Starter/scss/core/_callout.scss rename to Vue_Starter/src/assets/scss/core/_callout.scss diff --git a/Vue_Starter/scss/core/_card.scss b/Vue_Starter/src/assets/scss/core/_card.scss similarity index 100% rename from Vue_Starter/scss/core/_card.scss rename to Vue_Starter/src/assets/scss/core/_card.scss diff --git a/Vue_Starter/scss/core/_charts.scss b/Vue_Starter/src/assets/scss/core/_charts.scss similarity index 100% rename from Vue_Starter/scss/core/_charts.scss rename to Vue_Starter/src/assets/scss/core/_charts.scss diff --git a/Vue_Starter/scss/core/_dropdown-menu-right.scss b/Vue_Starter/src/assets/scss/core/_dropdown-menu-right.scss similarity index 100% rename from Vue_Starter/scss/core/_dropdown-menu-right.scss rename to Vue_Starter/src/assets/scss/core/_dropdown-menu-right.scss diff --git a/Vue_Starter/scss/core/_dropdown.scss b/Vue_Starter/src/assets/scss/core/_dropdown.scss similarity index 100% rename from Vue_Starter/scss/core/_dropdown.scss rename to Vue_Starter/src/assets/scss/core/_dropdown.scss diff --git a/Vue_Starter/scss/core/_footer.scss b/Vue_Starter/src/assets/scss/core/_footer.scss similarity index 100% rename from Vue_Starter/scss/core/_footer.scss rename to Vue_Starter/src/assets/scss/core/_footer.scss diff --git a/Vue_Starter/scss/core/_grid.scss b/Vue_Starter/src/assets/scss/core/_grid.scss similarity index 100% rename from Vue_Starter/scss/core/_grid.scss rename to Vue_Starter/src/assets/scss/core/_grid.scss diff --git a/Vue_Starter/scss/core/_input-group.scss b/Vue_Starter/src/assets/scss/core/_input-group.scss similarity index 100% rename from Vue_Starter/scss/core/_input-group.scss rename to Vue_Starter/src/assets/scss/core/_input-group.scss diff --git a/Vue_Starter/scss/core/_layout.scss b/Vue_Starter/src/assets/scss/core/_layout.scss similarity index 100% rename from Vue_Starter/scss/core/_layout.scss rename to Vue_Starter/src/assets/scss/core/_layout.scss diff --git a/Vue_Starter/scss/core/_loading.scss b/Vue_Starter/src/assets/scss/core/_loading.scss similarity index 100% rename from Vue_Starter/scss/core/_loading.scss rename to Vue_Starter/src/assets/scss/core/_loading.scss diff --git a/Vue_Starter/scss/core/_mixins.scss b/Vue_Starter/src/assets/scss/core/_mixins.scss similarity index 100% rename from Vue_Starter/scss/core/_mixins.scss rename to Vue_Starter/src/assets/scss/core/_mixins.scss diff --git a/Vue_Starter/scss/core/_mobile.scss b/Vue_Starter/src/assets/scss/core/_mobile.scss similarity index 100% rename from Vue_Starter/scss/core/_mobile.scss rename to Vue_Starter/src/assets/scss/core/_mobile.scss diff --git a/Vue_Starter/scss/core/_modal.scss b/Vue_Starter/src/assets/scss/core/_modal.scss similarity index 100% rename from Vue_Starter/scss/core/_modal.scss rename to Vue_Starter/src/assets/scss/core/_modal.scss diff --git a/Vue_Starter/scss/core/_nav.scss b/Vue_Starter/src/assets/scss/core/_nav.scss similarity index 100% rename from Vue_Starter/scss/core/_nav.scss rename to Vue_Starter/src/assets/scss/core/_nav.scss diff --git a/Vue_Starter/scss/core/_navbar.scss b/Vue_Starter/src/assets/scss/core/_navbar.scss similarity index 100% rename from Vue_Starter/scss/core/_navbar.scss rename to Vue_Starter/src/assets/scss/core/_navbar.scss diff --git a/Vue_Starter/scss/core/_others.scss b/Vue_Starter/src/assets/scss/core/_others.scss similarity index 100% rename from Vue_Starter/scss/core/_others.scss rename to Vue_Starter/src/assets/scss/core/_others.scss diff --git a/Vue_Starter/scss/core/_progress.scss b/Vue_Starter/src/assets/scss/core/_progress.scss similarity index 100% rename from Vue_Starter/scss/core/_progress.scss rename to Vue_Starter/src/assets/scss/core/_progress.scss diff --git a/Vue_Starter/scss/core/_rtl.scss b/Vue_Starter/src/assets/scss/core/_rtl.scss similarity index 100% rename from Vue_Starter/scss/core/_rtl.scss rename to Vue_Starter/src/assets/scss/core/_rtl.scss diff --git a/Vue_Starter/scss/core/_sidebar.scss b/Vue_Starter/src/assets/scss/core/_sidebar.scss similarity index 100% rename from Vue_Starter/scss/core/_sidebar.scss rename to Vue_Starter/src/assets/scss/core/_sidebar.scss diff --git a/Vue_Starter/scss/core/_switches.scss b/Vue_Starter/src/assets/scss/core/_switches.scss similarity index 100% rename from Vue_Starter/scss/core/_switches.scss rename to Vue_Starter/src/assets/scss/core/_switches.scss diff --git a/Vue_Starter/scss/core/_tables.scss b/Vue_Starter/src/assets/scss/core/_tables.scss similarity index 100% rename from Vue_Starter/scss/core/_tables.scss rename to Vue_Starter/src/assets/scss/core/_tables.scss diff --git a/Vue_Starter/scss/core/_temp.scss b/Vue_Starter/src/assets/scss/core/_temp.scss similarity index 100% rename from Vue_Starter/scss/core/_temp.scss rename to Vue_Starter/src/assets/scss/core/_temp.scss diff --git a/Vue_Starter/scss/core/_typography.scss b/Vue_Starter/src/assets/scss/core/_typography.scss similarity index 100% rename from Vue_Starter/scss/core/_typography.scss rename to Vue_Starter/src/assets/scss/core/_typography.scss diff --git a/Vue_Starter/scss/core/_utilities.scss b/Vue_Starter/src/assets/scss/core/_utilities.scss similarity index 100% rename from Vue_Starter/scss/core/_utilities.scss rename to Vue_Starter/src/assets/scss/core/_utilities.scss diff --git a/Vue_Full_Project/scss/core/_variables.scss b/Vue_Starter/src/assets/scss/core/_variables.scss similarity index 98% rename from Vue_Full_Project/scss/core/_variables.scss rename to Vue_Starter/src/assets/scss/core/_variables.scss index 05c67832..c5fbabca 100644 --- a/Vue_Full_Project/scss/core/_variables.scss +++ b/Vue_Starter/src/assets/scss/core/_variables.scss @@ -48,7 +48,7 @@ $navbar-border: ( ) !default; $navbar-brand-width: 155px !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-border: ( bottom: ( @@ -60,7 +60,7 @@ $navbar-brand-border: ( $navbar-brand-minimized-width: 50px !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-border: $navbar-brand-border !default; diff --git a/Vue_Starter/scss/core/_widgets.scss b/Vue_Starter/src/assets/scss/core/_widgets.scss similarity index 100% rename from Vue_Starter/scss/core/_widgets.scss rename to Vue_Starter/src/assets/scss/core/_widgets.scss diff --git a/Vue_Starter/scss/core/core.scss b/Vue_Starter/src/assets/scss/core/core.scss similarity index 100% rename from Vue_Starter/scss/core/core.scss rename to Vue_Starter/src/assets/scss/core/core.scss diff --git a/Vue_Starter/scss/core/utilities/_background.scss b/Vue_Starter/src/assets/scss/core/utilities/_background.scss similarity index 100% rename from Vue_Starter/scss/core/utilities/_background.scss rename to Vue_Starter/src/assets/scss/core/utilities/_background.scss diff --git a/Vue_Starter/scss/core/utilities/_borders.scss b/Vue_Starter/src/assets/scss/core/utilities/_borders.scss similarity index 100% rename from Vue_Starter/scss/core/utilities/_borders.scss rename to Vue_Starter/src/assets/scss/core/utilities/_borders.scss diff --git a/Vue_Starter/scss/core/utilities/_display.scss b/Vue_Starter/src/assets/scss/core/utilities/_display.scss similarity index 100% rename from Vue_Starter/scss/core/utilities/_display.scss rename to Vue_Starter/src/assets/scss/core/utilities/_display.scss diff --git a/Vue_Full_Project/scss/style.scss b/Vue_Starter/src/assets/scss/style.scss similarity index 84% rename from Vue_Full_Project/scss/style.scss rename to Vue_Starter/src/assets/scss/style.scss index b51308da..fee7ff00 100644 --- a/Vue_Full_Project/scss/style.scss +++ b/Vue_Starter/src/assets/scss/style.scss @@ -1,6 +1,6 @@ /*! * CoreUI - Open Source Bootstrap Admin Template - * @version v1.0.10 + * @version v1.0.11 * @link http://coreui.io * Copyright (c) 2018 creativeLabs Łukasz Holeczek * @license MIT @@ -10,7 +10,7 @@ @import "bootstrap-variables"; // Import Bootstrap source files -@import "node_modules/bootstrap/scss/bootstrap"; +@import "~bootstrap/scss/bootstrap"; // Override core variables @import "core-variables"; diff --git a/Vue_Starter/scss/vendors/_variables.scss b/Vue_Starter/src/assets/scss/vendors/_variables.scss similarity index 100% rename from Vue_Starter/scss/vendors/_variables.scss rename to Vue_Starter/src/assets/scss/vendors/_variables.scss diff --git a/Vue_Starter/scss/vendors/chart.js/chart.scss b/Vue_Starter/src/assets/scss/vendors/chart.js/chart.scss similarity index 100% rename from Vue_Starter/scss/vendors/chart.js/chart.scss rename to Vue_Starter/src/assets/scss/vendors/chart.js/chart.scss diff --git a/Vue_Starter/src/components/Breadcrumb.vue b/Vue_Starter/src/components/Breadcrumb.vue index 87fde93b..1864b859 100644 --- a/Vue_Starter/src/components/Breadcrumb.vue +++ b/Vue_Starter/src/components/Breadcrumb.vue @@ -1,6 +1,6 @@ diff --git a/Vue_Starter/static/favicon.ico b/Vue_Starter/static/favicon.ico new file mode 100644 index 00000000..be27078a Binary files /dev/null and b/Vue_Starter/static/favicon.ico differ diff --git a/Vue_Starter/test/e2e/custom-assertions/elementCount.js b/Vue_Starter/test/e2e/custom-assertions/elementCount.js index c0d5fe00..818e6020 100644 --- a/Vue_Starter/test/e2e/custom-assertions/elementCount.js +++ b/Vue_Starter/test/e2e/custom-assertions/elementCount.js @@ -1,11 +1,12 @@ // A custom Nightwatch assertion. -// the name of the method is the filename. -// can be used in tests like this: +// The assertion name is the filename. +// Example usage: // // 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 + exports.assertion = function (selector, count) { this.message = 'Testing if element <' + selector + '> has count: ' + count this.expected = count diff --git a/Vue_Starter/test/e2e/runner.js b/Vue_Starter/test/e2e/runner.js index 85d67d6b..27220329 100644 --- a/Vue_Starter/test/e2e/runner.js +++ b/Vue_Starter/test/e2e/runner.js @@ -1,16 +1,31 @@ // 1. start the dev server using production config 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 // 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 // or override the environment flag, for example: `npm run e2e -- --env chrome,firefox` // For more information on Nightwatch's config file, see // http://nightwatchjs.org/guide#settings-file - var opts = process.argv.slice(2) + let opts = process.argv.slice(2) if (opts.indexOf('--config') === -1) { opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js']) } @@ -18,8 +33,8 @@ server.ready.then(() => { opts = opts.concat(['--env', 'chrome']) } - var spawn = require('cross-spawn') - var runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }) + const spawn = require('cross-spawn') + const runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }) runner.on('exit', function (code) { server.close() diff --git a/Vue_Starter/test/unit/index.js b/Vue_Starter/test/unit/index.js index c69f33fd..14400611 100644 --- a/Vue_Starter/test/unit/index.js +++ b/Vue_Starter/test/unit/index.js @@ -9,5 +9,5 @@ testsContext.keys().forEach(testsContext) // require all src files except main.js for coverage. // you can also change this to match only the subset of files that // you want coverage for. -const srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/) +const srcContext = require.context('../../src', false, /^\.\/(?!main(\.js)?$)/) srcContext.keys().forEach(srcContext) diff --git a/Vue_Starter/test/unit/karma.conf.js b/Vue_Starter/test/unit/karma.conf.js index 8e4951c9..5d3966d2 100644 --- a/Vue_Starter/test/unit/karma.conf.js +++ b/Vue_Starter/test/unit/karma.conf.js @@ -5,7 +5,7 @@ var webpackConfig = require('../../build/webpack.test.conf') -module.exports = function (config) { +module.exports = function karmaConfig (config) { config.set({ // to run in additional browsers: // 1. install corresponding karma launcher diff --git a/package.json b/package.json index 406be8fe..51e036e2 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { "name": "@coreui/vue", - "version": "1.0.10", - "description": "Open Source Vue Admin Template", + "version": "1.0.11", + "description": "CoreUI Vue Open Source Bootstrap 4 Admin Template", "main": "", "homepage": "http://coreui.io/vue/", - "github": "https://github.com/mrholek/CoreUI-Vue#readme", + "github": "https://github.com/mrholek/coreui-free-vue-admin-template", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, "repository": { "type": "git", - "url": "git+https://github.com/mrholek/CoreUI-Vue.git" + "url": "git+https://github.com/mrholek/coreui-free-vue-admin-template.git" }, "keywords": [ "Bootstrap", @@ -28,6 +28,6 @@ "author": "Łukasz Holeczek", "license": "MIT", "bugs": { - "url": "https://github.com/mrholek/CoreUI-Vue/issues" + "url": "https://github.com/mrholek/coreui-free-vue-admin-template/issues" } }