Skip to content

Commit

Permalink
Merge branch 'dev' into anveshmekala/8654-refactor-text-area
Browse files Browse the repository at this point in the history
  • Loading branch information
anveshmekala authored Jan 16, 2025
2 parents f538e13 + 1044878 commit c09e198
Show file tree
Hide file tree
Showing 187 changed files with 2,507 additions and 5,695 deletions.
1 change: 1 addition & 0 deletions .github/scripts/addCalcitePackageLabel.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module.exports = async ({ github, context }) => {
github,
context,
label: package,
// eslint-disable-next-line @cspell/spellchecker -- hex color
color: "BFBEAF",
description: `Issues specific to the @esri/${package} package.`,
});
Expand Down
36 changes: 18 additions & 18 deletions .github/scripts/eslint.config.cjs
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
const cspellPlugin = require("@cspell/eslint-plugin");
const eslint = require("@eslint/js");
const globals = require("globals");
const eslint = require("@eslint/js");
const tseslint = require("typescript-eslint");
const cspellPlugin = require("@cspell/eslint-plugin");

module.exports = [
eslint.configs.recommended,
{
files: ["**/*.{c,m,}js"],
plugins: { "@cspell": cspellPlugin },
module.exports = tseslint.config({
files: ["**/*.{c,m,}js"],
extends: [eslint.configs.recommended, tseslint.configs.recommended],
plugins: { "@cspell": cspellPlugin },

languageOptions: {
ecmaVersion: 2021,
sourceType: "commonjs",
globals: {
...globals.node,
},
languageOptions: {
ecmaVersion: 2021,
sourceType: "commonjs",
globals: {
...globals.node,
},
},

rules: {
"comma-dangle": "off",
"@cspell/spellchecker": ["warn", {}],
},
rules: {
"comma-dangle": "off",
"@cspell/spellchecker": ["warn", {}],
"@typescript-eslint/no-require-imports": "off",
},
];
});
2 changes: 1 addition & 1 deletion .github/scripts/omitPrFromChangelog.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ module.exports = async ({ github, context }) => {
body: newPullRequestBody,
});
} else {
console.log(`The \`no changleog entry\` label is not present on this PR.`);
console.log(`The \`no changelog entry\` label is not present on this PR.`);
}
};
2 changes: 1 addition & 1 deletion .github/scripts/trackMilestoneEstimates.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = async ({ github, context, core }) => {
};

const issues = await github.paginate(github.rest.issues.listForRepo, {
// @ts-ignore milestone.number is valid: https://docs.github.com/en/rest/issues/issues#list-repository-issues--parameters
// @ts-expect-error milestone.number is valid: https://docs.github.com/en/rest/issues/issues#list-repository-issues--parameters
milestone: milestone.number,
owner: owner,
repo: repo,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:
jobs:
sync-dev-to-main:
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
id-token: write
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
workflow_dispatch:
jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
id-token: write
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [main, rc, dev]
jobs:
e2e:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/remove-prerelease-changelog-entries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:
name: clean-changelog
jobs:
clean-changelog:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ check_ui_icon_name_consistency() {
valid_pattern="^[a-z0-9-]+-(16|24|32)(-f)?\\.svg$"

# this pattern will check for invalid use of "-f-" anywhere except right before the size
invalid_pattern="-[a-z0-9]+-f-"
invalid_pattern="\-[a-z0-9]+-f-"

staged_files="$(
git diff --cached --name-only --diff-filter=ACM -- packages/calcite-ui-icons/icons/*.svg
git diff --cached --name-only --diff-filter=ACM | grep -E "packages/calcite-ui-icons/icons/.*\.svg" || true
)"

if [ -n "$staged_files" ]; then
Expand Down
2 changes: 1 addition & 1 deletion .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
"*.{json,html,yml}": ["prettier --write"],
"*.scss": ["stylelint --fix", "prettier --write"],
"*.{s,}css": ["stylelint --fix", "prettier --write"],
"*.md": ["prettier --write", "markdownlint --fix"],
};
8 changes: 4 additions & 4 deletions .renovaterc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,14 @@
"schedule": ["before 5am every weekday"],
"labels": ["dependencies"],
"ignoreDeps": [
"@types/jest",
"@types/node",
"@types/react",
"@types/react-dom",
"jest",
"jest-cli",
"node",
"npm",
"puppeteer",
"react",
"react-dom",
"ts-jest",
"typescript"
],
"ignorePaths": ["packages/calcite-ui-icons/**", "examples/**"],
Expand All @@ -29,6 +25,10 @@
"matchPackageNames": ["@arcgis/**"],
"rangeStrategy": "bump"
},
{
"groupName": "CSpell",
"matchPackageNames": ["@cspell/**"]
},
{
"groupName": "Floating UI",
"matchPackageNames": ["@floating-ui/**"]
Expand Down
5 changes: 1 addition & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@
"name": "Design Tokens Spec Test {currentFile}",
"cwd": "${workspaceFolder}/packages/calcite-design-tokens",
"sourceMaps": true,
"runtimeArgs": ["--inspect-brk", "${workspaceRoot}/node_modules/jest/bin/jest.js", "--runInBand", "${file}"],
"env": {
"NODE_OPTIONS": "--experimental-vm-modules"
},
"runtimeArgs": ["--inspect-brk", "${workspaceRoot}/node_modules/vitest/vitest.mjs", "${file}"],
"skipFiles": ["<node_internals>/**"],
"internalConsoleOptions": "neverOpen",
"console": "integratedTerminal"
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Inappropriate/unacceptable behavior is anything hurtful that interferes with oth
- Foul or obscene language
- Stalking
- Sharing graphic or derogatory pictures, drawings, or cartoons
- _Ad hominem_ or personal attacks and insults
- *Ad hominem* or personal attacks and insults
- Unwanted or offensive letters or poems
- Offensive email, voicemail messages, or social media postings
- Personal threats
Expand Down
12 changes: 9 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Calcite follows [Conventional Commits](https://www.conventionalcommits.org/en/v1
Contributions should adhere to the `<type>(<scope>): <descriptive summary>` format and include the following:

- [Commit type](#commit-type)
- [Scope of change](#scope-of-change), *optional*
- [Scope of change](#scope-of-change), _optional_
- [Descriptive commit subject](#descriptive-commit-subject)

Check out the [contribution example](#contribution-example) for a formatted example, and explore [breaking change formatting](#breaking-changes) for consideration during Calcite's breaking change releases.
Expand All @@ -240,7 +240,7 @@ Contributions must adhere to **one** of the following types:

### Scope of change

*Optional*. Most contributions will include a scope, such as a component, multiple components, test(s), or utilities. For example:
_Optional_. Most contributions will include a scope, such as a component, multiple components, test(s), or utilities. For example:

- `text-area`
- `dropdown, dropdown-group, dropdown-item`
Expand Down Expand Up @@ -328,6 +328,12 @@ By default, the PR body will be used for the commit message when squash merging,

### Visual snapshots

If the PR includes visual changes, once you are ready to run Chromatic to create visual snapshots, add the `pr ready for visual snapshots` label to the PR. Removing and re-adding the label is required to re-run snapshots, e.g. when pushing additional updates.
If the PR's linked issue contains the `visual changes` label **or** the PR contains [visual changes](#visual-changes), once you are ready to run Chromatic to create visual snapshots, add the `pr ready for visual snapshots` label to the PR. Removing and re-adding the label is required to re-run snapshots, e.g. when pushing additional updates.

If visual snapshots are not necessary for the PR (e.g. changes to doc, ci, storybook, etc.), you can add the `skip visual snapshots` label instead. The `skip visual snapshots` label can also be used to prevent re-running Chromatic after pushing minor cleanup changes before merging.

#### Visual changes

Visual changes include issues and/or PR's that introduce a visual alteration that is not backwards compatible. If the change could prevent a visual test from passing, the change should be considered a visual change. Visual changes should be coordinated with designers and have consistency across the design system in mind.

Visual changes can be a standalone change, or be introduced with breaking changes. For instance, [Split button consistent divider across appearances](https://github.com/Esri/calcite-design-system/issues/8142) and [List scales, padding, spacing, and font sizes](https://github.com/Esri/calcite-design-system/issues/7100).
Loading

0 comments on commit c09e198

Please sign in to comment.