Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/actions/release/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
- uses: './.github/actions/node-cache'
- name: Install deps
shell: bash
run: npm i
run: npm ci
- name: git config
shell: bash
run: |
Expand All @@ -32,17 +32,18 @@ runs:
- name: Build
shell: bash
run: npx nx run-many -t build
- name: Set publish config
- name: Set npm auth
env:
NPM_TOKEN: ${{ inputs.npm_token }}
shell: bash
run: npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
- name: Version
- name: Release (Version, Changelog, Publish to npm and GitHub)
shell: bash
env:
GH_TOKEN: ${{ inputs.gh_token }}
GITHUB_TOKEN: ${{ inputs.gh_token }}
run: npx nx affected --base=last-release --parallel=1 --target=version --postTargets=syncDependencies,build,npm,github --trackDeps
NODE_AUTH_TOKEN: ${{ inputs.npm_token }}
run: npx nx release --base=last-release
- name: Tag last-release
shell: bash
run: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ Thumbs.db
.webpack-cache
.vscode
.cdn-cache
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Disable legacy peer deps to prevent issues with dev dependency removal from lockfile
# This ensures proper lockfile management during releases
legacy-peer-deps=false
3 changes: 3 additions & 0 deletions examples/test-app-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ export default defineConfig({
},
});
},
// Please ensure you use `cy.origin()` when navigating between domains and remove this option.
// See https://docs.cypress.io/app/references/migration-guide#Changes-to-cyorigin
injectDocumentDomain: true,
},
});
4 changes: 2 additions & 2 deletions examples/test-app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "examples/test-app/src",
"projectType": "application",
"tags": [],
"targets": {
"build": {
"executor": "@nx/webpack:webpack",
Expand Down Expand Up @@ -93,6 +94,5 @@
"jestConfig": "examples/test-app/jest.config.ts"
}
}
},
"tags": []
}
}
8 changes: 4 additions & 4 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getJestProjects } from '@nx/jest';
import { getJestProjectsAsync } from '@nx/jest';

export default {
projects: getJestProjects(),
};
export default async () => ({
projects: await getJestProjectsAsync(),
});
84 changes: 81 additions & 3 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
}
}
},
"version": {
"dependsOn": ["^version"]
},
"component-test": {
"cache": true,
"inputs": ["default", "^production"]
Expand Down Expand Up @@ -69,5 +66,86 @@
"linter": "eslint"
}
}
},
"release": {
"projects": ["@scalprum/core", "@scalprum/react-core", "@scalprum/react-test-utils"],
"projectsRelationship": "independent",
"version": {
"generatorOptions": {
"packageRoot": "dist/{projectRoot}",
"currentVersionResolver": "git-tag",
"updateDependents": "auto"
},
"conventionalCommits": {
"types": {
"feat": {
"semverBump": "minor",
"changelog": {
"title": "Features"
}
},
"fix": {
"semverBump": "patch",
"changelog": {
"title": "Bug Fixes"
}
},
"chore": {
"semverBump": "patch",
"changelog": {
"title": "Chores"
}
},
"refactor": {
"semverBump": "patch",
"changelog": {
"title": "Refactoring"
}
},
"docs": {
"semverBump": "patch",
"changelog": {
"hidden": true
}
},
"style": {
"semverBump": "patch",
"changelog": {
"hidden": true
}
},
"perf": {
"semverBump": "patch",
"changelog": {
"hidden": true
}
},
"test": {
"semverBump": "patch",
"changelog": {
"hidden": true
}
}
}
}
},
"changelog": {
"projectChangelogs": {
"createRelease": "github",
"renderOptions": {
"authors": true,
"commitReferences": true,
"versionTitleDate": true
}
}
},
"releaseTagPattern": "{projectName}-{version}",
"git": {
"commitMessage": "chore: bump {projectName} to {version} [skip ci]",
"push": true,
"commit": true,
"tag": true,
"stageChanges": true
}
}
}
Loading