Merge pull request #1185 from ONSdigital/eq-1025-failed-requests-for-…

…urls-containing-no_source

Failed requests for URLs containing <no source> (Issue)

app/assets/styles/themes/census/fixed.scss

@@ -1,18 +1,18 @@
 $responsive: false;
 
-@import "partials/helpers/**/*.scss";
-@import "vars/*.scss";
+@import "../../vars/*.scss";
+@import "../../partials/helpers/*.scss";
 
 $grid-max-width: 800px;
 
-@import "partials/vars/*.scss";
+@import "../../partials/vars/*.scss";
 @import "theme_vars.scss";
-@import "partials/vendor/normalize.scss";
-@import "partials/base/**/*.scss";
-@import "partials/objects/**/*.scss";
-@import "partials/components/**/*.scss";
-@import "partials/utilities/**/*.scss";
-@import "partials/hacks/**/*.scss";
+@import "../../partials/vendor/normalize.scss";
+@import "../../partials/base/**/*.scss";
+@import "../../partials/objects/**/*.scss";
+@import "../../partials/components/**/*.scss";
+@import "../../partials/utilities/**/*.scss";
+@import "../../partials/hacks/**/*.scss";
 
-@import "./components/header.scss";
-@import "./components/footer.scss";
+@import "components/header.scss";
+@import "components/footer.scss";

app/assets/styles/themes/census/responsive.scss

@@ -1,16 +1,16 @@
 $responsive: true;
 
-@import "partials/helpers/**/*.scss";
-@import "partials/vars/*.scss";
+@import "../../partials/helpers/**/*.scss";
+@import "../../partials/vars/*.scss";
 @import "theme_vars.scss";
-@import "partials/vendor/normalize.scss";
-@import "partials/base/**/*.scss";
-@import "partials/objects/**/*.scss";
-@import "partials/components/**/*.scss";
-@import "partials/utilities/**/*.scss";
-@import "partials/hacks/**/*.scss";
+@import "../../partials/vendor/normalize.scss";
+@import "../../partials/base/**/*.scss";
+@import "../../partials/objects/**/*.scss";
+@import "../../partials/components/**/*.scss";
+@import "../../partials/utilities/**/*.scss";
+@import "../../partials/hacks/**/*.scss";
 
-@import "./components/header.scss";
-@import "./components/footer.scss";
+@import "components/header.scss";
+@import "components/footer.scss";
 
 @include panel_type(neutral, $color-purple, #faf4fc);

app/assets/styles/themes/default/fixed.scss

@@ -1,14 +1,14 @@
 $responsive: false;
 
-@import "partials/helpers/**/*.scss";
-@import "vars/*.scss";
+@import "../../partials/helpers/**/*.scss";
+@import "../../vars/*.scss";
 
 $grid-max-width: 800px;
 
-@import "partials/vars/*.scss";
-@import "partials/vendor/normalize.scss";
-@import "partials/base/**/*.scss";
-@import "partials/objects/**/*.scss";
-@import "partials/components/**/*.scss";
-@import "partials/utilities/**/*.scss";
-@import "partials/hacks/**/*.scss";
+@import "../../partials/vars/*.scss";
+@import "../../partials/vendor/normalize.scss";
+@import "../../partials/base/**/*.scss";
+@import "../../partials/objects/**/*.scss";
+@import "../../partials/components/**/*.scss";
+@import "../../partials/utilities/**/*.scss";
+@import "../../partials/hacks/**/*.scss";

app/assets/styles/themes/default/responsive.scss

@@ -1,10 +1,10 @@
 $responsive: true;
 
-@import "partials/helpers/**/*.scss";
-@import "partials/vars/*.scss";
-@import "partials/vendor/normalize.scss";
-@import "partials/base/**/*.scss";
-@import "partials/objects/**/*.scss";
-@import "partials/components/**/*.scss";
-@import "partials/utilities/**/*.scss";
-@import "partials/hacks/**/*.scss";
+@import "../../partials/helpers/**/*.scss";
+@import "../../partials/vars/*.scss";
+@import "../../partials/vendor/normalize.scss";
+@import "../../partials/base/**/*.scss";
+@import "../../partials/objects/**/*.scss";
+@import "../../partials/components/**/*.scss";
+@import "../../partials/utilities/**/*.scss";
+@import "../../partials/hacks/**/*.scss";

app/assets/styles/themes/starwars/fixed.scss

@@ -1,14 +1,14 @@
 $responsive: false;
 
-@import "partials/helpers/**/*.scss";
-@import "vars/*.scss";
+@import "../../vars/*.scss";
+@import "../../partials/helpers/**/*.scss";
 
 $grid-max-width: 800px;
 
-@import "partials/vars/*.scss";
-@import "partials/vendor/normalize.scss";
-@import "partials/base/**/*.scss";
-@import "partials/objects/**/*.scss";
-@import "partials/components/**/*.scss";
-@import "partials/utilities/**/*.scss";
-@import "partials/hacks/**/*.scss";
+@import "../../partials/vars/*.scss";
+@import "../../partials/vendor/normalize.scss";
+@import "../../partials/base/**/*.scss";
+@import "../../partials/objects/**/*.scss";
+@import "../../partials/components/**/*.scss";
+@import "../../partials/utilities/**/*.scss";
+@import "../../partials/hacks/**/*.scss";

app/assets/styles/themes/starwars/responsive.scss

@@ -1,14 +1,14 @@
 $responsive: true;
 
-@import "partials/helpers/**/*.scss";
-@import "partials/vars/*.scss";
+@import "../../partials/helpers/**/*.scss";
+@import "../../partials/vars/*.scss";
 @import "theme_vars.scss";
-@import "partials/vendor/normalize.scss";
-@import "partials/base/**/*.scss";
-@import "partials/objects/**/*.scss";
-@import "partials/components/**/*.scss";
-@import "partials/utilities/**/*.scss";
-@import "partials/hacks/**/*.scss";
+@import "../../partials/vendor/normalize.scss";
+@import "../../partials/base/**/*.scss";
+@import "../../partials/objects/**/*.scss";
+@import "../../partials/components/**/*.scss";
+@import "../../partials/utilities/**/*.scss";
+@import "../../partials/hacks/**/*.scss";
 
 .bar {
   background-color: $color-black;

app/assets/styles/themes/ukis/fixed.scss

@@ -1,14 +1,14 @@
 $responsive: false;
 
-@import "partials/helpers/**/*.scss";
-@import "vars/*.scss";
+@import "../../partials/helpers/**/*.scss";
+@import "../../vars/*.scss";
 
 $grid-max-width: 800px;
 
-@import "partials/vars/*.scss";
-@import "partials/vendor/normalize.scss";
-@import "partials/base/**/*.scss";
-@import "partials/objects/**/*.scss";
-@import "partials/components/**/*.scss";
-@import "partials/utilities/**/*.scss";
-@import "partials/hacks/**/*.scss";
+@import "../../partials/vars/*.scss";
+@import "../../partials/vendor/normalize.scss";
+@import "../../partials/base/**/*.scss";
+@import "../../partials/objects/**/*.scss";
+@import "../../partials/components/**/*.scss";
+@import "../../partials/utilities/**/*.scss";
+@import "../../partials/hacks/**/*.scss";

app/assets/styles/themes/ukis/responsive.scss

@@ -1,10 +1,10 @@
 $responsive: true;
 
-@import "partials/helpers/**/*.scss";
-@import "partials/vars/*.scss";
-@import "partials/vendor/normalize.scss";
-@import "partials/base/**/*.scss";
-@import "partials/objects/**/*.scss";
-@import "partials/components/**/*.scss";
-@import "partials/utilities/**/*.scss";
-@import "partials/hacks/**/*.scss";
+@import "../../partials/helpers/**/*.scss";
+@import "../../partials/vars/*.scss";
+@import "../../partials/vendor/normalize.scss";
+@import "../../partials/base/**/*.scss";
+@import "../../partials/objects/**/*.scss";
+@import "../../partials/components/**/*.scss";
+@import "../../partials/utilities/**/*.scss";
+@import "../../partials/hacks/**/*.scss";

app/settings.py

@@ -36,7 +36,7 @@ def get_env_or_fail(key):
     return value
 
 
-EQ_MINIMIZE_ASSETS = parse_mode(os.getenv('EQ_MINIMIZE_ASSETS', 'False'))
+EQ_MINIMIZE_ASSETS = parse_mode(os.getenv('EQ_MINIMIZE_ASSETS', 'True'))
 # max request payload size in bytes
 MAX_CONTENT_LENGTH = os.getenv('EQ_MAX_HTTP_POST_CONTENT_LENGTH', 65536)
 

gulp/styles.js

@@ -5,7 +5,7 @@ import gutil from 'gulp-util'
 import plumber from 'gulp-plumber'
 import sass from 'gulp-sass'
 import sassGlob from 'gulp-sass-glob'
-import minify from 'gulp-cssnano'
+import cssnano from 'cssnano'
 import autoprefixer from 'autoprefixer'
 import postcss from 'gulp-postcss'
 import pixrem from 'pixrem'
@@ -34,21 +34,30 @@ export function lint() {
 }
 
 export function styles() {
-  const minifyAssets = process.env.EQ_MINIMIZE_ASSETS === 'True'
+  const minifyAssets = process.env.EQ_MINIMIZE_ASSETS === undefined || process.env.EQ_MINIMIZE_ASSETS === 'True'
 
-  const minifyStyles = lazypipe()
-    .pipe(rename, {
-      suffix: '.min'
-    })
-    .pipe(minify, {
+  let postCssPlugins = [
+    autoprefixer({
+      browsers: ['last 2 versions', 'Explorer >= 8', 'Android >= 4.1', 'Safari >= 7', 'iOS >= 7']
+    }),
+    pixrem({
+      replace: false
+    }),
+    inlineblock(),
+    pseudoelements(),
+    reporter({ clearMessages: true })
+  ]
+
+  if (minifyAssets) {
+    postCssPlugins.push(cssnano({
       calc: false,
       discardComments: {
         removeAll: true
       }
-    })
-    .pipe(gulp.dest, paths.styles.output)
+    }))
+  }
 
-  return gulp.src(paths.styles.input)
+  let assets = gulp.src(paths.styles.input)
     .pipe(sourcemaps.init())
     .pipe(plumber())
     .pipe(sassGlob())
@@ -68,23 +77,19 @@ export function styles() {
       browserSync.notify('Browserify Error!')
       this.emit('end')
     }))
-    .pipe(postcss([
-      autoprefixer({
-        browsers: ['last 2 versions', 'Explorer >= 8', 'Android >= 4.1', 'Safari >= 7', 'iOS >= 7']
-      }),
-      pixrem({
-        replace: false
-      }),
-      inlineblock(),
-      pseudoelements(),
-      reporter({ clearMessages: true })
-    ]))
+    .pipe(postcss(postCssPlugins))
     .pipe(rename(function(path) {
       path.dirname = path.dirname.replace('themes/', '')
       return path
     }))
-    .pipe(gulpif(!minifyAssets, sourcemaps.write('.')))
+
+  if (minifyAssets) {
+    assets = assets
+      .pipe(rename({ suffix: '.min' }))
+      .pipe(sourcemaps.write('.'))
+  }
+
+  return assets
     .pipe(gulp.dest(paths.styles.output))
     .pipe(browserSync.reload({ stream: true }))
-    .pipe(gulpif(minifyAssets, minifyStyles()))
 }

package.json

@@ -42,6 +42,7 @@
     "browserstack-local": "^1.3.0",
     "chai": "^3.4.1",
     "chai-as-promised": "^5.1.0",
+    "cssnano": "^3.10.0",
     "del": "^2.2.2",
     "eslint": "^3.5.0",
     "eslint-config-standard": "^10.2.1",
@@ -52,7 +53,6 @@
     "exorcist": "^0.4.0",
     "gulp": "^3.9.0",
     "gulp-babel": "^6.1.2",
-    "gulp-cssnano": "^2.1.0",
     "gulp-debug": "^2.1.2",
     "gulp-diff": "^1.0.0",
     "gulp-eslint": "^3.0.1",
@@ -67,12 +67,12 @@
     "gulp-plumber": "^1.0.1",
     "gulp-postcss": "^6.0.1",
     "gulp-rename": "^1.2.2",
-    "gulp-sass": "^2.2.0",
+    "gulp-sass": "^3.1.0",
     "gulp-sass-bulk-import": "^1.0.1",
-    "gulp-sass-glob": "0.0.8",
+    "gulp-sass-glob": "^1.0.8",
     "gulp-shell": "^0.5.2",
     "gulp-size": "^2.0.0",
-    "gulp-sourcemaps": "^1.6.0",
+    "gulp-sourcemaps": "^2.6.0",
     "gulp-stylelint": "^3.1.0",
     "gulp-svg-sprite": "^1.2.19",
     "gulp-svgmin": "^1.2.3",

scripts/dev_settings.sh

@@ -8,10 +8,6 @@ if [ -z "$EQ_RABBITMQ_ENABLED" ]; then
   export EQ_RABBITMQ_ENABLED=False
 fi
 
-if [ -z "$EQ_MINIMIZE_ASSETS" ]; then
-  export EQ_MINIMIZE_ASSETS=False
-fi
-
 if [ -z "$EQ_RABBITMQ_HOST" ]; then
   export EQ_RABBITMQ_HOST="localhost"
 fi