Skip to content

Commit

Permalink
HAAR-1250: remove graph ql demo and bring inline with typescript temp…
Browse files Browse the repository at this point in the history
…late (#47)
  • Loading branch information
SimonMitchellMOJ committed Mar 13, 2023
1 parent 95132c2 commit eefdb0e
Show file tree
Hide file tree
Showing 85 changed files with 1,077 additions and 1,251 deletions.
30 changes: 5 additions & 25 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
version: 2.1

orbs:
hmpps: ministryofjustice/hmpps@6.2
slack: circleci/slack@4.8.3
hmpps: ministryofjustice/hmpps@7
slack: circleci/slack@4.12.1

parameters:
alerts-slack-channel:
type: string
default: hmpps_tech_alerts_security

releases-slack-channel:
type: string
default: dps-releases
Expand Down Expand Up @@ -55,28 +56,6 @@ jobs:
- dist
- .cache/Cypress

check_outdated:
executor:
name: hmpps/node
tag: << pipeline.parameters.node-version >>
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "package-lock.json" }}
- run:
name: install-npm
command: 'npm ci --no-audit'
- run:
name: Check version
command: 'npm --version'
- run:
name: Run check
command: 'npm outdated typescript govuk-frontend'
- slack/notify:
event: fail
channel: << pipeline.parameters.alerts-slack-channel >>
template: basic_fail_1

unit_test:
executor:
name: hmpps/node
Expand Down Expand Up @@ -206,7 +185,8 @@ workflows:
only:
- main
jobs:
- check_outdated:
- hmpps/npm_outdated:
slack_channel: << pipeline.parameters.alerts-slack-channel >>
context:
- hmpps-common-vars
- hmpps/npm_security_audit:
Expand Down
19 changes: 4 additions & 15 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@
"trailingComma": "es5",
"singleQuote": true,
"printWidth": 120,
"semi": false,
"arrowParens": "avoid"
"semi": false
}
]
}
Expand Down Expand Up @@ -84,28 +83,18 @@
"tsx": "never"
}
],
"comma-dangle": [
"error",
{
"arrays": "always-multiline",
"objects": "always-multiline",
"imports": "always-multiline",
"exports": "always-multiline",
"functions": "never"
}
],
"comma-dangle": ["error", "always-multiline"],
"import/no-extraneous-dependencies": [
"error",
{ "devDependencies": ["**/*.test.js", "**/*.test.ts", "cypress.config.ts"] }
{ "devDependencies": ["**/*.test.js", "**/*.test.ts", "**/testutils/**", "cypress.config.ts"] }
],
"prettier/prettier": [
"error",
{
"trailingComma": "es5",
"singleQuote": true,
"printWidth": 120,
"semi": false,
"arrowParens": "avoid"
"semi": false
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

NODE_ENV=dev && node_modules/.bin/lint-staged && node_modules/.bin/tsc && npm test
NODE_ENV=dev && node_modules/.bin/lint-staged && npm run typecheck && npm test
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18
12 changes: 10 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
{
"trailingComma": "es5",
"trailingComma": "all",
"singleQuote": true,
"printWidth": 120,
"semi": false,
"arrowParens": "avoid"
"arrowParens": "avoid",
"overrides": [
{
"files": "*.njk",
"options": {
"parser": "jinja-template"
}
}
]
}
7 changes: 0 additions & 7 deletions assets/sass/application-ie8.sass

This file was deleted.

9 changes: 0 additions & 9 deletions assets/sass/application.sass

This file was deleted.

100 changes: 0 additions & 100 deletions assets/sass/components/_card.scss

This file was deleted.

83 changes: 0 additions & 83 deletions assets/sass/components/_header-bar.scss

This file was deleted.

2 changes: 0 additions & 2 deletions assets/sass/local.sass

This file was deleted.

7 changes: 7 additions & 0 deletions assets/scss/application-ie8.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
$govuk-global-styles: true;
$path: "/assets/images/";

@import 'govuk/all-ie8';

@import './components/header-bar';
@import 'assets/scss/local';
11 changes: 11 additions & 0 deletions assets/scss/application.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
$govuk-global-styles: true;
$path: "/assets/images/";

$moj-page-width: 1170px;
$govuk-page-width: $moj-page-width;

@import 'govuk/all';
@import 'moj/all';

@import './components/header-bar';
@import 'assets/scss/local';

0 comments on commit eefdb0e

Please sign in to comment.