diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml index e45c84c3..924118a8 100644 --- a/.github/workflows/Deploy.yml +++ b/.github/workflows/Deploy.yml @@ -25,6 +25,10 @@ on: tags: - 'v*' +permissions: + id-token: write + contents: write + jobs: ubuntu-latest: name: ubuntu-latest @@ -33,8 +37,11 @@ jobs: - uses: actions/checkout@v6 with: fetch-depth: 0 + - uses: actions/setup-node@v6 + with: + node-version: '24' + registry-url: 'https://registry.npmjs.org' - name: 'Run: Deploy' run: ./build.cmd Deploy env: GithubToken: ${{ secrets.GITHUB_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/_build/Build.cs b/_build/Build.cs index 8b659465..8dfd0311 100644 --- a/_build/Build.cs +++ b/_build/Build.cs @@ -37,12 +37,17 @@ [GitHubActions( "Deploy", GitHubActionsImage.UbuntuLatest, - ImportSecrets = new[] { nameof(GithubToken), "NPM_TOKEN" }, + ImportSecrets = new[] { nameof(GithubToken) }, OnPushBranches = new[] { "main", "master", "release/*" }, OnPushTags = new[] { "v*" }, InvokedTargets = new[] { nameof(Deploy) }, FetchDepth = 0, - CacheKeyFiles = new string[] {} + CacheKeyFiles = new string[] {}, + WritePermissions = new[] { + GitHubActionsPermissions.IdToken, + GitHubActionsPermissions.Contents, + }, + AutoGenerate = false )] [GitHubActions( "Publish_Site", @@ -263,11 +268,8 @@ class Build : NukeBuild .DependsOn(TagRelease) .DependsOn(Release) .Executes(() => { - var npmToken = Environment.GetEnvironmentVariable("NPM_TOKEN"); - var npmrcFile = RootDirectory / ".npmrc"; - npmrcFile.WriteAllText($"//registry.npmjs.org/:_authToken={npmToken}"); var tag = gitRepository.IsOnMainOrMasterBranch() ? "latest" : "next"; - Npm($"publish --access public --tag {tag} --workspaces"); + Npm($"publish --access public --tag {tag} --workspaces --provenance"); }); Target PublishSite => _ => _ diff --git a/_build/_build.csproj b/_build/_build.csproj index e81b54cb..3f76dc8a 100644 --- a/_build/_build.csproj +++ b/_build/_build.csproj @@ -15,7 +15,7 @@ - + diff --git a/package-lock.json b/package-lock.json index 93d65747..864df42b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22229,7 +22229,7 @@ }, "packages/react-library": { "name": "@dnncommunity/dnn-elements-react", - "version": "0.28.0-alpha.330", + "version": "0.28.0-beta.2", "license": "MIT", "dependencies": { "@dnncommunity/dnn-elements": "*", @@ -22248,7 +22248,7 @@ }, "packages/stencil-library": { "name": "@dnncommunity/dnn-elements", - "version": "0.28.0-alpha.330", + "version": "0.28.0-beta.2", "license": "MIT", "dependencies": { "jodit": "^4.6.2" diff --git a/package.json b/package.json index 35255f51..01ae1b6a 100644 --- a/package.json +++ b/package.json @@ -13,5 +13,6 @@ "@types/node": "^25.0.10", "lerna": "^9.0.3", "typescript": "^5.0.3" - } + }, + "version": "" } diff --git a/packages/react-library/package.json b/packages/react-library/package.json index 86b72b6d..9b41c4b1 100644 --- a/packages/react-library/package.json +++ b/packages/react-library/package.json @@ -1,6 +1,6 @@ { "name": "@dnncommunity/dnn-elements-react", - "version": "0.28.0-alpha.330", + "version": "0.28.0-beta.2", "description": "Dnn themed custom elements with react wrappers.", "homepage": "https://github.com/dnncommunity/dnn-elements", "license": "MIT", @@ -18,7 +18,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/dnncommunity/dnn-elements.git" + "url": "https://github.com/DNNCommunity/dnn-elements" }, "scripts": { "build": "npm run tsc", diff --git a/packages/stencil-library/licenses.json b/packages/stencil-library/licenses.json index ed6c15dd..70485bc8 100644 --- a/packages/stencil-library/licenses.json +++ b/packages/stencil-library/licenses.json @@ -1,5 +1,5 @@ { - "@dnncommunity/dnn-elements@0.28.0-alpha.330": { + "@dnncommunity/dnn-elements@0.28.0-beta.2": { "licenses": "MIT", "repository": "https://github.com/dnncommunity/dnn-elements", "path": "", diff --git a/packages/stencil-library/package.json b/packages/stencil-library/package.json index c1d8e229..b0912601 100644 --- a/packages/stencil-library/package.json +++ b/packages/stencil-library/package.json @@ -1,8 +1,11 @@ { "name": "@dnncommunity/dnn-elements", - "version": "0.28.0-alpha.330", + "version": "0.28.0-beta.2", "description": "Dnn themed custom elements.", - "repository": "https://github.com/dnncommunity/dnn-elements", + "repository": { + "type": "git", + "url": "https://github.com/DNNCommunity/dnn-elements" + }, "homepage": "https://dnncommunity.github.io/dnn-elements", "license": "MIT", "main": "dist/index.cjs.js",