From 29a1afbf9afd71d11eae440f4e3c964aabba7363 Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Mon, 13 Aug 2018 19:50:52 -0500 Subject: [PATCH 1/4] First cut at new build process --- src/app/.babelrc | 18 - src/app/.browserslistrc | 3 + src/app/.editorconfig | 9 - src/app/.eslintignore | 2 - src/app/.eslintrc.js | 30 +- src/app/.gitignore | 15 +- src/app/.postcssrc.js | 7 +- src/app/babel.config.js | 5 + src/app/build/build.js | 35 - src/app/build/check-versions.js | 48 - src/app/build/dev-client.js | 9 - src/app/build/dev-server.js | 92 - src/app/build/utils.js | 71 - src/app/build/vue-loader.conf.js | 18 - src/app/build/webpack.base.conf.js | 75 - src/app/build/webpack.dev.conf.js | 35 - src/app/build/webpack.prod.conf.js | 125 - src/app/build/webpack.test.conf.js | 31 - src/app/config/dev.env.js | 6 - src/app/config/index.js | 38 - src/app/config/prod.env.js | 3 - src/app/config/test.env.js | 6 - src/app/index.html | 13 - src/app/package.json | 113 +- src/app/public/favicon.ico | Bin 0 -> 1150 bytes src/app/public/index.html | 17 + src/app/src/App.vue | 87 +- src/app/src/main.js | 11 +- src/app/src/{router/index.js => router.js} | 9 + .../e2e/custom-assertions/elementCount.js | 26 - src/app/test/e2e/nightwatch.conf.js | 46 - src/app/test/e2e/runner.js | 33 - src/app/test/e2e/specs/test.js | 19 - src/app/test/unit/.eslintrc | 9 - src/app/test/unit/index.js | 13 - src/app/test/unit/karma.conf.js | 33 - src/app/test/unit/specs/.gitkeep | 0 src/app/vue.config.js | 3 + src/app/yarn.lock | 6092 +++++++++-------- 39 files changed, 3176 insertions(+), 4029 deletions(-) delete mode 100644 src/app/.babelrc create mode 100644 src/app/.browserslistrc delete mode 100644 src/app/.editorconfig delete mode 100644 src/app/.eslintignore create mode 100644 src/app/babel.config.js delete mode 100644 src/app/build/build.js delete mode 100644 src/app/build/check-versions.js delete mode 100644 src/app/build/dev-client.js delete mode 100644 src/app/build/dev-server.js delete mode 100644 src/app/build/utils.js delete mode 100644 src/app/build/vue-loader.conf.js delete mode 100644 src/app/build/webpack.base.conf.js delete mode 100644 src/app/build/webpack.dev.conf.js delete mode 100644 src/app/build/webpack.prod.conf.js delete mode 100644 src/app/build/webpack.test.conf.js delete mode 100644 src/app/config/dev.env.js delete mode 100644 src/app/config/index.js delete mode 100644 src/app/config/prod.env.js delete mode 100644 src/app/config/test.env.js delete mode 100644 src/app/index.html create mode 100644 src/app/public/favicon.ico create mode 100644 src/app/public/index.html rename src/app/src/{router/index.js => router.js} (78%) delete mode 100644 src/app/test/e2e/custom-assertions/elementCount.js delete mode 100644 src/app/test/e2e/nightwatch.conf.js delete mode 100644 src/app/test/e2e/runner.js delete mode 100644 src/app/test/e2e/specs/test.js delete mode 100644 src/app/test/unit/.eslintrc delete mode 100644 src/app/test/unit/index.js delete mode 100644 src/app/test/unit/karma.conf.js delete mode 100644 src/app/test/unit/specs/.gitkeep create mode 100644 src/app/vue.config.js diff --git a/src/app/.babelrc b/src/app/.babelrc deleted file mode 100644 index c06df4d..0000000 --- a/src/app/.babelrc +++ /dev/null @@ -1,18 +0,0 @@ -{ - "presets": [ - ["env", { - "modules": false, - "targets": { - "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] - } - }], - "stage-2" - ], - "plugins": ["transform-runtime"], - "env": { - "test": { - "presets": ["env", "stage-2"], - "plugins": ["istanbul"] - } - } -} diff --git a/src/app/.browserslistrc b/src/app/.browserslistrc new file mode 100644 index 0000000..9dee646 --- /dev/null +++ b/src/app/.browserslistrc @@ -0,0 +1,3 @@ +> 1% +last 2 versions +not ie <= 8 diff --git a/src/app/.editorconfig b/src/app/.editorconfig deleted file mode 100644 index 9d08a1a..0000000 --- a/src/app/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true diff --git a/src/app/.eslintignore b/src/app/.eslintignore deleted file mode 100644 index 34af377..0000000 --- a/src/app/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -build/*.js -config/*.js diff --git a/src/app/.eslintrc.js b/src/app/.eslintrc.js index 67c085d..98d0431 100644 --- a/src/app/.eslintrc.js +++ b/src/app/.eslintrc.js @@ -1,27 +1,17 @@ -// http://eslint.org/docs/user-guide/configuring - module.exports = { root: true, - parser: 'babel-eslint', - parserOptions: { - sourceType: 'module' - }, env: { - browser: true, + node: true }, - // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style - extends: 'standard', - // required to lint *.vue files - plugins: [ - 'html' + 'extends': [ + 'plugin:vue/essential', + '@vue/standard' ], - // add your custom rules here - 'rules': { - // allow paren-less arrow functions - 'arrow-parens': 0, - // allow async-await - 'generator-star-spacing': 0, - // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0 + rules: { + 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + }, + parserOptions: { + parser: 'babel-eslint' } } diff --git a/src/app/.gitignore b/src/app/.gitignore index 8ade6ea..d20aef9 100644 --- a/src/app/.gitignore +++ b/src/app/.gitignore @@ -1,19 +1,24 @@ .DS_Store -node_modules/ -dist/ +node_modules +/dist + +# local env files +.env.local +.env.*.local + +# Log files npm-debug.log* yarn-debug.log* yarn-error.log* -test/unit/coverage -test/e2e/reports -selenium-debug.log # Editor directories and files .idea +.vscode *.suo *.ntvs* *.njsproj *.sln +*.sw* # Auth0 settings src/auth/auth0-variables.js \ No newline at end of file diff --git a/src/app/.postcssrc.js b/src/app/.postcssrc.js index 09948d6..961986e 100644 --- a/src/app/.postcssrc.js +++ b/src/app/.postcssrc.js @@ -1,8 +1,5 @@ -// https://github.com/michael-ciniawsky/postcss-load-config - module.exports = { - "plugins": { - // to edit target browsers: use "browserslist" field in package.json - "autoprefixer": {} + plugins: { + autoprefixer: {} } } diff --git a/src/app/babel.config.js b/src/app/babel.config.js new file mode 100644 index 0000000..ba17966 --- /dev/null +++ b/src/app/babel.config.js @@ -0,0 +1,5 @@ +module.exports = { + presets: [ + '@vue/app' + ] +} diff --git a/src/app/build/build.js b/src/app/build/build.js deleted file mode 100644 index 6b8add1..0000000 --- a/src/app/build/build.js +++ /dev/null @@ -1,35 +0,0 @@ -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') - -var 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) { - spinner.stop() - if (err) throw err - process.stdout.write(stats.toString({ - colors: true, - modules: false, - children: false, - chunks: false, - chunkModules: false - }) + '\n\n') - - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( - ' Tip: built files are meant to be served over an HTTP server.\n' + - ' Opening index.html over file:// won\'t work.\n' - )) - }) -}) diff --git a/src/app/build/check-versions.js b/src/app/build/check-versions.js deleted file mode 100644 index 100f3a0..0000000 --- a/src/app/build/check-versions.js +++ /dev/null @@ -1,48 +0,0 @@ -var chalk = require('chalk') -var semver = require('semver') -var packageConfig = require('../package.json') -var shell = require('shelljs') -function exec (cmd) { - return require('child_process').execSync(cmd).toString().trim() -} - -var versionRequirements = [ - { - name: 'node', - currentVersion: semver.clean(process.version), - versionRequirement: packageConfig.engines.node - }, -] - -if (shell.which('npm')) { - versionRequirements.push({ - name: 'npm', - currentVersion: exec('npm --version'), - versionRequirement: packageConfig.engines.npm - }) -} - -module.exports = function () { - var warnings = [] - for (var i = 0; i < versionRequirements.length; i++) { - var mod = versionRequirements[i] - if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { - warnings.push(mod.name + ': ' + - chalk.red(mod.currentVersion) + ' should be ' + - chalk.green(mod.versionRequirement) - ) - } - } - - if (warnings.length) { - 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] - console.log(' ' + warning) - } - console.log() - process.exit(1) - } -} diff --git a/src/app/build/dev-client.js b/src/app/build/dev-client.js deleted file mode 100644 index 18aa1e2..0000000 --- a/src/app/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/src/app/build/dev-server.js b/src/app/build/dev-server.js deleted file mode 100644 index ad0d087..0000000 --- a/src/app/build/dev-server.js +++ /dev/null @@ -1,92 +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: () => {}, - heartbeat: 2000 -}) -// 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/src/app/build/utils.js b/src/app/build/utils.js deleted file mode 100644 index b1d54b4..0000000 --- a/src/app/build/utils.js +++ /dev/null @@ -1,71 +0,0 @@ -var path = require('path') -var config = require('../config') -var ExtractTextPlugin = require('extract-text-webpack-plugin') - -exports.assetsPath = function (_path) { - var 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 = { - loader: 'css-loader', - options: { - minimize: process.env.NODE_ENV === 'production', - sourceMap: options.sourceMap - } - } - - // generate loader string to be used with extract text plugin - function generateLoaders (loader, loaderOptions) { - var loaders = [cssLoader] - if (loader) { - loaders.push({ - loader: loader + '-loader', - options: Object.assign({}, loaderOptions, { - sourceMap: options.sourceMap - }) - }) - } - - // Extract CSS when that option is specified - // (which is the case during production build) - if (options.extract) { - return ExtractTextPlugin.extract({ - use: loaders, - fallback: 'vue-style-loader' - }) - } else { - return ['vue-style-loader'].concat(loaders) - } - } - - // https://vue-loader.vuejs.org/en/configurations/extract-css.html - return { - css: generateLoaders(), - postcss: generateLoaders(), - less: generateLoaders('less'), - sass: generateLoaders('sass', { indentedSyntax: true }), - scss: generateLoaders('sass'), - stylus: generateLoaders('stylus'), - styl: generateLoaders('stylus') - } -} - -// 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] - output.push({ - test: new RegExp('\\.' + extension + '$'), - use: loader - }) - } - return output -} diff --git a/src/app/build/vue-loader.conf.js b/src/app/build/vue-loader.conf.js deleted file mode 100644 index 8a346d5..0000000 --- a/src/app/build/vue-loader.conf.js +++ /dev/null @@ -1,18 +0,0 @@ -var utils = require('./utils') -var config = require('../config') -var isProduction = process.env.NODE_ENV === 'production' - -module.exports = { - loaders: utils.cssLoaders({ - sourceMap: isProduction - ? config.build.productionSourceMap - : config.dev.cssSourceMap, - extract: isProduction - }), - transformToRequire: { - video: 'src', - source: 'src', - img: 'src', - image: 'xlink:href' - } -} diff --git a/src/app/build/webpack.base.conf.js b/src/app/build/webpack.base.conf.js deleted file mode 100644 index f2899c5..0000000 --- a/src/app/build/webpack.base.conf.js +++ /dev/null @@ -1,75 +0,0 @@ -var path = require('path') -var utils = require('./utils') -var config = require('../config') -var vueLoaderConfig = require('./vue-loader.conf') - -function resolve (dir) { - return path.join(__dirname, '..', dir) -} - -module.exports = { - entry: { - app: './src/main.js' - }, - output: { - path: config.build.assetsRoot, - filename: '[name].js', - publicPath: process.env.NODE_ENV === 'production' - ? config.build.assetsPublicPath - : config.dev.assetsPublicPath - }, - resolve: { - extensions: ['.js', '.vue', '.json'], - alias: { - 'vue$': 'vue/dist/vue.esm.js', - '@': resolve('src') - } - }, - module: { - rules: [ - { - test: /\.(js|vue)$/, - loader: 'eslint-loader', - enforce: 'pre', - include: [resolve('src'), resolve('test')], - options: { - formatter: require('eslint-friendly-formatter') - } - }, - { - test: /\.vue$/, - loader: 'vue-loader', - options: vueLoaderConfig - }, - { - test: /\.js$/, - loader: 'babel-loader', - include: [resolve('src'), resolve('test')] - }, - { - test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('img/[name].[hash:7].[ext]') - } - }, - { - 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]') - } - } - ] - } -} diff --git a/src/app/build/webpack.dev.conf.js b/src/app/build/webpack.dev.conf.js deleted file mode 100644 index 5470402..0000000 --- a/src/app/build/webpack.dev.conf.js +++ /dev/null @@ -1,35 +0,0 @@ -var utils = require('./utils') -var webpack = require('webpack') -var config = require('../config') -var merge = require('webpack-merge') -var baseWebpackConfig = require('./webpack.base.conf') -var HtmlWebpackPlugin = require('html-webpack-plugin') -var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') - -// 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]) -}) - -module.exports = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap }) - }, - // cheap-module-eval-source-map is faster for development - devtool: '#cheap-module-eval-source-map', - plugins: [ - new webpack.DefinePlugin({ - 'process.env': config.dev.env - }), - // https://github.com/glenjamin/webpack-hot-middleware#installation--usage - new webpack.HotModuleReplacementPlugin(), - new webpack.NoEmitOnErrorsPlugin(), - // https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: 'index.html', - template: 'index.html', - inject: true - }), - new FriendlyErrorsPlugin() - ] -}) diff --git a/src/app/build/webpack.prod.conf.js b/src/app/build/webpack.prod.conf.js deleted file mode 100644 index b7406cd..0000000 --- a/src/app/build/webpack.prod.conf.js +++ /dev/null @@ -1,125 +0,0 @@ -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') - -var env = process.env.NODE_ENV === 'testing' - ? require('../config/test.env') - : config.build.env - -var webpackConfig = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ - sourceMap: config.build.productionSourceMap, - extract: true - }), - noParse: [/moment.js/] - }, - devtool: config.build.productionSourceMap ? '#source-map' : false, - output: { - path: config.build.assetsRoot, - filename: utils.assetsPath('js/[name].[chunkhash].js'), - chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') - }, - plugins: [ - // http://vuejs.github.io/vue-loader/en/workflow/production.html - new webpack.DefinePlugin({ - 'process.env': env - }), - new webpack.optimize.UglifyJsPlugin({ - compress: { - warnings: false - }, - sourceMap: true - }), - // extract css into its own file - new ExtractTextPlugin({ - filename: utils.assetsPath('css/[name].[contenthash].css') - }), - // Compress extracted CSS. We are using this plugin so that possible - // duplicated CSS from different components can be deduped. - new OptimizeCSSPlugin({ - cssProcessorOptions: { - safe: true - } - }), - // generate dist index.html with correct asset hash for caching. - // you can customize output by editing /index.html - // see https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: process.env.NODE_ENV === 'testing' - ? 'index.html' - : config.build.index, - template: 'index.html', - inject: true, - minify: { - removeComments: true, - collapseWhitespace: true, - removeAttributeQuotes: true - // more options: - // https://github.com/kangax/html-minifier#options-quick-reference - }, - // necessary to consistently work with multiple chunks via CommonsChunkPlugin - chunksSortMode: 'dependency' - }), - // split vendor js into its own file - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - minChunks: function (module, count) { - // any required modules inside node_modules are extracted to vendor - return ( - module.resource && - /\.js$/.test(module.resource) && - module.resource.indexOf( - path.join(__dirname, '../node_modules') - ) === 0 - ) - } - }), - // extract webpack runtime and module manifest to its own file in order to - // prevent vendor hash from being updated whenever app bundle is updated - new webpack.optimize.CommonsChunkPlugin({ - name: 'manifest', - chunks: ['vendor'] - }), - // copy custom static assets - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, '../static'), - to: config.build.assetsSubDirectory, - ignore: ['.*'] - } - ]) - ] -}) - -if (config.build.productionGzip) { - var CompressionWebpackPlugin = require('compression-webpack-plugin') - - webpackConfig.plugins.push( - new CompressionWebpackPlugin({ - asset: '[path].gz[query]', - algorithm: 'gzip', - test: new RegExp( - '\\.(' + - config.build.productionGzipExtensions.join('|') + - ')$' - ), - threshold: 10240, - minRatio: 0.8 - }) - ) -} - -if (config.build.bundleAnalyzerReport) { - var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin - webpackConfig.plugins.push(new BundleAnalyzerPlugin()) -} - -module.exports = webpackConfig diff --git a/src/app/build/webpack.test.conf.js b/src/app/build/webpack.test.conf.js deleted file mode 100644 index d6c8c8d..0000000 --- a/src/app/build/webpack.test.conf.js +++ /dev/null @@ -1,31 +0,0 @@ -// 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') - -var webpackConfig = merge(baseConfig, { - // use inline sourcemap for karma-sourcemap-loader - module: { - rules: utils.styleLoaders() - }, - devtool: '#inline-source-map', - resolveLoader: { - alias: { - // 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' - } - }, - plugins: [ - new webpack.DefinePlugin({ - 'process.env': require('../config/test.env') - }) - ] -}) - -// no need for app entry during tests -delete webpackConfig.entry - -module.exports = webpackConfig diff --git a/src/app/config/dev.env.js b/src/app/config/dev.env.js deleted file mode 100644 index efead7c..0000000 --- a/src/app/config/dev.env.js +++ /dev/null @@ -1,6 +0,0 @@ -var merge = require('webpack-merge') -var prodEnv = require('./prod.env') - -module.exports = merge(prodEnv, { - NODE_ENV: '"development"' -}) diff --git a/src/app/config/index.js b/src/app/config/index.js deleted file mode 100644 index 8ee05a1..0000000 --- a/src/app/config/index.js +++ /dev/null @@ -1,38 +0,0 @@ -// see http://vuejs-templates.github.io/webpack for documentation. -var path = require('path') - -module.exports = { - build: { - env: require('./prod.env'), - index: path.resolve(__dirname, '../../api/MyPrayerJournal.Api/wwwroot/index.html'), - assetsRoot: path.resolve(__dirname, '../../api/MyPrayerJournal.Api/wwwroot'), - assetsSubDirectory: 'static', - assetsPublicPath: '/', - productionSourceMap: true, - // 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/src/app/config/prod.env.js b/src/app/config/prod.env.js deleted file mode 100644 index 773d263..0000000 --- a/src/app/config/prod.env.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - NODE_ENV: '"production"' -} diff --git a/src/app/config/test.env.js b/src/app/config/test.env.js deleted file mode 100644 index 89f90de..0000000 --- a/src/app/config/test.env.js +++ /dev/null @@ -1,6 +0,0 @@ -var merge = require('webpack-merge') -var devEnv = require('./dev.env') - -module.exports = merge(devEnv, { - NODE_ENV: '"testing"' -}) diff --git a/src/app/index.html b/src/app/index.html deleted file mode 100644 index 6082ad6..0000000 --- a/src/app/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - myPrayerJournal - - - -
- - - diff --git a/src/app/package.json b/src/app/package.json index 4ece02c..9c392dc 100644 --- a/src/app/package.json +++ b/src/app/package.json @@ -1,107 +1,36 @@ { "name": "my-prayer-journal", - "version": "0.9.7", + "version": "0.9.8", "description": "myPrayerJournal - Front End", "author": "Daniel J. Summers ", "private": true, "scripts": { - "dev": "node build/dev-server.js", - "start": "node build/dev-server.js", - "build": "node build/build.js", - "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run", - "e2e": "node test/e2e/runner.js", - "test": "npm run unit && npm run e2e", - "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs", + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", "apistart": "cd ../api/MyPrayerJournal.Api && dotnet run", - "vue": "node build/build.js prod && cd ../api/MyPrayerJournal.Api && dotnet run" + "vue": "vue-cli-service build && cd ../api/MyPrayerJournal.Api && dotnet run" }, "dependencies": { - "auth0-js": "^9.3.3", + "auth0-js": "^9.7.3", "axios": "^0.18.0", - "bootstrap": "^4.0.0", - "bootstrap-vue": "^1.0.0-beta.9", - "moment": "^2.18.1", - "pug": "^2.0.1", - "vue": "^2.5.15", + "bootstrap": "^4.1.3", + "bootstrap-vue": "^2.0.0-rc.11", + "moment": "^2.22.2", + "pug": "^2.0.3", + "vue": "^2.5.17", "vue-awesome": "^2.3.3", - "vue-progressbar": "^0.7.3", - "vue-router": "^3.0.0", + "vue-progressbar": "^0.7.5", + "vue-router": "^3.0.1", "vue-toast": "^3.1.0", - "vuex": "^3.0.0" + "vuex": "^3.0.1" }, "devDependencies": { - "autoprefixer": "^7.1.4", - "babel-core": "^6.26.0", - "babel-eslint": "^7.1.1", - "babel-loader": "^7.1.2", - "babel-plugin-istanbul": "^4.1.5", - "babel-plugin-transform-runtime": "^6.22.0", - "babel-preset-env": "^1.3.2", - "babel-preset-stage-2": "^6.22.0", - "babel-register": "^6.26.0", - "chai": "^3.5.0", - "chalk": "^2.1.0", - "chromedriver": "^2.32.3", - "connect-history-api-fallback": "^1.3.0", - "copy-webpack-plugin": "^4.0.1", - "cross-env": "^5.0.5", - "cross-spawn": "^5.0.1", - "css-loader": "^0.28.7", - "cssnano": "^3.10.0", - "eslint": "^3.19.0", - "eslint-config-standard": "^6.2.1", - "eslint-friendly-formatter": "^3.0.0", - "eslint-loader": "^1.7.1", - "eslint-plugin-html": "^3.2.2", - "eslint-plugin-promise": "^3.4.0", - "eslint-plugin-standard": "^2.0.1", - "eventsource-polyfill": "^0.9.6", - "express": "^4.15.4", - "extract-text-webpack-plugin": "^2.0.0", - "file-loader": "^0.11.1", - "friendly-errors-webpack-plugin": "^1.1.3", - "html-webpack-plugin": "^2.30.1", - "http-proxy-middleware": "^0.17.3", - "inject-loader": "^3.0.1", - "karma": "^1.7.1", - "karma-coverage": "^1.1.1", - "karma-mocha": "^1.3.0", - "karma-phantomjs-launcher": "^1.0.2", - "karma-phantomjs-shim": "^1.4.0", - "karma-sinon-chai": "^1.3.2", - "karma-sourcemap-loader": "^0.3.7", - "karma-spec-reporter": "0.0.31", - "karma-webpack": "^2.0.2", - "lolex": "^1.5.2", - "mocha": "^3.5.3", - "nightwatch": "^0.9.12", - "opn": "^5.1.0", - "optimize-css-assets-webpack-plugin": "^2.0.0", - "ora": "^1.2.0", - "phantomjs-prebuilt": "^2.1.15", - "rimraf": "^2.6.2", - "selenium-server": "^3.5.3", - "semver": "^5.4.1", - "shelljs": "^0.7.6", - "sinon": "^2.4.1", - "sinon-chai": "^2.13.0", - "url-loader": "^0.5.8", - "vue-loader": "^12.1.0", - "vue-style-loader": "^3.0.3", - "vue-template-compiler": "^2.4.4", - "webpack": "^2.6.1", - "webpack-bundle-analyzer": "^2.9.0", - "webpack-dev-middleware": "^1.12.0", - "webpack-hot-middleware": "^2.19.1", - "webpack-merge": "^4.1.0" - }, - "engines": { - "node": ">= 4.0.0", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not ie <= 8" - ] + "@vue/cli-plugin-babel": "^3.0.0", + "@vue/cli-plugin-eslint": "^3.0.0", + "@vue/cli-service": "^3.0.0", + "@vue/eslint-config-standard": "^3.0.0", + "pug-plain-loader": "^1.0.0", + "vue-template-compiler": "^2.5.17" + } } diff --git a/src/app/public/favicon.ico b/src/app/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c7b9a43c8cd16d0b434adaf513fcacb340809a11 GIT binary patch literal 1150 zcmchVOGsN$5QZm2NTI$erQpKHrdQX(jn+pVxKN`Ng)RzW5+8_2Xb@Y)Dkd6tq9V8u z3WAh^C@KZ1kA;tohzs}b3NC_*QmUXr$oP*rH(2mdT{z*(KX=aj=bX$9kqMvFRKj;Q zwI&d~A);J>5-PDega~WT5us%#Dc(Y}C4WpP?+fS;FaZ*z_CFzgiW=w{I02=q_TUz( z?=^H2uwoIK1n%|Ay21~QgjV1emYtWttJdz^L#=DjJ@Ex*9UPc*7<=rZo*_NAh4PxA zqkso~Ioa1y$e+3kIkXi29YNLi&lW}vY6C}ut4{8ou(7w=$_=$v{yJ$h?y!&bJfq*( zL_NQRF37$6e>%9erGV?p^lRFD?|5J_eupXaS;QluyrOmBT>PJhirMYb*i?(4Tf=j~?VvnUlY_ zDCVuuk3E&T9aP~Cr-0i-MaKUjf_|U!=R&t}_CfD=d${p~HH`BPaqb9aXT}UI$iGRg z>0^GlZ`vM4?;$*LhfI(RG|XK4GF+@-W*W}YJT5&2N_ZyZuaM_Ry=%PWx>r0P(Rc?> jRc4}SfGA>*agjwN{7E7DEm(*)%rSx{B0<6wBoglxJAy|R literal 0 HcmV?d00001 diff --git a/src/app/public/index.html b/src/app/public/index.html new file mode 100644 index 0000000..63dbfd1 --- /dev/null +++ b/src/app/public/index.html @@ -0,0 +1,17 @@ + + + + + + + + myPrayerJournal + + + +
+ + + diff --git a/src/app/src/App.vue b/src/app/src/App.vue index 92f0291..5da64a5 100644 --- a/src/app/src/App.vue +++ b/src/app/src/App.vue @@ -1,72 +1,31 @@ -