Skip to content

Commit

Permalink
Merge branch 'archives/fast-element-1' into tabs-active-indicator-min…
Browse files Browse the repository at this point in the history
…-int
  • Loading branch information
janechu authored Sep 11, 2024
2 parents eda7138 + 1f9c97d commit 855a3db
Show file tree
Hide file tree
Showing 160 changed files with 3,104 additions and 16,269 deletions.
4 changes: 0 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ build/ @janechu @nicholasrice @chrisdholt @awentzel @EisenbergEffect

# Package specific owners

# Tooling
/packages/tooling/fast-figma-plugin-msft/ @nicholasrice @bheston @janechu @EisenbergEffect

# Utilities
/packages/utilities/fast-animation/ @nicholasrice @chrisdholt
/packages/utilities/fast-colors/ @nicholasrice @chrisdholt
/packages/utilities/fast-eslint-rules/ @nicholasrice @janechu @chrisdholt
/packages/utilities/fast-web-utilities/ @janechu @chrisdholt @nicholasrice
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd-deploy-color-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@master

- name: Install Lerna
run: yarn global add lerna
run: yarn global add lerna@5.5.2

- name: Install package dependencies / prepare workspaces
run: yarn install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd-deploy-www-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@master

- name: Install Lerna
run: yarn global add lerna
run: yarn global add lerna@5.5.2

- name: Install package dependencies / prepare workspaces
run: yarn install --frozen-lockfile
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/cd-deploy-www-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
- master
paths:
- '.github/workflows/cd-deploy-www-staging.yml'
- 'packages/utilities/fast-animation/docs/api-report.md'
- 'packages/utilities/fast-color/docs/api-report.md'
- 'packages/utilities/fast-react-wrapper/docs/api-report.md'
- 'packages/web-components/**/docs/api-report.md'
Expand All @@ -17,7 +16,6 @@ on:
- master
paths:
- '.github/workflows/cd-deploy-www-staging.yml'
- 'packages/utilities/fast-animation/docs/api-report.md'
- 'packages/utilities/fast-color/docs/api-report.md'
- 'packages/utilities/fast-react-wrapper/docs/api-report.md'
- 'packages/web-components/**/docs/api-report.md'
Expand All @@ -41,7 +39,7 @@ jobs:
uses: actions/checkout@master

- name: Install Lerna
run: yarn global add lerna
run: yarn global add lerna@5.5.2

- name: Install package dependencies / prepare workspaces
run: yarn install --frozen-lockfile
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/cd-release-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN }}

- uses: actions/setup-node@v3
with:
node-version: 16.20.0

- name: Add or Update packages
run: sudo yarn global add lerna
run: sudo yarn global add lerna@5.5.2

- name: Set Git User
run: |
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/ci-validate-platforms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Validate Platforms/Browsers
on:
push:
branches:
- master
- archives/fast-element-1

pull_request:
branches:
- master
- archives/fast-element-1

schedule:
- cron: 0 7 * * 3
Expand All @@ -34,9 +34,13 @@ jobs:
- name: Checkout Branch
uses: actions/checkout@v2

- uses: actions/setup-node@v3
with:
node-version: 16.20.0

- if: ${{ github.event_name == 'pull_request' }}
run: |
git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
git fetch --no-tags --prune --depth=1 origin +refs/heads/archives/fast-element-1:refs/remotes/origin/archives/fast-element-1
- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down Expand Up @@ -65,18 +69,18 @@ jobs:

- name: Run tests in changed packages
if: ${{ github.event_name == 'pull_request' }}
run: yarn lerna run test --stream --since=origin/master
run: yarn lerna run test --stream --since=origin/archives/fast-element-1

- name: Run tests in all Lerna Packages
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/archives/fast-element-1' }}
run: yarn lerna run test --stream

- name: Initialize CodeQL
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/archives/fast-element-1' }}
uses: github/codeql-action/init@v1
with:
languages: javascript, typescript

- name: Perform CodeQL Analysis
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/archives/fast-element-1' }}
uses: github/codeql-action/analyze@v1
22 changes: 6 additions & 16 deletions .github/workflows/ci-validate-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Validate PRs
on:
push:
branches:
- master
- archives/fast-element-1
- releases/*
pull_request:
branches:
- master
- archives/fast-element-1
- releases/*
- features/*

Expand All @@ -20,6 +20,10 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-node@v3
with:
node-version: 16.20.0

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo '::set-output name=dir::$(yarn cache dir)'
Expand Down Expand Up @@ -51,19 +55,5 @@ jobs:
- name: Testing unit tests
run: yarn lerna run test --stream

- name: Collect and upload code coverage to Code Climate
uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: 08a773cb4ea5811add5a45e12873e5cd2634c005568705cc37abfd5217617a32
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
coverageCommand: yarn lerna run coverage
coverageLocations: |
${{github.workspace}}/packages/tooling/fast-figma-plugin-msft/coverage/lcov.info:lcov
${{github.workspace}}/packages/utilities/fast-animation/coverage/lcov.info:lcov
${{github.workspace}}/packages/utilities/fast-colors/coverage/lcov.info:lcov
${{github.workspace}}/packages/utilities/fast-eslint-rules/coverage/lcov.info:lcov
debug: false

- name: Testing final validation
run: yarn test:validation
3 changes: 1 addition & 2 deletions .github/workflows/testing/ci-daily-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
sudo apt-get update
sudo apt-get install yarn
sudo yarn global upgrade typescript
sudo yarn global add lerna
sudo yarn global add lerna@5.5.2
- name: Install package dependencies / prepare workspaces
run: yarn install --frozen-lockfile
Expand All @@ -35,6 +35,5 @@ jobs:
with:
coverageCommand: lerna run coverage
coverageLocations: |
${{github.workspace}}/packages/utilities/fast-animation/coverage/lcov.info:lcov
${{github.workspace}}/packages/utilities/fast-colors/coverage/lcov.info:lcov
debug: true
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
"files.insertFinalNewline": false
},
"[markdown]": {
"editor.quickSuggestions": false,
"editor.quickSuggestions": {
"comments": "off",
"strings": "off",
"other": "off"
},
"editor.wordWrap": "off",
"editor.wordWrapColumn": 90,
"files.insertFinalNewline": false,
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ npm install -g yarn
The second tool you'll need is Lerna, which can be installed with this command:

```bash
yarn global add lerna
yarn global add lerna@5.5.2
```

:::important
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "Export Symbol to allow prepending specific stylesheets to adoptedStyleSheets",
"packageName": "@microsoft/fast-element",
"email": "[email protected]",
"dependentChangeType": "patch"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: prevent toolbar from stealing focus when focus has already been moved in the document",
"packageName": "@microsoft/fast-foundation",
"email": "=",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Fix CSS custom property precedence issue and work around Chromium bug",
"packageName": "@microsoft/fast-foundation",
"email": "[email protected]",
"dependentChangeType": "patch"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Fix toolbar tests",
"packageName": "@microsoft/fast-foundation",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "feat: close combobox if indicator is clicked and no selection is made",
"packageName": "@microsoft/fast-foundation",
"email": "=",
"dependentChangeType": "patch"
}
52 changes: 1 addition & 51 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
],
"nohoist": [
"**/@types/chai",
"**/@types/jest",
"**/@types/karma",
"**/@types/mocha",
"**/@types/node",
Expand Down Expand Up @@ -54,9 +53,6 @@
"test:diff": "git update-index --refresh && git diff-index --quiet HEAD -- || yarn test:diff:error",
"test:validation": "yarn test:diff",
"test": "yarn eslint \"/**/*.{ts}\" ",
"unit-tests": "jest --maxWorkers=4",
"coverage": "yarn jest --coverage",
"unit-tests:watch": "jest --watch",
"watch": "tsc -p ./tsconfig.json -w --preserveWatchOutput",
"format:check": "lerna run prettier:diff",
"format": "lerna run prettier"
Expand All @@ -66,49 +62,6 @@
"pre-commit": "lint-staged"
}
},
"jest": {
"collectCoverage": true,
"collectCoverageFrom": [
"build/helpers/*.ts"
],
"coverageReporters": [
"json",
[
"lcov",
{
"projectRoot": "."
}
]
],
"coverageThreshold": {
"global": {
"statements": 100,
"branches": 100,
"functions": 100,
"lines": 100
}
},
"testURL": "http://localhost",
"transform": {
"^.+\\.ts?$": "ts-jest",
"^.+\\.js?$": "babel-jest"
},
"transformIgnorePatterns": [
"!<rootDir>/node_modules/lodash-es",
"node_modules/jss-*",
"node_modules/css-vendor"
],
"testPathIgnorePatterns": [
"packages/",
"build/helpers/__tests__/*",
"build/helpers/"
],
"testRegex": "/__tests__/.*\\.(test|spec)\\.(js|ts|tsx)$",
"moduleFileExtensions": [
"ts",
"js"
]
},
"lint-staged": {
"*.{ts,tsx,js,html}": [
"prettier --write"
Expand Down Expand Up @@ -144,7 +97,6 @@
"@babel/core": "^7.12.13",
"@babel/preset-env": "^7.12.13",
"@octokit/rest": "^18.0.6",
"@types/jest": "^25.2.1",
"@types/lodash-es": "^4.17.4",
"@types/node": "^15.0.1",
"beachball": "^2.24.0",
Expand All @@ -155,13 +107,11 @@
"eyes.selenium": "3.6.2",
"glob": "^7.1.2",
"husky": "^4.2.5",
"jest": "^25.4.0",
"lerna": "^3.20.2",
"lerna": "^5.5.2",
"lint-staged": "^10.1.2",
"markdown-it": "^12.3.2",
"prettier": "2.0.2",
"rimraf": "^3.0.2",
"ts-jest": "^25.4.0",
"ts-node": "^8.8.2",
"typescript": "^4.6.2",
"yargs": "^16.2.0"
Expand Down
6 changes: 0 additions & 6 deletions packages/tooling/fast-figma-plugin-msft/.eslintignore

This file was deleted.

8 changes: 0 additions & 8 deletions packages/tooling/fast-figma-plugin-msft/.eslintrc.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/tooling/fast-figma-plugin-msft/.npmrc

This file was deleted.

Loading

0 comments on commit 855a3db

Please sign in to comment.