Start removing TS

Yoast · Feb 17, 2022 · f891b8a · f891b8a
1 parent a698639
commit f891b8a
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 125 deletions.
diff --git a/packages/ui-library/.storybook/preview.js b/packages/ui-library/.storybook/preview.js
@@ -1,7 +1,10 @@
 import "../src/elements/style.css";
 
 export const parameters = {
-	actions: { argTypesRegex: "^on[A-Z].*" },
+	actions: {
+		disable: true,
+		argTypesRegex: "^on[A-Z].*",
+	},
 	controls: {
 		disable: true,
 		matchers: {
@@ -10,3 +13,5 @@ export const parameters = {
 		},
 	},
 };
+
+// TODO: disable all addons here by default and enable manually?
diff --git a/packages/ui-library/package.json b/packages/ui-library/package.json
@@ -3,19 +3,20 @@
   "version": "0.0.0",
   "description": "Yoast UI library",
   "main": "dist/index.js",
-  "author": "nolledgeable <nollegroen@gmail.com>",
+  "author": "Team Yoast <support@yoast.com>",
   "license": "MIT",
   "private": true,
   "sideEffects": false,
   "scripts": {
     "clean:build": "rm -rf build",
-    "build:ts": "tsc",
+    "build:js": "babel src --out-dir dist --ignore \"src/**/*.stories.@(js|jsx|ts|tsx)\",\"src/**/stories.@(js|jsx|ts|tsx)\"",
     "build:css": "postcss src/components/style.css --dir build",
     "build": "yarn clean:build && yarn build:ts && yarn build:css",
     "build:storybook": "build-storybook",
     "storybook": "start-storybook -p 6006"
   },
   "devDependencies": {
+    "@babel/cli": "^7.17.3",
     "@babel/core": "^7.15.5",
     "@babel/parser": "^7.16.8",
     "@storybook/addon-a11y": "^6.4.14",
@@ -25,12 +26,6 @@
     "@storybook/addons": "^6.3.9",
     "@storybook/react": "^6.3.8",
     "@storybook/theming": "^6.3.9",
-    "@tsconfig/recommended": "^1.0.1",
-    "@types/classnames": "^2.3.1",
-    "@types/react": "^17.0.26",
-    "@types/react-dom": "^17.0.9",
-    "@typescript-eslint/eslint-plugin": "^4.31.2",
-    "@typescript-eslint/parser": "^4.31.2",
     "@whitespace/storybook-addon-html": "^5.0.0",
     "autoprefixer": "^10.4.2",
     "babel-loader": "^8.2.2",
@@ -42,12 +37,15 @@
     "postcss-cli": "^9.0.0",
     "postcss-import": "^14.0.2",
     "tailwindcss": "^3.0.15",
-    "typescript": "^4.4.3"
+    "@yoast/babel-preset": "link:packages/babel-preset"
   },
   "dependencies": {
     "@heroicons/react": "^1.0.5",
     "classnames": "^2.3.1",
+    "lodash": "^4.17.21",
+    "prop-types": "^15.8.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }
 }
+
diff --git a/packages/ui-library/postcss.config.js b/packages/ui-library/postcss.config.js
@@ -2,6 +2,7 @@ module.exports = {
 	plugins: [
 		require( "postcss-import" ),
 		require( "tailwindcss" ),
+		require( "tailwindcss/nesting" ),
 		require( "autoprefixer" ),
 		...( process.env.NODE_ENV === "production" ? [ require( "cssnano" ) ] : [] )
 	],

diff --git a/packages/ui-library/src/elements/Button/stories.tsx b/packages/ui-library/src/elements/Button/stories.tsx
@@ -5,7 +5,7 @@ import Button from ".";
 
 
 export default {
-	title: "Elements/Forms/Button",
+	title: "Elements/Button",
 	component: Button,
 	argTypes: {
 		children: { control: "text" },

diff --git a/packages/ui-library/src/theme/index.js b/packages/ui-library/src/theme/index.js
@@ -1,6 +1,6 @@
 // TODO: Move this to Tailwind preset package.
 module.exports = {
-	fontSize: {
+	fontSizes: {
 		"xxs": "0.6rem",
 		"xs": ".75rem",
 		"sm": ".8125rem", // 13px instead of 14pxx

diff --git a/packages/ui-library/tailwind.config.js b/packages/ui-library/tailwind.config.js
@@ -2,9 +2,10 @@
 const theme = require( "./src/theme" );
 
 module.exports = {
-	content: [ "./src/**/*.tsx" ],
+	content: [ "./src/**/*.js" ],
 	theme: {
 		extend: {
+			fontSizes: theme.fontSizes,
 			colors: theme.colors
 		},
 	},

diff --git a/packages/ui-library/tsconfig.json b/packages/ui-library/tsconfig.json