Skip to content

Commit

Permalink
Merge branch 'next' into docs/console/embedded-faker-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
ST-DDT authored Jan 1, 2025
2 parents 61172df + ece4f16 commit 14aac9c
Show file tree
Hide file tree
Showing 17 changed files with 438 additions and 560 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
{
"name": "FakerJs",
"image": "mcr.microsoft.com/devcontainers/typescript-node:22@sha256:dc2c3654370fe92a55daeefe9d2d95839d85bdc1f68f7fd4ab86621f49e5818a",
"image": "mcr.microsoft.com/devcontainers/typescript-node:22@sha256:9791f4aa527774bc370c6bd2f6705ce5a686f1e6f204badd8dfaacce28c631ae",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ jobs:
run: pnpm vitest run --coverage

- name: Upload coverage to Codecov
uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
43 changes: 2 additions & 41 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,45 +1,6 @@
Faker - Copyright (c) 2022-2024
MIT License

This software consists of voluntary contributions made by many individuals.
For exact contribution history, see the revision history
available at https://github.com/faker-js/faker

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

===

From: https://github.com/faker-js/faker/commit/a9f98046c7d5eeaabe12fc587024c06d683800b8
To: https://github.com/faker-js/faker/commit/29234378807c4141588861f69421bf20b5ac635e

Based on faker.js, copyright Marak Squires and contributor, what follows below is the original license.

===

faker.js - Copyright (c) 2020
Marak Squires
http://github.com/marak/faker.js/

faker.js was inspired by and has used data definitions from:

* https://github.com/stympy/faker/ - Copyright (c) 2007-2010 Benjamin Curtis
* http://search.cpan.org/~jasonk/Data-Faker-0.07/ - Copyright 2004-2005 by Jason Kohles
Copyright 2022-2025 FakerJS Contributors

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,46 +105,46 @@
"dist"
],
"devDependencies": {
"@eslint/compat": "1.2.3",
"@eslint/js": "9.16.0",
"@stylistic/eslint-plugin": "2.11.0",
"@eslint/compat": "1.2.4",
"@eslint/js": "9.17.0",
"@stylistic/eslint-plugin": "2.12.1",
"@types/eslint__js": "8.42.3",
"@types/node": "22.10.1",
"@types/node": "22.10.3",
"@types/sanitize-html": "2.13.0",
"@types/semver": "7.5.8",
"@types/validator": "13.12.2",
"@vitest/coverage-v8": "2.1.7",
"@vitest/eslint-plugin": "1.1.13",
"@vitest/ui": "2.1.7",
"@vueuse/core": "12.0.0",
"@vitest/coverage-v8": "2.1.8",
"@vitest/eslint-plugin": "1.1.20",
"@vitest/ui": "2.1.8",
"@vueuse/core": "12.2.0",
"commit-and-tag-version": "12.5.0",
"cypress": "13.16.0",
"eslint": "9.16.0",
"cypress": "13.17.0",
"eslint": "9.17.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-file-progress": "3.0.1",
"eslint-plugin-jsdoc": "50.6.0",
"eslint-plugin-jsdoc": "50.6.1",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-unicorn": "56.0.1",
"jiti": "2.4.1",
"npm-run-all2": "7.0.1",
"prettier": "3.4.1",
"jiti": "2.4.2",
"npm-run-all2": "7.0.2",
"prettier": "3.4.2",
"prettier-plugin-organize-imports": "4.1.0",
"prettier-plugin-packagejson": "2.5.6",
"rimraf": "5.0.10",
"sanitize-html": "2.13.1",
"sanitize-html": "2.14.0",
"semver": "7.6.3",
"ts-morph": "24.0.0",
"ts-morph": "25.0.0",
"tsup": "8.3.5",
"tsx": "4.19.2",
"typescript": "5.7.2",
"typescript-eslint": "8.16.0",
"typescript-eslint": "8.19.0",
"validator": "13.12.0",
"vitepress": "1.5.0",
"vitest": "2.1.7",
"vitest": "2.1.8",
"vue": "3.5.13",
"vue-tsc": "2.1.10"
"vue-tsc": "2.2.0"
},
"packageManager": "pnpm@9.14.4",
"packageManager": "pnpm@9.15.2",
"engines": {
"node": ">=18.0.0",
"npm": ">=9.0.0"
Expand Down
Loading

0 comments on commit 14aac9c

Please sign in to comment.