Permalink
Browse files

fix(tarsks): revert 8766c08, it doesn't work when `assetsUrlPrefix` i…

…s set
  • Loading branch information...
sparanoid committed Sep 11, 2018
1 parent 5941319 commit 712f0ac635e07e78e26442d2d9a074b6b68c2fa4
Showing with 19 additions and 8 deletions.
  1. +17 −6 package-lock.json
  2. +2 −2 tasks/assets_inline.js

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -192,7 +192,7 @@ module.exports = function(grunt) {
} else {
var filePath = (style.substr(0, 1) === "/") ? path.resolve(options.cssDir, style.substr(1)) : path.join(path.dirname(filePair.src.toString()), style);
styles_dom_link_stylesheets[i].outerHTML = options.cssTags.start + grunt.file.read(filePath).replace(/(\.{2}\/)+/g, options.assetsUrlPrefix + '/') + options.cssTags.end;
styles_dom_link_stylesheets[i].outerHTML = options.cssTags.start + grunt.file.read(filePath).replace(/(\.{2}\/)+/g, options.assetsUrlPrefix) + options.cssTags.end;
var deleteFlag = (' (will keep)').gray;
if (deleteOriginal) {
@@ -231,7 +231,7 @@ module.exports = function(grunt) {
var filePath = (script.substr(0, 1) === "/") ? path.resolve(options.jsDir, script.substr(1)) : path.join(path.dirname(filePair.src.toString()), script);
//create and replace script with new scipt tag
scripts_dom[i].outerHTML = options.jsTags.start + uglifyJS(grunt.file.read(filePath).replace(/(\.{2}\/)+/g, options.assetsUrlPrefix + '/')) + options.jsTags.end;
scripts_dom[i].outerHTML = options.jsTags.start + uglifyJS(grunt.file.read(filePath).replace(/(\.{2}\/)+/g, options.assetsUrlPrefix)) + options.jsTags.end;
var deleteFlag = (' (will keep)').gray;
if (deleteOriginal) {

0 comments on commit 712f0ac

Please sign in to comment.