Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

Commit

Permalink
v0.15.5 (#1897)
Browse files Browse the repository at this point in the history 
* merge changes from buffalo-cli into main repo

* cache deps before building and copying source (#1884)

cache deps before building and copying source so that we don't need to re-download as much
and so that source changes don't invalidate our downloaded layer

* Generator resource action test breaks with unused imports fixes #1893 (#1894)

* Generator resource action test breaks with unused imports fixes #1893

* break packr cache

* fix broken test

* update deps (#1896)

* update deps

* update envy

* update meta

* switch to tags/v3 for consistency (#1901)

* update helpers/tags

* update validate

Co-authored-by: Dr Nic Williams <drnicwilliams@gmail.com>
Co-authored-by: HD Moore <x@hdm.io>
  • Loading branch information
@markbates @drnic @hdm
3 people committed Feb 6, 2020
1 parent 6773bfc commit 3580837
Show file tree
Hide file tree
Showing 34 changed files with 2,350 additions and 1,786 deletions.
1 change: 1 addition & 0 deletions Makefile
View file
Expand Up @@ -25,6 +25,7 @@ build:
make tidy

test:
packr2
$(GO_BIN) test -tags ${TAGS} -cover ./...
packr2
make tidy
Expand Down
38 changes: 19 additions & 19 deletions genny/assets/webpack/templates/package.json.tmpl
View file
Expand Up @@ -9,36 +9,36 @@
},
"repository": "github.com/gobuffalo/buffalo",
"dependencies": {
"bootstrap": "4.3.1",
"popper.js": "^1.14.4",
"@fortawesome/fontawesome-free": "^5.8.1",
"bootstrap": "4.4.1",
"popper.js": "^1.16.0",
"@fortawesome/fontawesome-free": "^5.12.0",
"jquery": "~3.4.1",
"jquery-ujs": "~1.2.2"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"babel-loader": "^8.0.5",
"@babel/cli": "^7.7.7",
"@babel/core": "^7.7.7",
"@babel/preset-env": "^7.7.7",

"css-loader": "~1.0.0",
"babel-loader": "^8.0.6",
"css-loader": "~1.0.1",
"expose-loader": "~0.7.5",
"file-loader": "~2.0.0",
"file-loader": "~5.0.2",
"gopherjs-loader": "^0.0.1",
"sass-loader": "~7.1.0",
"style-loader": "~0.23.0",
"url-loader": "~1.1.1",
"sass-loader": "~8.0.0",
"style-loader": "~1.1.2",
"url-loader": "~3.0.0",

"npm-install-webpack-plugin": "4.0.5",
"uglifyjs-webpack-plugin": "~1.3.0",
"mini-css-extract-plugin": "^0.4.2",
"terser-webpack-plugin": "~2.3.1",
"mini-css-extract-plugin": "^0.9.0",
"webpack-clean-obsolete-chunks": "^0.4.0",
"copy-webpack-plugin": "~4.5.2",
"copy-webpack-plugin": "~5.1.1",

"webpack": "~4.5.0",
"webpack-cli": "3.1.0",
"webpack-livereload-plugin":"2.1.1",
"webpack": "~4.41.4",
"webpack-cli": "^3.3.10",
"webpack-livereload-plugin": "~2.2.0",
"webpack-manifest-plugin": "~2.0.0",
"node-sass": "~4.12.0"
"webpack-manifest-plugin": "~2.2.0"
}
}
26 changes: 15 additions & 11 deletions genny/assets/webpack/templates/webpack.config.js.tmpl
View file
Expand Up @@ -3,9 +3,9 @@ const Glob = require("glob");
const CopyWebpackPlugin = require("copy-webpack-plugin");
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const ManifestPlugin = require("webpack-manifest-plugin");
const CleanObsoleteChunks = require('webpack-clean-obsolete-chunks');
const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
const LiveReloadPlugin = require('webpack-livereload-plugin');
const CleanObsoleteChunks = require("webpack-clean-obsolete-chunks");
const TerserPlugin = require("terser-webpack-plugin");
const LiveReloadPlugin = require("webpack-livereload-plugin");

const configurator = {
entries: function(){
Expand Down Expand Up @@ -92,17 +92,21 @@ const configurator = {
return config
}

const uglifier = new UglifyJsPlugin({
uglifyOptions: {
beautify: false,
mangle: {keep_fnames: true},
output: {comments: false},
compress: {}
}
const terser = new TerserPlugin({
terserOptions: {
compress: {},
mangle: {
keep_fnames: true
},
output: {
comments: false,
},
},
extractComments: false,
})

config.optimization = {
minimizer: [uglifier]
minimizer: [terser]
}

return config
Expand Down
19 changes: 11 additions & 8 deletions genny/build/_fixtures/coke/package.json
View file
Expand Up @@ -3,20 +3,23 @@
"version": "1.0.0",
"main": "index.js",
"license": "MIT",
"scripts": {
"dev": "webpack --watch",
"build": "webpack -p --progress"
},
"repository": "github.com/gobuffalo/buffalo",
"dependencies": {
"bootstrap": "4.3.1",
"popper.js": "^1.14.4",
"font-awesome": "~4.7.0",
"@fortawesome/fontawesome-free": "^5.8.1",
"jquery": "~3.4.1",
"jquery-ujs": "~1.2.2"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"babel-loader": "^8.0.0-beta.6",

"babel-loader": "^8.0.5",

"css-loader": "~1.0.0",
"expose-loader": "~0.7.5",
Expand All @@ -27,15 +30,15 @@
"url-loader": "~1.1.1",

"npm-install-webpack-plugin": "4.0.5",
"uglifyjs-webpack-plugin": "~1.3.0",
"terser-webpack-plugin": "~2.3.1",
"mini-css-extract-plugin": "^0.4.2",
"webpack-clean-obsolete-chunks": "^0.4.0",
"copy-webpack-plugin": "~4.5.2",
"copy-webpack-plugin": "~5.1.1",

"webpack": "~4.5.0",
"webpack": "~4.41.4",
"webpack-cli": "3.1.0",
"webpack-livereload-plugin":"2.1.1",
"webpack-livereload-plugin": "2.1.1",
"webpack-manifest-plugin": "~2.0.0",
"node-sass": "~4.9.0"
"node-sass": "~4.12.0"
}
}
23 changes: 12 additions & 11 deletions genny/build/_fixtures/coke/webpack.config.js
View file
@@ -1,12 +1,11 @@
const Webpack = require("webpack");
const Glob = require("glob");
const path = require("path");
const CopyWebpackPlugin = require("copy-webpack-plugin");
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const ManifestPlugin = require("webpack-manifest-plugin");
const CleanObsoleteChunks = require('webpack-clean-obsolete-chunks');
const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
const LiveReloadPlugin = require('webpack-livereload-plugin');
const CleanObsoleteChunks = require("webpack-clean-obsolete-chunks");
const TerserPlugin = require("terser-webpack-plugin");
const LiveReloadPlugin = require("webpack-livereload-plugin");

const configurator = {
entries: function(){
Expand Down Expand Up @@ -93,17 +92,19 @@ const configurator = {
return config
}

const uglifier = new UglifyJsPlugin({
uglifyOptions: {
beautify: false,
const terser = new TerserPlugin({
terserOptions: {
compress: {},
mangle: {keep_fnames: true},
output: {comments: false},
compress: {}
}
output: {
comments: false,
},
},
extractComments: false,
})

config.optimization = {
minimizer: [uglifier]
minimizer: [terser]
}

return config
Expand Down

0 comments on commit 3580837

Please sign in to comment.