Merge branch 'master' into feature/next-js

tsconfig.json

@@ -5,9 +5,14 @@
     "noImplicitAny": false,
     "esModuleInterop": true,
     "experimentalDecorators": true,
-    // "emitDecoratorMetadata": true,
-    // "allowSyntheticDefaultImports": true,
-    // "resolveJsonModule": true,
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
     "module": "commonjs",
     "target": "es5",
     "jsx": "preserve",
@@ -21,6 +26,9 @@
     ],
     "baseUrl": "./",
     "paths": {
+      "@assets/*": [
+        "src/assets/*"
+      ],
       "@components/*": [
         "src/components/*"
       ],
@@ -43,14 +51,6 @@
         "src/utils/*"
       ]
     },
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": false,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true
   },
   "include": [
     "./src/**/*",