Skip to content

Commit

Permalink
Improvements (#149)
Browse files Browse the repository at this point in the history
  • Loading branch information
TriPSs authored Sep 7, 2023
2 parents bdfbd10 + bee7347 commit 7671150
Show file tree
Hide file tree
Showing 6 changed files with 287 additions and 213 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
},
"dependencies": {
"@actions/core": "^1.10.0",
"@nx/devkit": "16.7.4",
"@nx/workspace": "16.7.4",
"@nx/devkit": "16.8.0",
"@nx/workspace": "16.8.0",
"@types/tar": "^6.1.5",
"axios": "^1.5.0",
"crypto-js": "^4.1.1",
Expand All @@ -50,13 +50,13 @@
"@google-cloud/storage": "^7.0.1",
"@jamesives/github-pages-deploy-action": "^4.4.3",
"@jscutlery/semver": "^3.1.0",
"@nx/eslint-plugin": "16.7.4",
"@nx/jest": "16.7.4",
"@nx/js": "16.7.4",
"@nx/node": "16.7.4",
"@nx/plugin": "16.7.4",
"@nx/react": "16.7.4",
"@nx/webpack": "16.7.4",
"@nx/eslint-plugin": "16.8.0",
"@nx/jest": "16.8.0",
"@nx/js": "16.8.0",
"@nx/node": "16.8.0",
"@nx/plugin": "16.8.0",
"@nx/react": "16.8.0",
"@nx/webpack": "16.8.0",
"@swc-node/register": "^1.6.7",
"@swc/core": "^1.3.81",
"@types/jest": "29.5.4",
Expand All @@ -73,7 +73,7 @@
"husky": "^8.0.3",
"jest": "29.6.4",
"jest-environment-jsdom": "29.6.4",
"nx": "16.7.4",
"nx": "16.8.0",
"nx-cloud": "16.3.0",
"prettier": "3.0.3",
"ts-jest": "29.1.1",
Expand Down
3 changes: 3 additions & 0 deletions packages/core/migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"generators": {}
}
23 changes: 22 additions & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
{
"name": "@nx-extend/core",
"version": "4.3.2",
"main": "src/index.js"
"main": "src/index.js",
"nx-migrations": {
"migrations": "./migrations.json",
"packageGroup": [
"@nx-extend/changelog-notify",
"@nx-extend/e2e-runner",
"@nx-extend/firebase-hosting",
"@nx-extend/gcp-cloud-run",
"@nx-extend/gcp-deployment-manager",
"@nx-extend/gcp-functions",
"@nx-extend/gcp-secrets",
"@nx-extend/gcp-storage",
"@nx-extend/gcp-task-runner",
"@nx-extend/github-pages",
"@nx-extend/playwright",
"@nx-extend/pulumi",
"@nx-extend/strapi",
"@nx-extend/terraform",
"@nx-extend/translations",
"@nx-extend/vercel"
]
}
}
7 changes: 4 additions & 3 deletions packages/gcp-functions/src/utils/generate-package-json.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
ExecutorContext,
detectPackageManager,
ExecutorContext, getPackageManagerCommand,
logger,
readJsonFile,
writeJsonFile
Expand Down Expand Up @@ -103,8 +104,8 @@ export const generatePackageJson = (

if (generateLockFile) {
fs.writeFileSync(
`${options.outputPath}/${getLockFileName()}`,
createLockFile(packageJson),
`${options.outputPath}/${getLockFileName(detectPackageManager())}`,
createLockFile(packageJson, readCachedProjectGraph()),
{
encoding: 'utf-8'
}
Expand Down
6 changes: 3 additions & 3 deletions packages/strapi/src/utils/create-package-json.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { readJsonFile, writeJsonFile } from '@nx/devkit'
import { detectPackageManager, readJsonFile, writeJsonFile } from '@nx/devkit'
import { createLockFile, createPackageJson as generatePackageJson } from '@nx/js'
import { readCachedProjectGraph } from '@nx/workspace/src/core/project-graph'
import { existsSync,writeFileSync } from 'fs'
Expand Down Expand Up @@ -55,8 +55,8 @@ export async function createPackageJson(

if (generateLockFile) {
writeFileSync(
`${outputPath}/${getLockFileName()}`,
createLockFile(packageJson),
`${outputPath}/${getLockFileName(detectPackageManager())}`,
createLockFile(packageJson, readCachedProjectGraph()),
{
encoding: 'utf-8'
}
Expand Down
Loading

0 comments on commit 7671150

Please sign in to comment.