Merge pull request #6 from born05/feature-go-public

public proposal

Author: roelvanhintum

.github/workflows/publish.yml

@@ -8,19 +8,34 @@ on:
 jobs:
   publish-npm:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 21
+          node-version: 22
+          registry-url: "https://registry.npmjs.org"
+      - run: |
+          cd npm
+          npm ci --include=dev
+          npm run build
+          npm version --git-tag-version=false ${{ github.ref_name }}
+          npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+
+  publish-gpr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
           registry-url: https://npm.pkg.github.com/
       - run: |
           cd npm
           npm ci --include=dev
           npm run build
-          npm publish --access public
+          npm version --git-tag-version=false ${{ github.ref_name }}
+          npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Born05
+Copyright (c) 2024 Born05
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

default.code-workspace

@@ -1,10 +1,10 @@
 {
   "folders": [
     {
-      "path": "npm"
+      "path": "js"
     },
     {
-      "path": "composer"
+      "path": "php"
     },
     {
       "name": "root",
@@ -16,23 +16,17 @@
     "editor.formatOnSave": true,
     "search.exclude": {
       "**/node_modules": true,
-      "**/vendor": true,
-      "**/gql/types.ts": true
-    },
-    "stylelint.enable": true
+      "**/vendor": true
+    }
   },
   "extensions": {
     "recommendations": [
       "svelte.svelte-vscode",
       "esbenp.prettier-vscode",
-      "csstools.postcss",
       "bmewburn.vscode-intelephense-client",
       "valeryanm.vscode-phpsab",
       "dbaeumer.vscode-eslint",
-      "editorconfig.editorconfig",
-      "bradlc.vscode-tailwindcss",
-      "stylelint.vscode-stylelint",
-      "graphql.vscode-graphql"
+      "editorconfig.editorconfig"
     ]
   }
 }

npm/.gitignore renamed to js/.gitignore

@@ -130,3 +130,4 @@ dist
 .pnp.*
 
 index.js
+package-lock.json

npm/.prettierrc renamed to js/.prettierrc

@@ -0,0 +1,5 @@
+import js from '@eslint/js';
+import ts from 'typescript-eslint';
+import prettier from 'eslint-config-prettier';
+
+export default [js.configs.recommended, ...ts.configs.recommended, prettier];

js/eslint.config.js

@@ -65,7 +65,7 @@ export async function createCacheControlResponse(
   redisUrl: string,
   opt: Partial<HeaderOptions>,
   request: Request,
-  response: Response | (() => Response | Promise<Response>) | null = null
+  response: Response | (() => Response | Promise<Response>) | null = null,
 ) {
   const options = {
     ...DEFAULT_HEADER_OPTIONS,
@@ -81,7 +81,7 @@ export async function createCacheControlResponse(
 
     if (
       options.noCacheSearchParams.every(
-        (param) => !new URL(request.url).searchParams.has(param)
+        (param) => !new URL(request.url).searchParams.has(param),
       )
     ) {
       const joinParts = (p: (string | null | undefined | boolean)[]) =>
@@ -140,8 +140,8 @@ export async function createCacheControlResponse(
   const resp = !response
     ? new Response()
     : typeof response === 'function'
-    ? await response()
-    : response;
+      ? await response()
+      : response;
 
   if (resp.status !== 200) return resp;
 
@@ -154,7 +154,7 @@ export async function createCacheControlResponse(
 
 export function cacheControlHandle(
   redisUrl: string,
-  opt: Partial<HandleOptions>
+  opt: Partial<HandleOptions>,
 ): Handle {
   const options = {
     ...DEFAULT_HANDLE_OPTIONS,
@@ -178,7 +178,7 @@ export function cacheControlHandle(
         redisUrl,
         options,
         event.request,
-        () => resolve(event)
+        () => resolve(event),
       );
     }
 

npm/index.ts renamed to js/index.ts

@@ -1,35 +1,37 @@
 {
   "name": "@born05/sveltekit-cache-control",
-  "version": "1.3.2",
   "description": "A simple way to add control caching in your SvelteKit project.",
   "main": "index.js",
+  "type": "module",
   "scripts": {
     "build": "npx tsc",
-    "postversion": "git push && git push --tags"
+    "lint": "prettier --check . && eslint .",
+    "format": "prettier --write ."
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/born05/sveltekit-cache-control.git"
   },
   "keywords": [],
   "author": "Born05",
-  "license": "ISC",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/born05/sveltekit-cache-control/issues"
   },
-  "homepage": "https://github.com/born05/sveltekit-cache-control#readme",
+  "homepage": "https://github.com/born05/sveltekit-cache-control",
   "dependencies": {
     "ioredis": "^5.3.2"
   },
   "devDependencies": {
-    "@types/node": "^20.14.10",
-    "typescript": "^5.4.5"
+    "@eslint/js": "^9.13.0",
+    "eslint": "^9.13.0",
+    "eslint-config-prettier": "^9.1.0",
+    "prettier": "^3.3.3",
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^8.12.1"
   },
   "peerDependencies": {
     "@sentry/sveltekit": ">=7.0.0",
     "@sveltejs/kit": ">=1.0.0 <3.0.0"
-  },
-  "publishConfig": {
-    "registry": "https://npm.pkg.github.com"
   }
 }

npm/package.json renamed to js/package.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
@@ -25,7 +25,7 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "commonjs" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
@@ -77,12 +77,12 @@
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
     // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
     // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
     /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
+    "strict": true /* Enable all strict type-checking options. */,
     // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
     // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
@@ -104,6 +104,6 @@
 
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
   }
 }