Skip to content

mincer@2.0.0 #361

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.

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

Merged
merged 3 commits into from
Mar 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Changes By Release

## 6.0.0 (coming soon)
## 6.0.0
- drop support for Node.js versions older than 6
- mincer upgrade to 2.0.0. (fixes connect-assets security warnings)

## 5.4.1
* Fix denial of service in mime: `1.3.4` -> `1.4.1`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"argparse": "1.0.7",
"csswring": "5.0.0",
"mime": "1.4.1",
"mincer": "1.5.0",
"mincer": "2.0.0",
"postcss": "5.0.21",
"uglify-js": "2.6.2"
},
Expand Down
4 changes: 2 additions & 2 deletions test/bin.connect-assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ describe("connect-assets command-line interface", function () {

var css = dir + '/' + manifest.assets['asset-path-helper.css'];

expect(fs.readFileSync(css, "utf8")).to.equal("@import\"/assets/asset-803e3564c7d54bc317c74860da9cb559.css\"");
expect(fs.readFileSync(css, "utf8")).to.equal("@import\"/assets/asset-56556c1dc82a2b1cb6b202d639294580.css\"");
rmrf("builtAssets", done);
});
});
Expand All @@ -108,7 +108,7 @@ describe("connect-assets command-line interface", function () {

var css = dir + '/' + manifest.assets['asset-path-helper.css'];

expect(fs.readFileSync(css, "utf8")).to.equal("@import\"//cdn.example.com/asset-803e3564c7d54bc317c74860da9cb559.css\"");
expect(fs.readFileSync(css, "utf8")).to.equal("@import\"//cdn.example.com/asset-56556c1dc82a2b1cb6b202d639294580.css\"");
rmrf("builtAssets", done);
});
});
Expand Down
2 changes: 1 addition & 1 deletion test/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe("helper functions", function () {
var instance = assets({ helperContext: ctx, paths: "test/assets/css", fingerprinting: true });
var files = ctx.assetPath("blank.css");

expect(files).to.equal("/assets/blank-803e3564c7d54bc317c74860da9cb559.css");
expect(files).to.equal("/assets/blank-56556c1dc82a2b1cb6b202d639294580.css");
});

describe("css", function () {
Expand Down
4 changes: 2 additions & 2 deletions test/serveAsset.asset_path-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ describe("serveAsset asset_path environment helper", function () {

createServer.call(this, { build: true, buildDir: dir, compile: true, fingerprinting: true }, function () {
var path = this.assetPath("asset-path-helper.css");
var filename = dir + "/asset-path-helper-666ddf2ad0d86c0d850f5b814b8bd95d.css";
var filename = dir + "/asset-path-helper-be6f36ded7f50aa8d41b9cbaa845f947.css";
var url = this.host + path;

http.get(url, function (res) {
expect(res.statusCode).to.equal(200);
expect(fs.statSync(dir).isDirectory()).to.equal(true);
expect(fs.statSync(filename).isFile()).to.equal(true);
expect(fs.readFileSync(filename, "utf8")).to.equal("@import \"/assets/asset-803e3564c7d54bc317c74860da9cb559.css\";\n\n");
expect(fs.readFileSync(filename, "utf8")).to.equal("@import \"/assets/asset-56556c1dc82a2b1cb6b202d639294580.css\";\n\n");
process.env.NODE_ENV = env;
rmrf(dir, done);
});
Expand Down
2 changes: 1 addition & 1 deletion test/serveAsset.filesystem.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe("serveAsset filesystem", function () {
http.get(url, function (res) {
expect(res.statusCode).to.equal(200);
expect(fs.statSync(dir).isDirectory()).to.equal(true);
expect(fs.statSync(dir + "/blank-35c36e89ef751b74c7aa3b07d7e0f6b6.css").isFile()).to.equal(true);
expect(fs.statSync(dir + "/blank-d233662f9c26d1a06118c93ef2fd1de9.css").isFile()).to.equal(true);

process.env.NODE_ENV = env;
rmrf(dir, done);
Expand Down
4 changes: 2 additions & 2 deletions test/serveAsset.minification.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe("serveAsset minification", function () {

createServer.call(this, { buildDir: dir }, function () {
var path = this.assetPath("unminified.js");
var filename = dir + "/unminified-1b4d814ab33407aa1c93fd3667bcd2d4.js";
var filename = dir + "/unminified-f874917b483697cfb3d68c039e18aa3a.js";
var url = this.host + path;

http.get(url, function (res) {
Expand All @@ -36,7 +36,7 @@ describe("serveAsset minification", function () {

createServer.call(this, { buildDir: dir }, function () {
var path = this.assetPath("unminified.css");
var filename = dir + "/unminified-1d5c23fa3c5aa9de6b179cba8d59f419.css";
var filename = dir + "/unminified-2287e6ec80a4728c5d4911b58f1ce3b0.css";
var url = this.host + path;

http.get(url, function (res) {
Expand Down