Skip to content

Commit a30002a

Browse files
committed
Merge branch 'main' into task/fp-1499-cms-pattern-library
2 parents 70be7a6 + 9a1e061 commit a30002a

File tree

234 files changed

+26384
-16594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+26384
-16594
lines changed

.eslintrc.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
{
2525
"files": ["*.ts", "*.tsx"],
2626
"extends": ["plugin:@nrwl/nx/typescript"],
27-
"rules": {}
27+
"rules": {
28+
"@typescript-eslint/no-explicit-any": "off"
29+
}
2830
},
2931
{
3032
"files": ["*.js", "*.jsx"],

.postcssrc.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
plugins:
2+
postcss-preset-env:
3+
# https://github.com/csstools/postcss-plugins/tree/main/plugin-packs/postcss-preset-env#stage
4+
stage: false
5+
6+
# https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/FEATURES.md
7+
features:
8+
custom-properties:
9+
# https://github.com/csstools/postcss-plugins/tree/main/plugins/postcss-custom-properties#options
10+
preserve: false
11+
custom-media-queries: true
12+
media-query-ranges: true
13+
custom-selectors: true
14+
nesting-rules: true

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
2-
31
# Tacc
42

53
This project was generated using [Nx](https://nx.dev).
64

75
Things to try:
6+
87
- `npx nx serve tup-ui` to run the app
98
- `npx nx build core-components` to create a distributable library for the core components.
109
- `npx nx build core-styles` to build the style library.
@@ -84,8 +83,6 @@ Run `nx graph` to see a diagram of the dependencies of your projects.
8483

8584
Visit the [Nx Documentation](https://nx.dev) to learn more.
8685

87-
88-
8986
## ☁ Nx Cloud
9087

9188
### Distributed Computation Caching & Distributed Task Execution

apps/tup-ui/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"options": {
2020
"commands": [
2121
{
22-
"command": "npx vite build"
22+
"command": "npx vite build --emptyOutDir"
2323
}
2424
],
2525
"cwd": "apps/tup-ui"

apps/tup-ui/src/App.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useState } from 'react';
2-
import { Message } from '@tacc/core-components';
2+
import { Button, Message } from '@tacc/core-components';
33

44
function App() {
55
const [count, setCount] = useState(0);
@@ -8,11 +8,15 @@ function App() {
88
<div className="App">
99
<header className="App-header">
1010
<p>Hello Vite + React!</p>
11-
<Message />
11+
<Message type="warning">Core-Components Message</Message>
1212
<p>
13-
<button type="button" onClick={() => setCount((count) => count + 1)}>
13+
<Button
14+
onClick={() => setCount((count) => count + 1)}
15+
size="long"
16+
type="primary"
17+
>
1418
count is: {count}
15-
</button>
19+
</Button>
1620
</p>
1721
<p>
1822
Edit <code>App.tsx</code> and save to test HMR updates.

apps/tup-ui/src/index.css

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/* SETTINGS */
2-
@import url('@tacc/core-styles/dist/settings/border.css');
3-
/* below, import local styles (if any) */
1+
/* ITCSS Organization */
2+
/* SEE: https://confluence.tacc.utexas.edu/x/IAA9Cw */
43

54
/* GENERIC */
65
/* @import url('@tacc/core-styles/dist/generics/*.css'); */
@@ -11,7 +10,7 @@
1110
/* below, import local styles (if any) */
1211

1312
/* OBJECTS */
14-
@import url('@tacc/core-styles/dist/objects/o-flex-item-table-wrap.css');
13+
/* @import url('@tacc/core-styles/dist/objects/*.css'); */
1514
/* below, import local styles (if any) */
1615

1716
/* COMPONENTS */

apps/tup-ui/src/styles/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Global stylesheets may `@import` project stylesheets, e.g.:
1414
**`index.css`**
1515

1616
```
17-
@import url('styles/.../settings/color.css');
17+
@import url('@tacc/core-styles/.../settings/color.css');
1818
```
1919

2020
### Import from Component Stylesheets
@@ -24,7 +24,7 @@ Component stylesheets may `@import` project stylesheets, e.g.:
2424
**`components/(.../)SomeProjectComponent.module.css`**
2525

2626
```
27-
@import url('styles/tools/media-queries.css');
27+
@import url('@tacc/core-styles/.../tools/media-queries.css');
2828
2929
@media screen and (--short-and-above) and (--medium-and-above) {
3030
selector {

apps/tup-ui/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"forceConsistentCasingInFileNames": true,
99
"strict": true,
1010
"noImplicitOverride": true,
11-
"noPropertyAccessFromIndexSignature": true,
1211
"noImplicitReturns": true,
1312
"noFallthroughCasesInSwitch": true
1413
},

apps/ui-patterns/.babelrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"presets": [
3+
[
4+
"@nrwl/react/babel",
5+
{
6+
"runtime": "automatic"
7+
}
8+
]
9+
],
10+
"plugins": []
11+
}

apps/ui-patterns/.eslintrc.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
3+
"ignorePatterns": ["!**/*"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
7+
"rules": {}
8+
},
9+
{
10+
"files": ["*.ts", "*.tsx"],
11+
"rules": {}
12+
},
13+
{
14+
"files": ["*.js", "*.jsx"],
15+
"rules": {}
16+
}
17+
]
18+
}

0 commit comments

Comments
 (0)