Get basic compiling working with new CSS setup

Author: DaneEveritt

.babel-plugin-macrosrc.js

@@ -0,0 +1,12 @@
+module.exports = {
+    twin: {
+        preset: 'styled-components',
+        autoCssProp: true,
+        config: './tailwind.config.js',
+    },
+    styledComponents: {
+        pure: true,
+        displayName: false,
+        fileName: false,
+    },
+};

babel.config.js

@@ -0,0 +1,23 @@
+module.exports = {
+    presets: [
+        '@babel/typescript',
+        ['@babel/env', {
+            modules: false,
+            useBuiltIns: 'entry',
+            corejs: 3,
+        }],
+        '@babel/react',
+    ],
+    plugins: [
+        'babel-plugin-macros',
+        'styled-components',
+        'react-hot-loader/babel',
+        '@babel/transform-runtime',
+        '@babel/transform-react-jsx',
+        '@babel/proposal-class-properties',
+        '@babel/proposal-object-rest-spread',
+        '@babel/proposal-optional-chaining',
+        '@babel/proposal-nullish-coalescing-operator',
+        '@babel/syntax-dynamic-import',
+    ],
+};

package.json

@@ -5,13 +5,13 @@
         "@fortawesome/free-solid-svg-icons": "^5.9.0",
         "@fortawesome/react-fontawesome": "^0.1.4",
         "@types/react-google-recaptcha": "^1.1.1",
-        "axios": "^0.19.0",
+        "axios": "^0.19.2",
         "ayu-ace": "^2.0.4",
         "brace": "^0.11.1",
         "chart.js": "^2.8.0",
         "classnames": "^2.2.6",
-        "date-fns": "^1.29.0",
-        "easy-peasy": "^3.2.3",
+        "date-fns": "^2.14.0",
+        "easy-peasy": "^3.3.1",
         "events": "^3.0.0",
         "formik": "^2.1.4",
         "i18next": "^19.0.0",
@@ -22,23 +22,23 @@
         "lodash-es": "^4.17.15",
         "path": "^0.12.7",
         "query-string": "^6.7.0",
-        "react": "^16.12.0",
+        "react": "^16.13.1",
         "react-dom": "npm:@hot-loader/react-dom",
         "react-google-recaptcha": "^2.0.1",
-        "react-hot-loader": "^4.12.18",
+        "react-hot-loader": "^4.12.21",
         "react-i18next": "^11.2.1",
         "react-redux": "^7.1.0",
         "react-router-dom": "^5.1.2",
         "react-transition-group": "^4.3.0",
         "sockette": "^2.0.6",
-        "styled-components": "^4.4.1",
+        "styled-components": "^5.1.1",
         "styled-components-breakpoint": "^3.0.0-preview.20",
         "use-react-router": "^1.0.7",
         "uuid": "^3.3.2",
         "xterm": "^3.14.4",
         "xterm-addon-attach": "^0.1.0",
         "xterm-addon-fit": "^0.1.0",
-        "yup": "^0.27.0"
+        "yup": "^0.29.1"
     },
     "devDependencies": {
         "@babel/core": "^7.7.5",
@@ -47,6 +47,7 @@
         "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
         "@babel/plugin-proposal-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+        "@babel/plugin-transform-react-jsx": "^7.10.4",
         "@babel/plugin-transform-runtime": "^7.7.5",
         "@babel/preset-env": "^7.7.5",
         "@babel/preset-react": "^7.7.4",
@@ -60,32 +61,33 @@
         "@types/lodash-es": "^4.17.3",
         "@types/node": "^12.6.9",
         "@types/query-string": "^6.3.0",
-        "@types/react": "^16.9.15",
-        "@types/react-dom": "^16.9.4",
+        "@types/react": "^16.9.41",
+        "@types/react-dom": "^16.9.8",
         "@types/react-redux": "^7.1.1",
         "@types/react-router": "^5.1.3",
         "@types/react-router-dom": "^5.1.3",
         "@types/react-transition-group": "^2.9.2",
         "@types/styled-components": "^4.4.0",
         "@types/uuid": "^3.4.5",
-        "@types/webpack-env": "^1.13.6",
-        "@types/yup": "^0.26.17",
-        "@typescript-eslint/eslint-plugin": "^2.19.0",
-        "@typescript-eslint/parser": "^2.19.0",
+        "@types/webpack-env": "^1.15.2",
+        "@types/yup": "^0.29.3",
+        "@typescript-eslint/eslint-plugin": "^3.5.0",
+        "@typescript-eslint/parser": "^3.5.0",
         "babel-loader": "^8.0.6",
-        "babel-plugin-styled-components": "^1.10.6",
+        "babel-plugin-styled-components": "^1.10.7",
         "babel-plugin-tailwind-components": "^0.5.10",
         "cross-env": "^7.0.2",
         "css-loader": "^3.2.1",
         "cssnano": "^4.1.10",
-        "eslint": "^5.16.0",
-        "eslint-config-standard": "^12.0.0",
-        "eslint-plugin-import": "^2.17.3",
+        "eslint": "^7.4.0",
+        "eslint-config-standard": "^14.1.1",
+        "eslint-plugin-import": "^2.22.0",
         "eslint-plugin-node": "^9.1.0",
-        "eslint-plugin-promise": "^4.1.1",
-        "eslint-plugin-react-hooks": "^2.1.2",
-        "eslint-plugin-standard": "^4.0.0",
-        "fork-ts-checker-webpack-plugin": "^1.5.0",
+        "eslint-plugin-promise": "^4.2.1",
+        "eslint-plugin-react": "^7.20.3",
+        "eslint-plugin-react-hooks": "^4.0.5",
+        "eslint-plugin-standard": "^4.0.1",
+        "fork-ts-checker-webpack-plugin": "^5.0.6",
         "glob-all": "^3.1.0",
         "html-webpack-plugin": "^3.2.0",
         "mini-css-extract-plugin": "^0.8.0",
@@ -97,17 +99,19 @@
         "purgecss-webpack-plugin": "^1.6.0",
         "redux-devtools-extension": "^2.13.8",
         "resolve-url-loader": "^3.0.0",
-        "source-map-loader": "^0.2.4",
-        "style-loader": "^0.23.1",
-        "tailwindcss": "^0.7.4",
-        "terser-webpack-plugin": "^1.3.0",
+        "source-map-loader": "^1.0.1",
+        "style-loader": "^1.2.1",
+        "tailwindcss": "^1.4.6",
+        "terser-webpack-plugin": "^3.0.6",
         "ts-loader": "^6.2.1",
-        "typescript": "^3.7.5",
-        "webpack": "^4.41.2",
+        "twin.macro": "^1.4.1",
+        "typescript": "^3.9.6",
+        "typescript-plugin-tw-template": "^2.0.1",
+        "webpack": "^4.43.0",
         "webpack-assets-manifest": "^3.1.1",
-        "webpack-cli": "^3.3.10",
-        "webpack-dev-server": "^3.9.0",
-        "webpack-manifest-plugin": "^2.0.3",
+        "webpack-cli": "^3.3.12",
+        "webpack-dev-server": "^3.11.0",
+        "webpack-manifest-plugin": "^2.2.0",
         "yarn-deduplicate": "^1.1.1"
     },
     "scripts": {

resources/scripts/.eslintrc.yml

@@ -1,23 +1,35 @@
 parser: "@typescript-eslint/parser"
 parserOptions:
   ecmaVersion: 6
+  ecmaFeatures:
+    jsx: true
   project: "./tsconfig.json"
   tsconfigRootDir: "./"
+settings:
+  react:
+    pragma: "React"
+    version: "detect"
+  linkComponents:
+    - name: Link
+      linkAttribute: to
+    - name: NavLink
+      linkAttribute: to
 env:
   browser: true
   es6: true
 plugins:
-  - "@typescript-eslint"
+  - "react"
   - "react-hooks"
+  - "@typescript-eslint"
 extends:
   - "standard"
+  - "plugin:react/recommended"
   - "plugin:@typescript-eslint/recommended"
-globals:
-  tw: "readonly"
 rules:
   indent:
     - error
     - 4
+    - SwitchCase: 1
   semi:
     - error
     - always
@@ -33,6 +45,25 @@ rules:
   "@typescript-eslint/no-unused-vars": 0
   "@typescript-eslint/no-explicit-any": 0
   "@typescript-eslint/no-non-null-assertion": 0
+  no-restricted-imports:
+    - error
+    - paths:
+        - name: styled-components
+          message: Please import from styled-components/macro.
+      patterns:
+        - "!styled-components/macro"
+  "react/prop-types": 0
+  "react/display-name": 0
+  "react/jsx-indent-props":
+    - warn
+    - 4
+  "react/jsx-boolean-value":
+    - warn
+    - never
+  "react/jsx-closing-bracket-location":
+    - 1
+    - "line-aligned"
+  "react/jsx-closing-tag-location": 1
 overrides:
   - files:
       - "**/*.tsx"

resources/scripts/components/App.tsx

@@ -18,11 +18,13 @@ interface ExtendedWindow extends Window {
         uuid: string;
         username: string;
         email: string;
+        /* eslint-disable camelcase */
         root_admin: boolean;
         use_totp: boolean;
         language: string;
         updated_at: string;
         created_at: string;
+        /* eslint-enable camelcase */
     };
 }
 

resources/scripts/components/elements/ContentContainer.tsx

@@ -1,5 +1,6 @@
-import styled from 'styled-components';
-import { breakpoint } from 'styled-components-breakpoint';
+import styled from 'styled-components/macro';
+import { breakpoint } from '@/theme';
+import tw from 'twin.macro';
 
 const ContentContainer = styled.div`
     max-width: 1200px;
@@ -9,5 +10,6 @@ const ContentContainer = styled.div`
         ${tw`mx-auto`};
     `};
 `;
+ContentContainer.displayName = 'ContentContainer';
 
 export default ContentContainer;

resources/scripts/components/server/backups/BackupRow.tsx

@@ -1,18 +1,11 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { ServerBackup } from '@/api/server/backups/getServerBackups';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faArchive } from '@fortawesome/free-solid-svg-icons/faArchive';
-import format from 'date-fns/format';
-import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
+import { format, formatDistanceToNow } from 'date-fns';
 import Spinner from '@/components/elements/Spinner';
-import Modal, { RequiredModalProps } from '@/components/elements/Modal';
 import { bytesToHuman } from '@/helpers';
 import Can from '@/components/elements/Can';
-import useServer from '@/plugins/useServer';
-import getBackupDownloadUrl from '@/api/server/backups/getBackupDownloadUrl';
-import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
-import useFlash from '@/plugins/useFlash';
-import { httpErrorToHuman } from '@/api/http';
 import useWebsocketEvent from '@/plugins/useWebsocketEvent';
 import { ServerContext } from '@/state/server';
 import BackupContextMenu from '@/components/server/backups/BackupContextMenu';
@@ -65,7 +58,7 @@ export default ({ backup, className }: Props) => {
                     title={format(backup.createdAt, 'ddd, MMMM Do, YYYY HH:mm:ss Z')}
                     className={'text-sm'}
                 >
-                    {distanceInWordsToNow(backup.createdAt, { includeSeconds: true, addSuffix: true })}
+                    {formatDistanceToNow(backup.createdAt, { includeSeconds: true, addSuffix: true })}
                 </p>
                 <p className={'text-2xs text-neutral-500 uppercase mt-1'}>Created</p>
             </div>

resources/scripts/components/server/files/FileObjectRow.tsx

@@ -3,9 +3,7 @@ import { faFileImport } from '@fortawesome/free-solid-svg-icons/faFileImport';
 import { faFileAlt } from '@fortawesome/free-solid-svg-icons/faFileAlt';
 import { faFolder } from '@fortawesome/free-solid-svg-icons/faFolder';
 import { bytesToHuman, cleanDirectoryPath } from '@/helpers';
-import differenceInHours from 'date-fns/difference_in_hours';
-import format from 'date-fns/format';
-import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
+import { differenceInHours, format, formatDistanceToNow } from 'date-fns';
 import React from 'react';
 import { FileObject } from '@/api/server/files/loadDirectory';
 import FileDropdownMenu from '@/components/server/files/FileDropdownMenu';
@@ -65,7 +63,7 @@ export default ({ file }: { file: FileObject }) => {
                     {Math.abs(differenceInHours(file.modifiedAt, new Date())) > 48 ?
                         format(file.modifiedAt, 'MMM Do, YYYY h:mma')
                         :
-                        distanceInWordsToNow(file.modifiedAt, { addSuffix: true })
+                        formatDistanceToNow(file.modifiedAt, { addSuffix: true })
                     }
                 </div>
             </NavLink>

resources/scripts/gloabl.d.ts

@@ -4,6 +4,8 @@ import App from '@/components/App';
 import './i18n';
 import { setConfig } from 'react-hot-loader';
 
+import 'tailwindcss/dist/base.min.css';
+
 // Prevents page reloads while making component changes which
 // also avoids triggering constant loading indicators all over
 // the place in development.