Skip to content

Commit

Permalink
style: ran yarn format to include new files
Browse files Browse the repository at this point in the history
I also updated the .prettierignore file with some additional generated files I found to speed this
up in the future"
  • Loading branch information
mlaursen committed Aug 16, 2021
1 parent 045ba5e commit 48d3d7f
Show file tree
Hide file tree
Showing 139 changed files with 676 additions and 2,141 deletions.
50 changes: 25 additions & 25 deletions .github/workflows/build_lint_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Build, Lint, and Test

on:
push:
branches: [ main, develop ]
branches: [main, develop]
pull_request:
branches: [ main ]
branches: [main]

jobs:
build_node_matrix:
Expand All @@ -19,35 +19,35 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.3.4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2.4.0
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- run: yarn
- run: yarn setup
- run: yarn dev-utils doc-index
- run: yarn lint
- run: yarn test -i
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2.4.0
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- run: yarn
- run: yarn setup
- run: yarn dev-utils doc-index
- run: yarn lint
- run: yarn test -i

build_node_14:
# only want to use codecov for node 14
name: Build Using Node 14
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.3.4

- name: Use Node.js 14
uses: actions/setup-node@v2.4.0
with:
node-version: 14
cache: yarn
- run: yarn
- run: yarn setup
- run: yarn dev-utils doc-index
- run: yarn lint
- run: yarn test -i --coverage
- run: npx codecov -t ${{ secrets.CODECOV_TOKEN }}
- name: Use Node.js 14
uses: actions/setup-node@v2.4.0
with:
node-version: 14
cache: yarn
- run: yarn
- run: yarn setup
- run: yarn dev-utils doc-index
- run: yarn lint
- run: yarn test -i --coverage
- run: npx codecov -t ${{ secrets.CODECOV_TOKEN }}
58 changes: 29 additions & 29 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ name: "CodeQL"

on:
push:
branches: [ main ]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
branches: [main]
schedule:
- cron: '38 14 * * 1'
- cron: "38 14 * * 1"

jobs:
analyze:
Expand All @@ -32,40 +32,40 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
language: ["javascript"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
10 changes: 8 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
examples/create-react-app/README.md
examples/create-react-app-typescript/README.md
CHANGELOG.md
**/CHANGELOG.md

examples/create-react-app/README.md
examples/create-react-app-typescript/README.md
examples/*/.next
examples/*/.cache
examples/gatsby/public
examples/gatsby-typescript/public

coverage
node_modules

Expand All @@ -15,3 +20,4 @@ packages/*/types
packages/*/.next
packages/documentation/src/constants/sassdoc
packages/documentation/src/constants/sandboxes
packages/documentation/public/tsdocs
7 changes: 3 additions & 4 deletions .sass-lint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
files:
include: 'packages/*/src/**/*.scss'
ignore: 'packages/documentation/src/**/*'
include: "packages/*/src/**/*.scss"
ignore: "packages/documentation/src/**/*"
options:
formatter: stylish
merge-default-rules: false
Expand Down Expand Up @@ -106,7 +106,7 @@ rules:
- dpi
- dpcm
- dppx
- '%'
- "%"
per-property: {}
shorthand-values:
- 1
Expand Down Expand Up @@ -144,4 +144,3 @@ rules:
- allow-leading-underscore: true
convention: hyphenatedlowercase
zero-unit: 1

10 changes: 2 additions & 8 deletions examples/create-react-app-typescript/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"lib": ["dom", "dom.iterable", "esnext"],
"baseUrl": "src",
"rootDir": "src",
"allowJs": true,
Expand All @@ -22,7 +18,5 @@
"noEmit": true,
"jsx": "react-jsx"
},
"include": [
"src"
]
"include": ["src"]
}
10 changes: 2 additions & 8 deletions examples/gatsby-typescript/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"lib": ["dom", "dom.iterable", "esnext"],
"rootDir": "src",
"baseUrl": "src",
"allowJs": true,
Expand All @@ -21,7 +17,5 @@
"noEmit": true,
"jsx": "react"
},
"include": [
"src"
]
"include": ["src"]
}
15 changes: 3 additions & 12 deletions examples/nextjs-typescript/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
"rootDir": "src",
"baseUrl": "src",
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": false,
Expand All @@ -20,11 +16,6 @@
"isolatedModules": true,
"jsx": "preserve"
},
"include": [
"next-env.d.ts",
"src"
],
"exclude": [
"node_modules"
]
"include": ["next-env.d.ts", "src"],
"exclude": ["node_modules"]
}
9 changes: 2 additions & 7 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
{
"packages": [
"packages/*"
],
"packages": ["packages/*"],
"command": {
"version": {
"message": "chore(release): publish %s",
"conventionalCommits": true
}
},
"ignoreChanges": [
"**/__tests__/**",
"**/*.md"
],
"ignoreChanges": ["**/__tests__/**", "**/*.md"],
"changelogPreset": {
"name": "./changelog.config.js"
},
Expand Down
35 changes: 8 additions & 27 deletions packages/alert/tsconfig.cjs.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,15 @@
"rootDir": "src",
"outDir": "lib",
"baseUrl": ".",
"paths": {
"@react-md/*": [
"../*"
]
}
"paths": { "@react-md/*": ["../*"] }
},
"include": [
"src"
],
"exclude": [
"**/__tests__/*",
"**/scssVariables.ts"
],
"include": ["src"],
"exclude": ["**/__tests__/*", "**/scssVariables.ts"],
"references": [
{
"path": "../button/tsconfig.cjs.json"
},
{
"path": "../portal/tsconfig.cjs.json"
},
{
"path": "../transition/tsconfig.cjs.json"
},
{
"path": "../typography/tsconfig.cjs.json"
},
{
"path": "../utils/tsconfig.cjs.json"
}
{ "path": "../button/tsconfig.cjs.json" },
{ "path": "../portal/tsconfig.cjs.json" },
{ "path": "../transition/tsconfig.cjs.json" },
{ "path": "../typography/tsconfig.cjs.json" },
{ "path": "../utils/tsconfig.cjs.json" }
]
}
35 changes: 8 additions & 27 deletions packages/alert/tsconfig.ejs.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,15 @@
"declaration": true,
"declarationDir": "types",
"baseUrl": ".",
"paths": {
"@react-md/*": [
"../*"
]
}
"paths": { "@react-md/*": ["../*"] }
},
"include": [
"src"
],
"exclude": [
"**/__tests__/*",
"**/scssVariables.ts"
],
"include": ["src"],
"exclude": ["**/__tests__/*", "**/scssVariables.ts"],
"references": [
{
"path": "../button/tsconfig.ejs.json"
},
{
"path": "../portal/tsconfig.ejs.json"
},
{
"path": "../transition/tsconfig.ejs.json"
},
{
"path": "../typography/tsconfig.ejs.json"
},
{
"path": "../utils/tsconfig.ejs.json"
}
{ "path": "../button/tsconfig.ejs.json" },
{ "path": "../portal/tsconfig.ejs.json" },
{ "path": "../transition/tsconfig.ejs.json" },
{ "path": "../typography/tsconfig.ejs.json" },
{ "path": "../utils/tsconfig.ejs.json" }
]
}
9 changes: 2 additions & 7 deletions packages/alert/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"noEmit": true,
"composite": false
},
"include": [
"src"
]
"compilerOptions": { "noEmit": true, "composite": false },
"include": ["src"]
}
4 changes: 1 addition & 3 deletions packages/alert/tsconfig.var.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@
"skipLibCheck": true,
"module": "commonjs"
},
"include": [
"src/scssVariables.ts"
]
"include": ["src/scssVariables.ts"]
}
Loading

0 comments on commit 48d3d7f

Please sign in to comment.