Skip to content

Commit

Permalink
Merge branch 'next' into docs/document-emoji-types
Browse files Browse the repository at this point in the history
  • Loading branch information
ST-DDT authored Jan 24, 2023
2 parents c152ee1 + 0af40f7 commit 876854f
Show file tree
Hide file tree
Showing 57 changed files with 2,783 additions and 776 deletions.
36 changes: 36 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
{
"name": "FakerJs",
"image": "mcr.microsoft.com/devcontainers/typescript-node:0-18",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [5173],
"portsAttributes": {
"5173": {
"label": "Docs"
}
},

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "npm install -g pnpm && pnpm install",

// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"dbaeumer.vscode-eslint",
"editorconfig.editorconfig",
"esbenp.prettier-vscode",
"redhat.vscode-yaml",
"github.vscode-pull-request-github"
]
}
}

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
15 changes: 14 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
- os: windows-latest
node_version: 18
fail-fast: false
timeout-minutes: 10

name: 'Build & Unit Test: node-${{ matrix.node_version }}, ${{ matrix.os }}'
steps:
Expand Down Expand Up @@ -67,6 +68,7 @@ jobs:
env:
LANG: zh_SG.UTF-8
TZ: Asia/Singapore
timeout-minutes: 10

name: 'Timezone Test: node-${{ matrix.node_version }}, ${{ matrix.os }}'
steps:
Expand Down Expand Up @@ -108,6 +110,7 @@ jobs:

e2e-test:
runs-on: ubuntu-latest
timeout-minutes: 15
name: 'E2E Doc Test: node-18, ubuntu-latest'
steps:
- name: Checkout
Expand All @@ -129,11 +132,18 @@ jobs:
- name: Build docs
run: pnpm run docs:build:ci

- name: Run e2e
- id: e2e
name: Run e2e
run: timeout 5m pnpm run docs:test:e2e:run
continue-on-error: true

- name: Run e2e (2nd attempt)
if: ${{ steps.e2e.outcome != 'success' }}
run: pnpm run docs:test:e2e:run

lint:
runs-on: ubuntu-latest
timeout-minutes: 10
name: 'Lint: node-18, ubuntu-latest'
steps:
- name: Checkout
Expand Down Expand Up @@ -165,6 +175,7 @@ jobs:

ts-check-scripts:
runs-on: ubuntu-latest
timeout-minutes: 10
name: 'TS-Check Scripts: node-18, ubuntu-latest'
steps:
- name: Checkout
Expand Down Expand Up @@ -193,6 +204,7 @@ jobs:

ts-check-tests:
runs-on: ubuntu-latest
timeout-minutes: 10
name: 'TS-Check Tests: node-18, ubuntu-latest'
steps:
- name: Checkout
Expand Down Expand Up @@ -221,6 +233,7 @@ jobs:

codecov:
runs-on: ubuntu-latest
timeout-minutes: 10
name: 'Codecov: node-18, ubuntu-latest'
steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ permissions:
jobs:
check-code-generation:
runs-on: ubuntu-latest
timeout-minutes: 10
name: 'Check Code Generation: node-18, ubuntu-latest'
permissions:
pull-requests: write
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/semantic-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ on:
- synchronize

permissions: {}

jobs:
main:
permissions:
pull-requests: read # to analyze PRs (amannn/action-semantic-pull-request)
statuses: write # to mark status of analyzed PR (amannn/action-semantic-pull-request)

runs-on: ubuntu-latest
timeout-minutes: 10
name: Semantic Pull Request
steps:
- name: Validate PR title
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ coverage

# Dependency directories
node_modules/
.pnpm-store/

# TypeScript cache
*.tsbuildinfo
Expand Down
11 changes: 11 additions & 0 deletions .versionrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"types": [
{ "type": "feat", "scope": "locale", "section": "New Locales" },
{ "type": "feat", "section": "Features" },
{ "type": "refactor", "scope": "locale", "section": "Changed Locales" },
{ "type": "fix", "section": "Bug Fixes" },
{ "type": "chore", "hidden": true },
{ "type": "docs", "hidden": true },
{ "type": "refactor", "hidden": true }
]
}
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"dbaeumer.vscode-eslint",
"editorconfig.editorconfig",
"esbenp.prettier-vscode",
"redhat.vscode-yaml"
"redhat.vscode-yaml",
"github.vscode-pull-request-github"
]
}
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,38 +83,38 @@
"devDependencies": {
"@actions/github": "~5.1.1",
"@algolia/client-search": "~4.14.3",
"@types/glob": "~8.0.0",
"@types/glob": "~8.0.1",
"@types/markdown-it": "~12.2.3",
"@types/node": "~18.11.18",
"@types/prettier": "~2.7.2",
"@types/react": "~18.0.26",
"@types/react": "~18.0.27",
"@types/sanitize-html": "~2.8.0",
"@types/semver": "~7.3.13",
"@types/validator": "~13.7.10",
"@typescript-eslint/eslint-plugin": "~5.48.1",
"@typescript-eslint/parser": "~5.48.1",
"@vitest/coverage-c8": "~0.27.0",
"@vitest/ui": "~0.27.0",
"@vueuse/core": "~9.10.0",
"@typescript-eslint/eslint-plugin": "~5.48.2",
"@typescript-eslint/parser": "~5.48.2",
"@vitest/coverage-c8": "~0.27.3",
"@vitest/ui": "~0.27.3",
"@vueuse/core": "~9.11.1",
"c8": "~7.12.0",
"conventional-changelog-cli": "~2.2.2",
"cypress": "~12.3.0",
"esbuild": "~0.16.16",
"eslint": "~8.31.0",
"esbuild": "~0.17.4",
"eslint": "~8.32.0",
"eslint-config-prettier": "~8.6.0",
"eslint-define-config": "~1.14.0",
"eslint-gitignore": "~0.1.0",
"eslint-plugin-jsdoc": "~39.6.4",
"eslint-plugin-jsdoc": "~39.6.7",
"eslint-plugin-prettier": "~4.2.1",
"glob": "~8.0.3",
"glob": "~8.1.0",
"mime-db": "~1.52.0",
"npm-run-all": "~4.1.5",
"picocolors": "~1.0.0",
"prettier": "2.8.1",
"prettier-plugin-organize-imports": "~3.2.1",
"prettier": "2.8.3",
"prettier-plugin-organize-imports": "~3.2.2",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"rimraf": "~3.0.2",
"rimraf": "~4.1.1",
"sanitize-html": "~2.8.1",
"semver": "~7.3.8",
"standard-version": "~9.5.0",
Expand All @@ -124,11 +124,11 @@
"typescript": "~4.9.4",
"validator": "~13.7.0",
"vite": "~4.0.4",
"vitepress": "1.0.0-alpha.35",
"vitest": "~0.27.0",
"vitepress": "1.0.0-alpha.40",
"vitest": "~0.27.3",
"vue": "~3.2.45"
},
"packageManager": "pnpm@7.24.2",
"packageManager": "pnpm@7.25.1",
"engines": {
"node": "^14.17.0 || ^16.13.0 || >=18.0.0",
"npm": ">=6.14.13"
Expand Down
Loading

0 comments on commit 876854f

Please sign in to comment.