(chore) update versions (#55)

* (chore) update versions * (fix) Add missing build files --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Nicolas Brassard <[email protected]>
DeuxHuitHuit · Feb 12, 2025 · 417de9c · 417de9c
1 parent 2fc065b
commit 417de9c
Show file tree

Hide file tree

Showing 23 changed files with 173 additions and 33 deletions.
diff --git a/.changeset/fifty-pets-walk.md b/.changeset/fifty-pets-walk.md
diff --git a/.github/workflows/changeset.yaml b/.github/workflows/changeset.yaml
@@ -31,6 +31,8 @@ jobs:
               run: pnpm sync
             - name: build
               run: pnpm build
+            - name: add build files
+              run: git add .
             - name: create and publish versions
               uses: changesets/action@v1
               with:

diff --git a/packages/components/html-elements/CHANGELOG.md b/packages/components/html-elements/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @288-toolkit/html-elements
 
+## 3.1.4
+
+### Patch Changes
+
+-   Updated dependencies [2fc065b]
+    -   @288-toolkit/url@5.2.0
+
 ## 3.1.3
 
 ### Patch Changes

diff --git a/packages/components/html-elements/package.json b/packages/components/html-elements/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@288-toolkit/html-elements",
-	"version": "3.1.3",
+	"version": "3.1.4",
 	"author": "DeuxHuitHuit",
 	"license": "MIT",
 	"type": "module",

diff --git a/packages/components/video-embed/CHANGELOG.md b/packages/components/video-embed/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @288-toolkit/video-embed
 
+## 4.0.6
+
+### Patch Changes
+
+-   Updated dependencies [2fc065b]
+    -   @288-toolkit/url@5.2.0
+    -   @288-toolkit/html-elements@3.1.4
+
 ## 4.0.5
 
 ### Patch Changes

diff --git a/packages/components/video-embed/package.json b/packages/components/video-embed/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@288-toolkit/video-embed",
-	"version": "4.0.5",
+	"version": "4.0.6",
 	"author": "DeuxHuitHuit",
 	"license": "MIT",
 	"type": "module",

diff --git a/packages/hooks/dist/server/security.js b/packages/hooks/dist/server/security.js
@@ -82,6 +82,10 @@ export const preflightCheck = ({ event, resolve }) => {
         event.url.pathname.startsWith('/wp-includes')) {
         return error404();
     }
+    // Empty responses for .well-known/ requests
+    if (event.url.pathname.startsWith('/.well-known/')) {
+        return error404();
+    }
     return resolve(event);
 };
 /**

diff --git a/packages/url/CHANGELOG.md b/packages/url/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @288-toolkit/url
 
+## 5.2.0
+
+### Minor Changes
+
+-   2fc065b: Refactor the code around parsed and entry
+
 ## 5.1.2
 
 ### Patch Changes

diff --git a/packages/url/dist/createEntryUrlBuilder.d.ts b/packages/url/dist/createEntryUrlBuilder.d.ts
@@ -40,6 +40,10 @@ export interface EntryUrl {
      * Returns the full URL string.
      */
     toAbsolute(): Maybe<string>;
+    /**
+     * Returns the URL string without the protocol, composed of the hostname, pathname, search, and hash.
+     */
+    toProtocolLess(): Maybe<string>;
     /**
      * Returns the URL string without the scheme, composed of the pathname, search, and hash.
      */

diff --git a/packages/url/dist/createEntryUrlBuilder.js b/packages/url/dist/createEntryUrlBuilder.js
@@ -1,4 +1,7 @@
-import { normalize, removeTrailingSlash } from '@288-toolkit/strings';
+import { removeTrailingSlash } from '@288-toolkit/strings';
+import { decodePath } from './decodePath.js';
+import { protocolLessUrl, schemeLessUrl } from './lessUrl.js';
+import { normalizePath } from './normalizePath.js';
 import { urlCanParse } from './urlCanParse.js';
 /**
  * Creates a function that builds URLs for entries.
@@ -16,6 +19,7 @@ export const createEntryUrlBuilder = ({ siteUrl, shouldRemoveTrailingSlash = tru
                 decodedPath: () => '',
                 normalizePath: () => empty,
                 toAbsolute: () => null,
+                toProtocolLess: () => null,
                 toSchemeLess: () => null,
                 /** @deprecated Use `toSchemeLess` instead. */
                 toLanguageRelative: () => null,
@@ -35,13 +39,10 @@ export const createEntryUrlBuilder = ({ siteUrl, shouldRemoveTrailingSlash = tru
         const self = {
             raw: url,
             decodedPath() {
-                return url.pathname.split('/').map(decodeURIComponent).join('/');
+                return decodePath(url.pathname);
             },
             normalizePath() {
-                url.pathname = url.pathname
-                    .split('/')
-                    .map((part) => normalize(decodeURIComponent(part)))
-                    .join('/');
+                url.pathname = normalizePath(url.pathname);
                 return self;
             },
             toString() {
@@ -50,9 +51,11 @@ export const createEntryUrlBuilder = ({ siteUrl, shouldRemoveTrailingSlash = tru
             toAbsolute() {
                 return url.toString();
             },
+            toProtocolLess() {
+                return protocolLessUrl(url);
+            },
             toSchemeLess() {
-                const { pathname, hash, search } = url;
-                return `${pathname}${search}${hash}`;
+                return schemeLessUrl(url);
             },
             /** @deprecated Use `toSchemeLess` instead. */
             toLanguageRelative() {

diff --git a/packages/url/dist/decodePath.d.ts b/packages/url/dist/decodePath.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Decodes the pathname by splitting it into parts, decoding each part, and joining them with slashes.
+ * @param pathname - The pathname to decode.
+ * @returns The decoded pathname.
+ */
+export declare const decodePath: (pathname: string) => string;
diff --git a/packages/url/dist/decodePath.js b/packages/url/dist/decodePath.js
@@ -0,0 +1,8 @@
+/**
+ * Decodes the pathname by splitting it into parts, decoding each part, and joining them with slashes.
+ * @param pathname - The pathname to decode.
+ * @returns The decoded pathname.
+ */
+export const decodePath = (pathname) => {
+    return pathname.split('/').map(decodeURIComponent).join('/');
+};
diff --git a/packages/url/dist/getLanguageRelativeUri.d.ts b/packages/url/dist/getLanguageRelativeUri.d.ts
@@ -1,5 +1,5 @@
 /**
  * Remove the home URI from a URI.
- * @deprecated Use createEntryUrlBuilder instead.
+ * @deprecated  This was used with Craft 4. With Craft 5, use createEntryUrlBuilder instead.
  */
 export declare const getLanguageRelativeUri: (uri: string, homeUri: string) => string;
diff --git a/packages/url/dist/getLanguageRelativeUri.js b/packages/url/dist/getLanguageRelativeUri.js
@@ -1,6 +1,6 @@
 /**
  * Remove the home URI from a URI.
- * @deprecated Use createEntryUrlBuilder instead.
+ * @deprecated  This was used with Craft 4. With Craft 5, use createEntryUrlBuilder instead.
  */
 export const getLanguageRelativeUri = (uri, homeUri) => uri?.replace(homeUri, '') || '';
 /* @enddeprecated */
diff --git a/packages/url/dist/index.d.ts b/packages/url/dist/index.d.ts
@@ -1,5 +1,7 @@
 export * from './createEntryUrlBuilder.js';
+export * from './decodePath.js';
 export * from './isExternalUrl.js';
-export * from './validateSameOrigin.js';
+export * from './normalizePath.js';
 export * from './parsedUrl.js';
 export * from './urlCanParse.js';
+export * from './validateSameOrigin.js';
diff --git a/packages/url/dist/index.js b/packages/url/dist/index.js
@@ -1,5 +1,7 @@
 export * from './createEntryUrlBuilder.js';
+export * from './decodePath.js';
 export * from './isExternalUrl.js';
-export * from './validateSameOrigin.js';
+export * from './normalizePath.js';
 export * from './parsedUrl.js';
 export * from './urlCanParse.js';
+export * from './validateSameOrigin.js';
diff --git a/packages/url/dist/lessUrl.d.ts b/packages/url/dist/lessUrl.d.ts
@@ -0,0 +1,12 @@
+/**
+ * Returns the URL string without the protocol, composed of the hostname, pathname, search, and hash.
+ * It starts with a double slash.
+ * @param url - The URL to convert.
+ */
+export declare const protocolLessUrl: (url: URL) => string;
+/**
+ * Returns the URL string without the scheme, composed of the pathname, search, and hash.
+ * It starts with a single slash.
+ * @param url - The URL to convert.
+ */
+export declare const schemeLessUrl: (url: URL) => string;
diff --git a/packages/url/dist/lessUrl.js b/packages/url/dist/lessUrl.js
@@ -0,0 +1,18 @@
+/**
+ * Returns the URL string without the protocol, composed of the hostname, pathname, search, and hash.
+ * It starts with a double slash.
+ * @param url - The URL to convert.
+ */
+export const protocolLessUrl = (url) => {
+    const { hostname, pathname, hash, search } = url;
+    return `//${hostname}${pathname}${search}${hash}`;
+};
+/**
+ * Returns the URL string without the scheme, composed of the pathname, search, and hash.
+ * It starts with a single slash.
+ * @param url - The URL to convert.
+ */
+export const schemeLessUrl = (url) => {
+    const { pathname, hash, search } = url;
+    return `${pathname}${search}${hash}`;
+};
diff --git a/packages/url/dist/normalizePath.d.ts b/packages/url/dist/normalizePath.d.ts
@@ -0,0 +1,7 @@
+/**
+ * Normalizes the pathname by decoding it, normalizing each part, and joining them with slashes.
+ * @see {@link @288-toolkit/strings#normalize}
+ * @param pathname - The pathname to normalize.
+ * @returns The normalized pathname.
+ */
+export declare const normalizePath: (pathname: string) => string;
diff --git a/packages/url/dist/normalizePath.js b/packages/url/dist/normalizePath.js
@@ -0,0 +1,13 @@
+import { normalize } from '@288-toolkit/strings';
+/**
+ * Normalizes the pathname by decoding it, normalizing each part, and joining them with slashes.
+ * @see {@link @288-toolkit/strings#normalize}
+ * @param pathname - The pathname to normalize.
+ * @returns The normalized pathname.
+ */
+export const normalizePath = (pathname) => {
+    return pathname
+        .split('/')
+        .map((part) => normalize(decodeURIComponent(part)))
+        .join('/');
+};
diff --git a/packages/url/dist/parsedUrl.d.ts b/packages/url/dist/parsedUrl.d.ts
@@ -7,17 +7,27 @@ export declare const parsedUrl: (url: string | URL) => {
      * The URL object.
      */
     parsed: URL | null;
+    /**
+     * Checks if the URL is valid.
+     */
     valid: () => boolean;
     /**
      * Makes sure the pathname is properly encoded.
      * This can be needed when the pathname contains special characters.
+     *
+     * @deprecated Pathname are always url encoded.
      */
     encodePath: () => any | null;
+    /**
+     * Decodes the pathname and returns it.
+     * It can't be stored in the URL object because it would be encoded again.
+     */
+    decodePath: () => string | null;
     /**
      * Normalizes the pathname by removing accents.
      * @see {@link @288-toolkit/strings#normalize}
      */
-    normalizePath: () => any | null;
+    normalizePath: () => any;
     /**
      * Returns the full URL string.
      */
@@ -29,12 +39,20 @@ export declare const parsedUrl: (url: string | URL) => {
     /**
      * Returns the relative URL string.
      * It starts with a single slash.
+     * @deprecated Relative URLs do not start with a single slash.
+     * They are relative to the current URL.
+     * Use `toSchemeLess()` instead.
      */
     toRelative: () => string | null;
     /**
      * Returns the URL string without the scheme, composed of the pathname, search, and hash.
-     * It starts with a double slash.
+     * It starts with a single slash.
      */
     toSchemeLess: () => string | null;
+    /**
+     * Returns the URL string without the protocol, composed of the hostname, pathname, search, and hash.
+     * It starts with a double slash.
+     */
+    toProtocolLess: () => string | null;
     parts: () => string[] | null;
 };
diff --git a/packages/url/dist/parsedUrl.js b/packages/url/dist/parsedUrl.js
@@ -1,22 +1,29 @@
-import { normalize } from '@288-toolkit/strings';
+import { decodePath } from './decodePath.js';
+import { protocolLessUrl, schemeLessUrl } from './lessUrl.js';
+import { normalizePath } from './normalizePath.js';
 import { urlCanParse } from './urlCanParse.js';
 /**
  * Safely parses a URL and expose and nice API to access the parts of the URL.
  * If the URL is not valid, all functions returns null.
  */
 export const parsedUrl = (url) => {
-    const parsed = urlCanParse(url) ? new URL(url) : null;
+    const parsed = urlCanParse(url.toString()) ? new URL(url) : null;
     const api = {
         /**
          * The URL object.
          */
         parsed,
+        /**
+         * Checks if the URL is valid.
+         */
         valid: () => {
             return parsed != null && parsed.toString() !== '';
         },
         /**
          * Makes sure the pathname is properly encoded.
          * This can be needed when the pathname contains special characters.
+         *
+         * @deprecated Pathname are always url encoded.
          */
         encodePath: () => {
             if (!parsed) {
@@ -25,15 +32,25 @@ export const parsedUrl = (url) => {
             parsed.pathname = encodeURIComponent(parsed.pathname);
             return api;
         },
+        /**
+         * Decodes the pathname and returns it.
+         * It can't be stored in the URL object because it would be encoded again.
+         */
+        decodePath: () => {
+            if (!parsed) {
+                return null;
+            }
+            return decodePath(parsed.pathname);
+        },
         /**
          * Normalizes the pathname by removing accents.
          * @see {@link @288-toolkit/strings#normalize}
          */
         normalizePath: () => {
             if (!parsed) {
-                return null;
+                return api;
             }
-            parsed.pathname = normalize(parsed.pathname);
+            parsed.pathname = normalizePath(parsed.pathname);
             return api;
         },
         /**
@@ -51,31 +68,39 @@ export const parsedUrl = (url) => {
         /**
          * Returns the relative URL string.
          * It starts with a single slash.
+         * @deprecated Relative URLs do not start with a single slash.
+         * They are relative to the current URL.
+         * Use `toSchemeLess()` instead.
          */
         toRelative: () => {
+            return api.toSchemeLess();
+        },
+        /**
+         * Returns the URL string without the scheme, composed of the pathname, search, and hash.
+         * It starts with a single slash.
+         */
+        toSchemeLess: () => {
             if (!parsed) {
                 return null;
             }
-            const { pathname, hash, search } = parsed;
-            return `${pathname}${search}${hash}`;
+            return schemeLessUrl(parsed);
         },
         /**
-         * Returns the URL string without the scheme, composed of the pathname, search, and hash.
+         * Returns the URL string without the protocol, composed of the hostname, pathname, search, and hash.
          * It starts with a double slash.
          */
-        toSchemeLess: () => {
+        toProtocolLess: () => {
             if (!parsed) {
                 return null;
             }
-            const { hostname, pathname, hash, search } = parsed;
-            return `//${hostname}${pathname}${search}${hash}`;
+            return protocolLessUrl(parsed);
         },
         parts: () => {
             if (!parsed) {
                 return null;
             }
             return parsed.pathname.split('/').filter(Boolean);
-        },
+        }
     };
     return api;
 };