diff --git a/.eslintrc.js b/.eslintrc.js index 8d321cd24..a1d9f749d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,4 @@ module.exports = { root: true, - extends: ['@westpac/eslint-config'], + extends: ['turbo', '@westpac/eslint-config'], }; diff --git a/README.md b/README.md index 9d353d02e..8083f5dfd 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,17 @@ const config = withGEL({ export default config; ``` +Also you have to create a `postcss.config.js` on the root of your application as follows. + +```js +module.exports = { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +}; +``` + For applications using `brand fonts` add the following options config to the `withGEL` helper. ```ts diff --git a/apps/protoform/.eslintrc.js b/apps/protoform/.eslintrc.js index b60e1cd62..2cff21296 100644 --- a/apps/protoform/.eslintrc.js +++ b/apps/protoform/.eslintrc.js @@ -1,4 +1,4 @@ module.exports = { root: true, - extends: ['@westpac/eslint-config/nextjs'], + extends: ['turbo', '@westpac/eslint-config/nextjs'], }; diff --git a/apps/protoform/CHANGELOG.md b/apps/protoform/CHANGELOG.md index e6e3a36a9..4ce59d93b 100644 --- a/apps/protoform/CHANGELOG.md +++ b/apps/protoform/CHANGELOG.md @@ -1,5 +1,15 @@ # protoform +## 0.2.0 + +### Minor Changes + +- d275ec7e: eslint config separating the turbo config + +### Patch Changes + +- @westpac/ui@0.24.1 + ## 0.1.11 ### Patch Changes diff --git a/apps/protoform/package.json b/apps/protoform/package.json index 08769b356..7c6b84c3c 100644 --- a/apps/protoform/package.json +++ b/apps/protoform/package.json @@ -1,6 +1,6 @@ { "name": "protoform", - "version": "0.1.11", + "version": "0.2.0", "private": true, "scripts": { "dev": "next dev", @@ -26,6 +26,7 @@ "autoprefixer": "^10.0.1", "eslint": "^8.56.0", "eslint-config-next": "14.2.4", + "eslint-config-turbo": "^0.0.7", "postcss": "^8", "tailwindcss": "^3.3.0", "typescript": "^5" diff --git a/apps/site/.eslintrc.js b/apps/site/.eslintrc.js index b60e1cd62..2cff21296 100644 --- a/apps/site/.eslintrc.js +++ b/apps/site/.eslintrc.js @@ -1,4 +1,4 @@ module.exports = { root: true, - extends: ['@westpac/eslint-config/nextjs'], + extends: ['turbo', '@westpac/eslint-config/nextjs'], }; diff --git a/apps/site/CHANGELOG.md b/apps/site/CHANGELOG.md index 2d683eb1d..1d6072dd4 100644 --- a/apps/site/CHANGELOG.md +++ b/apps/site/CHANGELOG.md @@ -1,5 +1,15 @@ # site +## 0.3.0 + +### Minor Changes + +- d275ec7e: eslint config separating the turbo config + +### Patch Changes + +- @westpac/ui@0.24.1 + ## 0.2.0 ### Minor Changes diff --git a/apps/site/package.json b/apps/site/package.json index f591bc267..a825541db 100644 --- a/apps/site/package.json +++ b/apps/site/package.json @@ -1,6 +1,6 @@ { "name": "site", - "version": "0.2.0", + "version": "0.3.0", "private": true, "scripts": { "build": "next build", @@ -42,6 +42,7 @@ "autoprefixer": "~10.4.14", "eslint": "^8.56.0", "eslint-config-next": "14.2.4", + "eslint-config-turbo": "^0.0.7", "postcss": "~8.4.31", "tailwind-variants": "~0.1.13", "tailwindcss": "~3.3.2", diff --git a/apps/site/src/components/code/components/demos/employment/employment-usage.demo.tsx b/apps/site/src/components/code/components/demos/employment/employment-usage.demo.tsx index 2d2f11231..b8e6cee83 100644 --- a/apps/site/src/components/code/components/demos/employment/employment-usage.demo.tsx +++ b/apps/site/src/components/code/components/demos/employment/employment-usage.demo.tsx @@ -1,4 +1,4 @@ -import { Alert, ErrorMessage, Field, Form, FormGroup, FormLabel, Input, Select, SelectProps } from '@westpac/ui'; +import { Alert, ErrorMessage, Field, FormGroup, FormLabel, Input, Select, SelectProps } from '@westpac/ui'; import { Fragment, HTMLAttributes, useState } from 'react'; import { EmploymentSelect, IndustrySelect } from './employment.demo'; diff --git a/apps/site/src/components/component-blocks/foundation-blocks.tsx b/apps/site/src/components/component-blocks/foundation-blocks.tsx index 3f72fc996..b90cb8aa8 100644 --- a/apps/site/src/components/component-blocks/foundation-blocks.tsx +++ b/apps/site/src/components/component-blocks/foundation-blocks.tsx @@ -2,7 +2,6 @@ import { Image } from '@/components/document-renderer'; import { Colors } from './colors/colors.component'; import { colors } from './colors/colors.preview'; -import { AccessibilityDemo } from './components/accessibility-demo'; import { accessibilityDemo } from './components/accessibility-demo/accessibility-demo.preview'; import { designSystemBodyImage } from './components/design-system-body-image'; import { LinkList } from './components/link-list'; diff --git a/apps/site/src/content/design-system/development/get-started/design/installation/content.mdoc b/apps/site/src/content/design-system/development/get-started/design/installation/content.mdoc index 2d1c76b0e..4611c80de 100644 --- a/apps/site/src/content/design-system/development/get-started/design/installation/content.mdoc +++ b/apps/site/src/content/design-system/development/get-started/design/installation/content.mdoc @@ -43,6 +43,19 @@ export default config; `} /> ``` +Also you have to create a `postcss.config.js` on the root of your application as follows. + +```html + +``` + For applications using `brand fonts` add the following options config to the `withGEL` helper. ```html diff --git a/apps/site/src/content/design-system/development/get-started/design/pre-requisites/content.mdoc b/apps/site/src/content/design-system/development/get-started/design/pre-requisites/content.mdoc index cf00fed6a..9db536abc 100644 --- a/apps/site/src/content/design-system/development/get-started/design/pre-requisites/content.mdoc +++ b/apps/site/src/content/design-system/development/get-started/design/pre-requisites/content.mdoc @@ -1,5 +1,5 @@ All GEL components have a couple of peer dependencies so please ensure the following are installed: ```html - + ``` diff --git a/helpers/create-package/.template-ts/.eslintrc.cjs b/helpers/create-package/.template-ts/.eslintrc.cjs index 8d321cd24..a1d9f749d 100644 --- a/helpers/create-package/.template-ts/.eslintrc.cjs +++ b/helpers/create-package/.template-ts/.eslintrc.cjs @@ -1,4 +1,4 @@ module.exports = { root: true, - extends: ['@westpac/eslint-config'], + extends: ['turbo', '@westpac/eslint-config'], }; diff --git a/package.json b/package.json index 2c58395fb..62b1dd0e4 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "@changesets/cli": "^2.25.2", "@westpac/eslint-config": "workspace:~", "@westpac/ts-config": "workspace:~", + "eslint-config-turbo": "^0.0.7", "husky": "^8.0.3", "prettier": "^3.2.5", "shx": "^0.3.4", diff --git a/packages/eslint-config/CHANGELOG.md b/packages/eslint-config/CHANGELOG.md index 04bf06674..a0b5509af 100644 --- a/packages/eslint-config/CHANGELOG.md +++ b/packages/eslint-config/CHANGELOG.md @@ -1,5 +1,11 @@ # @westpac/eslint-config +## 0.3.0 + +### Minor Changes + +- d275ec7e: eslint config separating the turbo config + ## 0.2.2 ### Patch Changes diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index 844ca4cb5..bc4c24888 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -8,7 +8,7 @@ module.exports = { jest: true, }, parserOptions: { ecmaVersion: 9, sourceType: 'module' }, - extends: ['turbo', 'eslint:recommended', 'plugin:prettier/recommended', 'plugin:tailwindcss/recommended'], + extends: ['eslint:recommended', 'plugin:prettier/recommended', 'plugin:tailwindcss/recommended'], plugins: ['import', 'prettier'], ignorePatterns: ['node_modules/*', 'dist/*'], rules: { diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index a344c017d..2f4cd1552 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@westpac/eslint-config", - "version": "0.2.2", + "version": "0.3.0", "main": "index.js", "license": "MIT", "dependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index df757f3d5..3286f7b23 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,6 +26,9 @@ importers: '@westpac/ts-config': specifier: workspace:~ version: link:packages/ts-config + eslint-config-turbo: + specifier: ^0.0.7 + version: 0.0.7(eslint@8.57.0) husky: specifier: ^8.0.3 version: 8.0.3 @@ -127,6 +130,9 @@ importers: eslint-config-next: specifier: 14.2.4 version: 14.2.4(eslint@8.57.0)(typescript@5.1.6) + eslint-config-turbo: + specifier: ^0.0.7 + version: 0.0.7(eslint@8.57.0) postcss: specifier: ^8 version: 8.4.31 @@ -227,6 +233,9 @@ importers: eslint-config-next: specifier: 14.2.4 version: 14.2.4(eslint@8.57.0)(typescript@5.1.6) + eslint-config-turbo: + specifier: ^0.0.7 + version: 0.0.7(eslint@8.57.0) postcss: specifier: ~8.4.31 version: 8.4.31