Skip to content

Prototype new jcarlson #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcarlsonrp99 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prototype new jcarlson #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a85262b
changes to files to fix some todos - optimization, mode settting, and…
jcarlsonrp99 Oct 21, 2019
78cb83a
Added terser webpack plugin and unminified webpack plugin to handle t…
jcarlsonrp99 Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ const sass = require('gulp-sass');
const sourcemaps = require('gulp-sourcemaps');
const svgmin = require('gulp-svgmin');
const vinylNamed = require('vinyl-named'); // allows use of [name] in gulp-webpack output
const webpackConfig = require("./webpack.config");
const webpack = require('webpack');
const webpackStream = require('webpack-stream'); // Webpack enabled for use mid-stream



/* INCLUDE & INJECT Task ================================================= */
// Inject Component Partials to Page Layouts, Inject CSS/JS Bundles
function include() {
Expand All @@ -29,7 +30,7 @@ function include() {
}))
// CSS + JS Inject
.pipe(inject(
gulp.src(['./src/Styles/dist/main.css', './src/Scripts/dist/main.bundle.js'], { read: false }), { relative: true })) // *DEV
gulp.src(['./src/Styles/dist/main.css', './src/Scripts/dist/main.bundle.js'], { read: false, allowEmpty: true }), { relative: true })) // *DEV
// gulp.src(['./src/Styles/dist/main.min.css', './src/Scripts/dist/main.bundle.min.js'], { read: false }), { relative: true })) // *PROD
.pipe(gulp.dest('./src/Pages/dist'))
.pipe(browserSync.stream());
Expand Down Expand Up @@ -76,8 +77,9 @@ function minstyles() {
function scripts() {
// Source
return gulp.src(['src/Scripts/src/main.js'], {base: "./src/Scripts/src"})
.pipe(sourcemaps.init())
.pipe(vinylNamed())
.pipe(webpackStream(webpackConfig))
.pipe(webpackStream(require('./webpack.config'), webpack))
.pipe(gulp.dest('./src/Scripts/dist'))
// Stream update to browsers
.pipe(browserSync.stream());
Expand Down Expand Up @@ -128,7 +130,7 @@ function watch() {
gulp.watch('./src/Styles/**/*.scss', styles);
// HTML
gulp.watch('./src/Components/**/*.html', include);
//gulp.watch('./src/**/*.html').on('change', browserSync.reload);
gulp.watch('./src/**/*.html').on('change', browserSync.reload);
// JS
gulp.watch('./src/Scripts/src/**/*.js', scripts);
// IMAGES
Expand All @@ -137,10 +139,11 @@ function watch() {
// gulp.watch('./src/Images/src/**/*.svg', svgo); // *Optional
}


/* More Complex Tasks ================================================= */
//const build = gulp.parallel(styles, minstyles, scripts, include, images, svgo);
const build = gulp.series(styles, gulp.parallel(minstyles, scripts, include, images, svgo));
const serve = gulp.series(styles, minstyles, scripts, include, images, svgo, gulp.parallel(watch));
const serve = gulp.series(styles, minstyles, scripts, include, images, svgo, gulp.parallel(watch));

// Export All Tasks
exports.styles = styles;
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"gulp-watch": "^4.3.5",
"jshint": "^2.10.2",
"jshint-loader": "^0.8.4",
"uglifyjs-webpack-plugin": "^2.2.0",
"terser-webpack-plugin": "^2.2.1",
"unminified-webpack-plugin": "^2.0.0",
"vinyl": "^2.2.0",
"vinyl-named": "^1.1.0",
"webpack": "^4.31.0",
Expand Down
14 changes: 7 additions & 7 deletions src/Images/dist/cat.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/Pages/dist/homepage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
<link rel="stylesheet" href="../../Styles/dist/main.css">
<!-- endinject -->
</head>

<body>
<body>

<!-- HEADER ============================== -->
<header>
(Header)
</header>
<!-- / HEADER ============================ -->

<!-- FOOTER ============================== -->
<footer>
(Footer)
Expand Down
5 changes: 2 additions & 3 deletions src/Pages/src/homepage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
<!-- inject:css -->
<!-- endinject -->
</head>

<body>
<body>

<!-- HEADER ============================== -->
@@include('../../components/header.html')
<!-- / HEADER ============================ -->

<!-- FOOTER ============================== -->
@@include('../../components/footer.html')
<!-- / FOOTER ============================ -->
Expand Down
2 changes: 1 addition & 1 deletion src/Scripts/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
// Globals ========================================================= *
// Bootstrap
import './Globals/bootstrap-setup.js';
// Scripts ========================================================= *
// Scripts ========================================================= *
1 change: 1 addition & 0 deletions src/Styles/src/Components/Header/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// @import "../../globals/mixins";

header {

}

@import "header-mobile";
1 change: 1 addition & 0 deletions src/Styles/src/_globals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ $container-max-widths: (
// @import "..././../node_modules/bootstrap/scss/images";
// @import "../../../node_modules/bootstrap/scss/code";
@import "../../../node_modules/bootstrap/scss/grid";
@import "../../../node_modules/bootstrap/scss/utilities";
/* GLOBALS ---------------------------------------------------------------- */
@import "Globals/variables";
@import "Globals/fonts";
Expand Down
30 changes: 20 additions & 10 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
const webpack = require('webpack');
const path = require('path');
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
const TerserPlugin = require('terser-webpack-plugin');
const UnminifiedWebpackPlugin = require('unminified-webpack-plugin');

module.exports = {
//entry: './src/Scripts/src/main.js',
entry: {
"bundle": "./src/Scripts/src/main.js",
//"bundle.min": "./src/Scripts/src/main.js", *TODO - Erroring out
//"bundle.min": "./src/Scripts/src/main.js"
},
devtool: 'inline-source-map',
//Turns off the 244k asset limit warning
performance: {hints: false},

devtool: 'source-map',
output: {
filename: 'main.bundle.js',
filename: 'main.[name].min.js',
path: path.resolve(__dirname, 'dist')
},
// optimization: { *TODO - Erroring out
// minimize: true,
// minimizer: [new UglifyJsPlugin({
// include: /\.min\.js$/
// })]
// },
optimization: {
minimize: true,
minimizer: [new TerserPlugin({
sourceMap: true,
include: /\.min\.js$/
})]
},
plugins: [
new UnminifiedWebpackPlugin()
],


// Support for Individual Bootstrap Component Loading
module: {
rules: [{
Expand Down