Skip to content

Commit

Permalink
Improvements (#295)
Browse files Browse the repository at this point in the history
  • Loading branch information
TriPSs authored Jul 18, 2024
2 parents 7397945 + 54a095f commit 9734edc
Show file tree
Hide file tree
Showing 16 changed files with 5,562 additions and 4,471 deletions.
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.0.2.cjs

This file was deleted.

894 changes: 894 additions & 0 deletions .yarn/releases/yarn-4.3.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.2.cjs
yarnPath: .yarn/releases/yarn-4.3.1.cjs
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,52 +33,52 @@
},
"dependencies": {
"@actions/core": "^1.10.1",
"@nx/devkit": "19.3.0",
"@nx/workspace": "19.3.0",
"@nx/devkit": "19.5.0",
"@nx/workspace": "19.5.0",
"@types/tar": "^6.1.13",
"axios": "^1.7.2",
"crypto-js": "^4.2.0",
"deepmerge": "^4.3.1",
"rxjs-for-await": "^1.0.0",
"shelljs": "^0.8.5",
"tar": "^7.2.0",
"tar": "^7.4.0",
"tslib": "^2.6.3",
"yargs": "^17.7.2"
},
"devDependencies": {
"@google-cloud/storage": "^7.11.2",
"@jamesives/github-pages-deploy-action": "^4.6.1",
"@google-cloud/storage": "^7.12.0",
"@jamesives/github-pages-deploy-action": "^4.6.3",
"@jscutlery/semver": "^5.2.2",
"@nx/eslint-plugin": "19.3.0",
"@nx/jest": "19.3.0",
"@nx/js": "19.3.0",
"@nx/node": "19.3.0",
"@nx/plugin": "19.3.0",
"@nx/react": "19.3.0",
"@nx/webpack": "19.3.0",
"@swc-node/register": "1.9.2",
"@swc/core": "1.5.29",
"@nx/eslint-plugin": "19.5.0",
"@nx/jest": "19.5.0",
"@nx/js": "19.5.0",
"@nx/node": "19.5.0",
"@nx/plugin": "19.5.0",
"@nx/react": "19.5.0",
"@nx/webpack": "19.5.0",
"@swc-node/register": "1.10.9",
"@swc/core": "1.7.0",
"@types/jest": "29.5.12",
"@types/node": "20.14.2",
"@types/node": "20.14.11",
"@types/shelljs": "^0.8.15",
"@types/yargs": "^17.0.32",
"@typescript-eslint/eslint-plugin": "7.13.0",
"@typescript-eslint/parser": "7.13.0",
"@typescript-eslint/eslint-plugin": "7.16.1",
"@typescript-eslint/parser": "7.16.1",
"@vercel/ncc": "^0.38.1",
"dotenv": "16.4.5",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-simple-import-sort": "^12.1.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"express": "^4.19.2",
"husky": "^9.0.11",
"husky": "^9.1.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"nx": "19.3.0",
"prettier": "3.3.2",
"ts-jest": "29.1.4",
"nx": "19.5.0",
"prettier": "3.3.3",
"ts-jest": "29.2.2",
"ts-node": "10.9.2",
"tslint": "~6.1.3",
"typescript": "5.4.5"
"typescript": "5.5.3"
},
"packageManager": "yarn@4.0.2"
"packageManager": "yarn@4.3.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export interface TicketInfo {
}

export const getTicketNrFromLine = (options: NotifyChangelogOptions, line: string): TicketInfo | undefined => {
// @ts-expect-error somehow now errors?
const matches = new RegExp(/closes \[(?<repo>.*?)#(?<ticketNr>[0-9]+)\]/g)
.exec(line)

Expand All @@ -17,4 +18,4 @@ export const getTicketNrFromLine = (options: NotifyChangelogOptions, line: strin
}

return undefined
}
}
12 changes: 6 additions & 6 deletions packages/docusaurus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
"dependencies": {
"@docusaurus/core": "3.4.0",
"@docusaurus/preset-classic": "3.4.0",
"@mdx-js/react": "^3.0.0",
"clsx": "^2.0.0",
"prism-react-renderer": "^2.3.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
"@mdx-js/react": "^3.0.1",
"clsx": "^2.1.1",
"prism-react-renderer": "^2.3.1",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.4.0",
"@docusaurus/tsconfig": "3.4.0",
"@docusaurus/types": "3.4.0",
"typescript": "~5.2.2"
"typescript": "~5.5.3"
}
}
8 changes: 4 additions & 4 deletions packages/gcp-functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"builders": "./executors.json",
"generators": "./generators.json",
"devDependencies": {
"@google-cloud/functions-framework": "^3.4.0",
"@nestjs/common": "^10.3.9",
"@nestjs/core": "^10.3.9",
"@nestjs/platform-express": "^10.3.9"
"@google-cloud/functions-framework": "^3.4.1",
"@nestjs/common": "^10.3.10",
"@nestjs/core": "^10.3.10",
"@nestjs/platform-express": "^10.3.10"
},
"nx-migrations": {
"migrations": "./migrations.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/gcp-task-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "7.0.2",
"main": "src/index.js",
"dependencies": {
"@google-cloud/storage": "7.11.2"
"@google-cloud/storage": "7.12.0"
}
}
3 changes: 0 additions & 3 deletions packages/github-pages/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"module": "commonjs"
},
"files": [],
"include": [],
"references": [
Expand Down
7 changes: 4 additions & 3 deletions packages/github-pages/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"module": "commonjs",
"outDir": "../../dist/out-tsc",
"declaration": true,
"types": []
"types": ["node"]
},
"include": ["**/*.ts"],
"exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"]
"exclude": ["**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}
9 changes: 8 additions & 1 deletion packages/github-pages/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,12 @@
"module": "commonjs",
"types": ["jest", "node"]
},
"include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
"include": [
"**/*.spec.ts",
"**/*.spec.tsx",
"**/*.spec.js",
"**/*.spec.jsx",
"**/*.d.ts",
"jest.config.ts"
]
}
4 changes: 2 additions & 2 deletions packages/react-email/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"license": "MIT",
"main": "src/index.js",
"devDependencies": {
"@react-email/components": "0.0.19",
"react-email": "2.1.4"
"@react-email/components": "0.0.21",
"react-email": "2.1.5"
},
"builders": "./executors.json",
"generators": "./generators.json"
Expand Down
4 changes: 2 additions & 2 deletions packages/shadcn-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"devDependencies": {
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"lucide-react": "^0.395.0",
"tailwind-merge": "^2.3.0",
"lucide-react": "^0.408.0",
"tailwind-merge": "^2.4.0",
"tailwindcss-animate": "^1.0.7"
},
"builders": "./executors.json",
Expand Down
4 changes: 2 additions & 2 deletions packages/strapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"license": "MIT",
"main": "src/index.js",
"dependencies": {
"@strapi/generate-new": "4.25.0",
"@strapi/strapi": "4.25.0"
"@strapi/generate-new": "4.25.4",
"@strapi/strapi": "4.25.4"
},
"builders": "./executors.json",
"generators": "./generators.json"
Expand Down
2 changes: 2 additions & 0 deletions packages/strapi/src/generators/init/init.impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ function addFiles(host: Tree, options: NormalizedSchema) {
export default async function (host: Tree, options: StrapiGeneratorSchema) {
const normalizedOptions = normalizeOptions(host, options)

// TODO:: Remove scripts we do not support from package.json

addProjectConfiguration(host, normalizedOptions.projectName, {
root: normalizedOptions.projectRoot,
projectType: 'application',
Expand Down
Loading

0 comments on commit 9734edc

Please sign in to comment.