diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7737a74a..d71f78c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,9 @@ jobs: with: node-version: ${{ matrix.node-version }} - name: Test Sass can be compiled - run: npm run test:sass + run: | + npm install + npm run test:sass publish: runs-on: ubuntu-latest diff --git a/gulp/dist-scss/all-ie8.scss b/gulp/dist-scss/all-ie8.scss new file mode 100644 index 00000000..94033f88 --- /dev/null +++ b/gulp/dist-scss/all-ie8.scss @@ -0,0 +1,3 @@ +$govuk-is-ie8: true; + +@import "all"; diff --git a/gulp/dist-scss/all.scss b/gulp/dist-scss/all.scss new file mode 100644 index 00000000..c90db014 --- /dev/null +++ b/gulp/dist-scss/all.scss @@ -0,0 +1,6 @@ +$_govuk-imported-modules: ("govuk/objects/width-container") !default; + +@import "node_modules/govuk-frontend/dist/govuk/base"; +@import "node_modules/govuk-frontend/dist/govuk/objects/width-container"; +@import "package/moj/all" + diff --git a/gulp/dist.js b/gulp/dist.js index de2ab688..4189f5d6 100644 --- a/gulp/dist.js +++ b/gulp/dist.js @@ -31,13 +31,13 @@ gulp.task("dist:javascript", () => { gulp.task("dist:css", () => { return gulp - .src("package/moj/*.scss") + .src("gulp/dist-scss/*.scss") .pipe(sass()) .pipe(postcss([autoprefixer, cssnano])) .pipe( rename((path) => ({ dirname: path.dirname, - basename: path.basename.replace("all", "moj-frontend"), + basename: path.basename.replace("dist", "moj-frontend"), extname: ".min.css", })) ) diff --git a/package.json b/package.json index bc03469b..6bc9b56c 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "ci:dryrun": "HUSKY=0 CI=true semantic-release --dry-run", "start": "npm-run-all --parallel watch:*", "test": "npm-run-all --parallel test:*", - "test:sass": "npm install node-sass && node-sass -q test.scss >/dev/null && echo 'ok'", + "test:sass": "npx node-sass -q gulp/dist-scss/all.scss >/dev/null && echo 'ok'", "test:docs": "npm run build:docs", "watch:11ty": "eleventy --input=./docs --output=public --serve --watch", "watch:webpack": "webpack --watch" diff --git a/src/moj/all.scss b/src/moj/all.scss index 126c82c8..56a9b653 100755 --- a/src/moj/all.scss +++ b/src/moj/all.scss @@ -1,5 +1,3 @@ -@import "node_modules/govuk-frontend/dist/govuk/base"; - @import "settings/all"; @import "helpers/all"; @import "objects/all"; diff --git a/src/moj/components/cookie-banner/_cookie-banner.scss b/src/moj/components/cookie-banner/_cookie-banner.scss index d8b749e9..09ba6374 100755 --- a/src/moj/components/cookie-banner/_cookie-banner.scss +++ b/src/moj/components/cookie-banner/_cookie-banner.scss @@ -1,5 +1,3 @@ -@import "node_modules/govuk-frontend/dist/govuk/objects/width-container"; - .moj-cookie-banner { display: none; @include govuk-font(16); diff --git a/test.scss b/test.scss deleted file mode 100644 index 1a9ff2b9..00000000 --- a/test.scss +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This file is used in CI to test that the moj-frontend can be imported and built. - */ -@import "node_modules/@ministryofjustice/frontend/moj/all";