Simplify and add back sass

jupl · Jul 23, 2020 · 82de8f7 · 82de8f7
1 parent 8aea466
commit 82de8f7
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 30 deletions.
diff --git a/.eslintrc.json → .eslintrc b/.eslintrc.json → .eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": "@jupl/ts",
+  "extends": "@jupl/ts/lint",
   "ignorePatterns": [".parcel-cache/", "coverage/", "dist/"]
 }
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1 @@
+"@jupl/ts/format"
diff --git a/.prettierrc.js b/.prettierrc.js
diff --git a/package.json b/package.json
@@ -30,8 +30,8 @@
   "devDependencies": {
     "@babel/core": "^7.10.5",
     "@jest/globals": "^26.1.0",
-    "@jupl/eslint-config-ts": "npm:@jupl/ts",
-    "@jupl/ts": "^0.8.0",
+    "@jupl/eslint-config-ts": "npm:@jupl/ts@^0.9.0",
+    "@jupl/ts": "^0.9.0",
     "@storybook/addon-a11y": "^6.0.0-rc.13",
     "@storybook/addon-actions": "^6.0.0-rc.13",
     "@storybook/addon-knobs": "^6.0.0-rc.13",
@@ -51,6 +51,7 @@
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.0.5",
     "react-test-renderer": "^16.13.1",
+    "sass": "^1.26.10",
     "trash-cli": "^3.0.0",
     "ts-node": "^8.10.2",
     "tsconfig-paths-webpack-plugin": "^3.2.0",

diff --git a/src/+dist/index.html b/src/+dist/index.html
@@ -7,6 +7,7 @@
       content="minimum-scale=1, initial-scale=1, width=device-width"
     />
     <title>Application</title>
+    <link rel="stylesheet" href="~/src/main/index.scss" />
     <script defer src="~/src/main/index.tsx"></script>
   </head>
   <body></body>

diff --git a/src/main/index.scss b/src/main/index.scss
@@ -0,0 +1 @@
+// Start writing!
diff --git a/yarn.lock b/yarn.lock
@@ -1490,10 +1490,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@jupl/eslint-config-ts@npm:@jupl/ts", "@jupl/ts@^0.8.0":
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/@jupl/ts/-/ts-0.8.3.tgz#8a21c26fe0fa87fdf55fc2452cc0a7e567c4158d"
-  integrity sha512-zFjvi0gA3w6os6+E/lhMxGbeks09+O5tl2G2otyi9iVUUmTFhedIT4LlKhRptYcGqNXpmLZdMXDN6C3XqEq05Q==
+"@jupl/eslint-config-ts@npm:@jupl/ts@^0.9.0", "@jupl/ts@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@jupl/ts/-/ts-0.9.0.tgz#85556705649d16e7161c0bc128c8b2a1dea35d5f"
+  integrity sha512-LLjYLSKFns9thuiyt34MD8f1aNICmU1PI66MgJpFcBe09tnx/efA8uNcYcrAhIVT4RhsSGw4HlqPCuz315sFsg==
   dependencies:
     "@typescript-eslint/eslint-plugin" "^3.6.1"
     "@typescript-eslint/parser" "^3.6.1"
@@ -4905,6 +4905,21 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+"chokidar@>=2.0.0 <4.0.0", chokidar@^3.3.0, chokidar@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz#e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"
+  integrity sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.4.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -4924,21 +4939,6 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.3.0, chokidar@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz#e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"
-  integrity sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.4.0"
-  optionalDependencies:
-    fsevents "~2.1.2"
-
 chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -8106,17 +8106,17 @@ inquirer@7.0.4:
     through "^2.3.6"
 
 inquirer@^7.0.0:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz#25245d2e32dc9f33dbe26eeaada231daa66e9c7c"
-  integrity sha512-DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w==
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
     ansi-escapes "^4.2.1"
     chalk "^4.1.0"
     cli-cursor "^3.1.0"
     cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
-    lodash "^4.17.16"
+    lodash "^4.17.19"
     mute-stream "0.0.8"
     run-async "^2.4.0"
     rxjs "^6.6.0"
@@ -9618,7 +9618,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19:
+lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
@@ -12822,6 +12822,13 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
+sass@^1.26.10:
+  version "1.26.10"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.10.tgz#851d126021cdc93decbf201d1eca2a20ee434760"
+  integrity sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==
+  dependencies:
+    chokidar ">=2.0.0 <4.0.0"
+
 sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"