Merge pull request #480 from coopdigital/add-ds-folder-to-workspace

feat: add design-system to workspace

design-system/README.md

@@ -1,4 +1,5 @@
 # Deprecation warning
+
 This website has now been replaced with our new [Experience Library](https://github.com/coopdigital/experience-library). This is now a private repository. If you are a colleage and require access, please contact the project admins.
 
 You can still use the website application locally in order to test changes to packages. We do plan to create a new iteration of a component "workbench" in 2022. So this will be subject to change in the future.
@@ -14,8 +15,8 @@ The [design system](http://coop.co.uk/designsystem) provides guidance on designi
 If this is the first time you are running a Co-op project, of if you're on a new Mac/Catalina, then please check you have any/all of the following:
 
 - Install [Node](https://nodejs.org/en/download/)
-- Install [Homebrew](https://brew.sh) 
-- GNUPG: `brew install gnupg gnupg2` via command line. This is just to install the GPG keys used to verify the RVM installation and may not always be necessary. 
+- Install [Homebrew](https://brew.sh)
+- GNUPG: `brew install gnupg gnupg2` via command line. This is just to install the GPG keys used to verify the RVM installation and may not always be necessary.
 - Install [RVM](https://rvm.io/rvm/install)
 - XCode can be downloaded from the App store
 
@@ -32,11 +33,9 @@ Then:
 
 ## Next steps
 
-This project uses [Jekyll](http://jekyllrb.com/) to compile the pages, and NPM packages to include the foundation and component packages dependencies and compile the assets. To install all required dependencies, run:
+This project uses [Jekyll](http://jekyllrb.com/) to compile the pages, and NPM packages to include the foundation and component packages dependencies and compile the assets. Running `yarn install` at root will have already taken care of your npm dependecies. To install all required Ruby dependencies, run:
 
 ```
-npm ci
-
 bundle install
 ```
 
@@ -47,11 +46,5 @@ Once dependencies have been installed, you can build and serve the Design system
 The default `gulp` task is configured to build and compile all the Design System assets. The `server` task will be most handy for local development: it will build the Jekyll site and compile all the assets, start a local server accessible at <http://localhost:9000> and start the watch tasks to automatically re-generate assets and pages on file change:
 
 ```
-npm run server
+yarn server
 ```
-
-## Heroku deployment
-
-Changes should be created on branches then submitted as a pull request. [Circle CI](https://circleci.com/gh/coopdigital/workflows/coop-frontend) runs `build_pacakges` (to check that all the foundations and components are building successfully) and `build` to check that the Design system is building correctly.
-
-Once the branch is merged the Design system is automatically deployed to Heroku (<https://coop-design-manual.herokuapp.com>) using an extra `deploy` step in the Cirlce CI workflow.

design-system/package.json

@@ -1,8 +1,9 @@
 {
   "name": "design-system",
+  "version": "1.0.0",
   "private": true,
   "engines": {
-    "node": "12.x",
+    "node": "12.x || 14.x || 16.x",
     "npm": "7.x"
   },
   "repository": {
@@ -15,44 +16,39 @@
   },
   "homepage": "https://github.com/coopdigital/coop-frontend/tree/master/design-system#readme",
   "dependencies": {
-    "@coopdigital/blockquote": "^1.0.2",
-    "@coopdigital/component-card": "^3.3.2",
-    "@coopdigital/component-card--product": "^2.2.2",
-    "@coopdigital/component-date-input": "^1.2.14",
-    "@coopdigital/component-notification": "^1.1.2",
-    "@coopdigital/component-notification--alert": "^1.1.3",
-    "@coopdigital/component-search": "^2.3.17",
-    "@coopdigital/component-signpost": "^3.2.2",
-    "@coopdigital/component-skipnav": "^2.3.3",
-    "@coopdigital/component-squircles": "^2.3.1",
-    "@coopdigital/component-tags": "^3.2.2",
-    "@coopdigital/foundations-buttons": "^2.5.2",
-    "@coopdigital/foundations-colors": "^2.6.3",
-    "@coopdigital/foundations-forms": "^5.3.0",
-    "@coopdigital/foundations-global": "^3.3.2",
-    "@coopdigital/foundations-grid": "^2.1.2",
-    "@coopdigital/foundations-layout": "^3.3.2",
-    "@coopdigital/foundations-tables": "^3.0.0",
-    "@coopdigital/foundations-typography": "^4.2.3",
-    "@coopdigital/foundations-vars": "^3.8.0",
-    "@coopdigital/shared-component--app": "^1.3.5",
-    "@coopdigital/shared-component--cooperate": "^1.3.2",
-    "@coopdigital/shared-component--editorialcard": "^2.4.2",
-    "@coopdigital/shared-component--featurecard": "^2.4.3",
-    "@coopdigital/shared-component--hero": "^3.4.3",
-    "@coopdigital/shared-component--image": "^2.2.2",
-    "@coopdigital/shared-component--linklist": "^3.1.1",
-    "@coopdigital/shared-component--membership": "^3.1.4",
-    "@coopdigital/shared-component--membershipfeatured": "^1.3.2",
-    "@coopdigital/shared-component--membershiphero": "^1.4.5",
-    "@coopdigital/shared-component--offers": "^2.2.2",
-    "@coopdigital/shared-component--offerspromo": "^1.2.1",
-    "@coopdigital/shared-component--postcode": "^2.2.2",
-    "@coopdigital/shared-component--signpost": "^2.4.2",
-    "@coopdigital/shared-component--signpostlist": "^1.3.2",
-    "@coopdigital/shared-component--statement": "^3.1.2",
-    "@coopdigital/shared-component--totaliser": "^1.1.4",
-    "@coopdigital/shared-component--video": "^2.2.2",
+    "@coopdigital/blockquote": "*",
+    "@coopdigital/component-card": "*",
+    "@coopdigital/component-card--product": "*",
+    "@coopdigital/component-date-input": "*",
+    "@coopdigital/component-notification": "*",
+    "@coopdigital/component-notification--alert": "*",
+    "@coopdigital/component-search": "*",
+    "@coopdigital/component-signpost": "*",
+    "@coopdigital/component-skipnav": "*",
+    "@coopdigital/component-squircles": "*",
+    "@coopdigital/component-tags": "*",
+    "@coopdigital/foundations": "*",
+    "@coopdigital/foundations-buttons": "*",
+    "@coopdigital/foundations-forms": "*",
+    "@coopdigital/foundations-tables": "*",
+    "@coopdigital/shared-component--app": "*",
+    "@coopdigital/shared-component--cooperate": "*",
+    "@coopdigital/shared-component--editorialcard": "*",
+    "@coopdigital/shared-component--featurecard": "*",
+    "@coopdigital/shared-component--hero": "*",
+    "@coopdigital/shared-component--image": "*",
+    "@coopdigital/shared-component--linklist": "*",
+    "@coopdigital/shared-component--membership": "*",
+    "@coopdigital/shared-component--membershipfeatured": "*",
+    "@coopdigital/shared-component--membershiphero": "*",
+    "@coopdigital/shared-component--offers": "*",
+    "@coopdigital/shared-component--offerspromo": "*",
+    "@coopdigital/shared-component--postcode": "*",
+    "@coopdigital/shared-component--signpost": "*",
+    "@coopdigital/shared-component--signpostlist": "*",
+    "@coopdigital/shared-component--statement": "*",
+    "@coopdigital/shared-component--totaliser": "*",
+    "@coopdigital/shared-component--video": "*",
     "handlebars": "^4.7.6",
     "jquery": "^3.5.1",
     "normalize.css": "^8.0.1",

design-system/src/_css/main.css

@@ -3,10 +3,8 @@
 
 /* Foundations */
 @import "normalize.css";
-@import "@coopdigital/foundations-vars";
-@import "@coopdigital/foundations-global";
-@import "@coopdigital/foundations-typography";
-@import "@coopdigital/foundations-grid";
+@import "@coopdigital/foundations/src/vars/vars.pcss";
+@import "@coopdigital/foundations/src/foundations.pcss";
 @import "@coopdigital/foundations-buttons";
 @import "@coopdigital/foundations-forms";
 @import "@coopdigital/foundations-tables";
@@ -57,9 +55,6 @@
 @import "design-system/states.css";
 @import "design-system/footer.css";
 
-@import "@coopdigital/foundations-colors";
-@import "@coopdigital/foundations-layout";
-
 .coop-c-notification--success {
   background-color: var(--color-green-success-light);
   border-left-color: var(--color-green-success);

package.json

@@ -1,12 +1,17 @@
 {
   "name": "@coopdigital/coop-frontend",
+  "version": "1.0.0",
+  "repository": "https://github.com/coopdigital/coop-frontend.git",
   "description": "Co-op Frontend and Design System",
   "author": "Co-op Digital",
   "license": "MIT",
   "private": true,
+  "workspaces": [
+    "packages/*",
+    "design-system"
+  ],
   "engines": {
-    "node": "12.x || 14.x || 16.x",
-    "npm": "7.x | 8.x"
+    "node": "12.x || 14.x || 16.x"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
@@ -62,15 +67,7 @@
     "build:foundations": "lerna run --stream --scope @coopdigital/foundations build",
     "build:component": "lerna exec --scope @coopdigital/component-* 'rollup --config ../../build/rollup/index.js'",
     "package:version": "lerna version --conventional-commits --yes",
+    "dev": "lerna run --stream --scope design-system server",
     "publish": "lerna publish from-package --yes --no-verify-access"
-  },
-  "heroku-run-build-script": true,
-  "dependencies": {
-    "stylelint-config-prettier": "^9.0.3"
-  },
-  "version": "1.0.0",
-  "repository": "https://github.com/coopdigital/coop-frontend.git",
-  "workspaces": [
-    "packages/*"
-    ]  
+  }
 }