Merge pull request #28 from iiroj/updates

Updates
iiroj · Oct 1, 2023 · 4a4d86b · 4a4d86b
2 parents 382113f + a601538
commit 4a4d86b
Show file tree

Hide file tree

Showing 10 changed files with 6,689 additions and 3,307 deletions.
diff --git a/.changeset/README.md b/.changeset/README.md
diff --git a/.changeset/config.json b/.changeset/config.json
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -7,27 +7,6 @@ jobs:
   Shared:
     uses: ./.github/workflows/install-lint.yml
 
-  changesets:
-    if: ${{ !startsWith(github.event.pull_request.title, '🦋 Changeset release') }}
-    needs:
-      - Shared
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 20
-      - uses: actions/cache@v3
-        id: cache-node_modules
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
-      - run: npx changeset status --since=${{ github.event.pull_request.base.sha }}
-
   commitlint:
     needs:
       - Shared
@@ -51,8 +30,6 @@ jobs:
   Preview:
     needs:
       - Shared
-      - changesets
-      - commitlint
     runs-on: ubuntu-latest
     environment:
       name: Development

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -15,7 +15,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
+          fetch-depth: 0
+          persist-credentials: false
       - uses: actions/setup-node@v3
         with:
           node-version: 20
@@ -27,11 +28,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
             - name: Create Release Pull Request
-      - name: Create Release Pull Request
-        uses: changesets/action@v1
-        with:
-          title: "🦋 Changeset release"
-          version: npm run version
-          publish: npm run publish
+      - run: npx semantic-release
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
+          GIT_AUTHOR_NAME: ${{ github.event.head_commit.author.name }}
+          GIT_AUTHOR_EMAIL: ${{ github.event.head_commit.author.email }}
+          GIT_GIT_COMMITTER_NAME_NAME: ${{ github.event.head_commit.committer.name }}
+          GIT_GIT_COMMITTER_NAME_EMAIL: ${{ github.event.head_commit.committer.email }}
diff --git a/.husky/pre-push b/.husky/pre-push
diff --git a/.releaserc.js b/.releaserc.js
@@ -0,0 +1,43 @@
+/** @type {import('semantic-release').Options} */
+export default {
+  branches: ["main"],
+  plugins: [
+    ["@semantic-release/commit-analyzer", { preset: "conventionalcommits" }],
+    [
+      "@semantic-release/release-notes-generator",
+      { preset: "conventionalcommits" },
+    ],
+    [
+      "@semantic-release/changelog",
+      {
+        changelogFile: "CHANGELOG.md",
+      },
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        prepareCmd: "npx prettier --write CHANGELOG.md",
+      },
+    ],
+    ["@semantic-release/npm", { npmPublish: false }],
+    [
+      "@semantic-release/git",
+      {
+        assets: ["CHANGELOG.md", "package-lock.json", "package.json"],
+        message:
+          "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}\n\n[skip ci]",
+      },
+    ],
+    [
+      "@semantic-release/github",
+      {
+        failTitle: false,
+        labels: false,
+        releasedLabels: false,
+      },
+    ],
+  ],
+  repositoryUrl: process.env.GITHUB_ACTIONS
+    ? "https://github.com/iiroj/iiro.fi"
+    : "[email protected]:iiroj/iiro.fi.git",
+};
diff --git a/middleware.js b/middleware.js
@@ -1,7 +1,7 @@
 import { next } from "@vercel/edge";
 
 const SECURITY_HEADERS = {
-  "Content-Security-Policy": `default-src 'self'`,
+  "Content-Security-Policy": `default-src 'self'; style-src 'self' 'unsafe-inline'`,
   "Cross-Origin-Embedder-Policy": `require-corp; report-to="default"`,
   "Cross-Origin-Opener-Policy": `same-site; report-to="default"`,
   "Cross-Origin-Resource-Policy": `same-site`,