Merge branch 'dev'

tchak · Jun 1, 2023 · f6c0032 · f6c0032
2 parents 029cc6f + 810f6ef
commit f6c0032
Show file tree

Hide file tree

Showing 12 changed files with 640 additions and 633 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+strict-peer-dependencies=false
diff --git a/package.json b/package.json
@@ -10,36 +10,37 @@
   ],
   "scripts": {
     "turbo": "turbo run test lint build",
-    "build": "turbo run --force build",
+    "build": "turbo run build --force",
     "test": "turbo run test",
     "lint": "turbo run lint",
     "clean": "turbo run clean",
     "prepare": "pnpm run build"
   },
   "devDependencies": {
     "@changesets/cli": "^2.26.1",
-    "@remix-run/node": "^1.15.0",
-    "@testing-library/dom": "^9.2.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
-    "@vitest/browser": "^0.30.1",
-    "@vitest/ui": "^0.30.1",
-    "c8": "^7.13.0",
+    "@remix-run/node": "^1.16.1",
+    "@testing-library/dom": "^9.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "@typescript-eslint/parser": "^5.59.8",
+    "@vitest/browser": "^0.31.4",
+    "@vitest/ui": "^0.31.4",
+    "c8": "^7.14.0",
     "del-cli": "^5.0.0",
-    "eslint": "^8.39.0",
+    "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.8.0",
-    "jsdom": "^21.1.1",
+    "jsdom": "^22.1.0",
     "msw": "^0.49.3",
     "npm-run-all": "^4.1.5",
-    "playwright": "^1.32.3",
+    "playwright": "^1.34.3",
     "prettier": "^2.8.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "turbo": "^1.9.3",
+    "rollup": "^3.23.0",
+    "turbo": "^1.10.1",
     "typescript": "^5.0.4",
-    "vite": "^4.3.1",
-    "vitest": "^0.30.1",
-    "webdriverio": "^8.8.6"
+    "vite": "^4.3.9",
+    "vitest": "^0.31.4",
+    "webdriverio": "^8.10.6"
   },
   "engines": {
     "node": ">=16"

diff --git a/packages/actions/CHANGELOG.md b/packages/actions/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @coldwired/actions
 
+## 0.11.0
+
+### Minor Changes
+
+- feat(actions): use data-turbo-force=“browser” instead of data-turbo-permanent
+
 ## 0.10.0
 
 ### Minor Changes

diff --git a/packages/actions/package.json b/packages/actions/package.json
@@ -14,7 +14,7 @@
       "require": "./dist/index.cjs.js"
     }
   },
-  "version": "0.10.0",
+  "version": "0.11.0",
   "keywords": [
     "turbo"
   ],

diff --git a/packages/actions/src/actions.test.ts b/packages/actions/src/actions.test.ts
@@ -65,7 +65,7 @@ describe('@coldwired/actions', () => {
     actions.morph(from, '<div>World</div>');
     expect(from.outerHTML).toEqual('<div class="bar">World</div>');
 
-    actions.morph(from, '<div data-turbo-force>World</div>');
+    actions.morph(from, '<div data-turbo-force="server">World</div>');
     expect(from.outerHTML).toEqual('<div>World</div>');
   });
 
@@ -464,7 +464,7 @@ describe('@coldwired/actions', () => {
     actions.morph(
       document,
       parseHTMLDocument(
-        '<label for="test">Test</label><input data-turbo-force id="test" name="test" type="text" value="test" />'
+        '<label for="test">Test</label><input data-turbo-force="server" id="test" name="test" type="text" value="test" />'
       )
     );
     expect(input.value).toEqual('test');
@@ -492,24 +492,24 @@ describe('@coldwired/actions', () => {
 
     actions.morph(
       document,
-      parseHTMLDocument('<div hidden aria-expanded data-turbo-force>New Menu</div>')
+      parseHTMLDocument('<div hidden aria-expanded data-turbo-force="server">New Menu</div>')
     );
     expect(from.getAttribute('aria-expanded')).toEqual('');
     expect(from.hidden).toBeTruthy();
   });
 
-  it('should preserve html if permanent attribute is set', async () => {
+  it('should preserve html if force="client" attribute is set', async () => {
     actions.morph(document, parseHTMLDocument('<div>Hello world</div>'));
     const from = document.body.firstElementChild as HTMLDivElement;
-    from.setAttribute('data-turbo-permanent', '');
+    from.setAttribute('data-turbo-force', 'browser');
     actions.morph(document, parseHTMLDocument('<div>Bye world!</div>'));
     expect(from.textContent).toEqual('Hello world');
     actions.morph(document, parseHTMLDocument('<div>Encore !</div>'));
     expect(from.textContent).toEqual('Hello world');
-    expect(from.hasAttribute('data-turbo-permanent')).toBeTruthy();
-    actions.morph(document, parseHTMLDocument('<div data-turbo-force>Bye world!</div>'));
+    expect(from.hasAttribute('data-turbo-force')).toBeTruthy();
+    actions.morph(document, parseHTMLDocument('<div data-turbo-force="server">Bye world!</div>'));
     expect(from.textContent).toEqual('Bye world!');
-    expect(from.hasAttribute('data-turbo-permanent')).toBeFalsy();
+    expect(from.hasAttribute('data-turbo-force')).toBeFalsy();
   });
 
   it('should dispatch event', async () => {

diff --git a/packages/actions/src/morph.ts b/packages/actions/src/morph.ts
@@ -18,7 +18,6 @@ import { Metadata } from './metadata';
 type MorphOptions = FocusNextOptions & {
   childrenOnly?: boolean;
   forceAttribute?: string;
-  permanentAttribute?: string;
   metadata?: Metadata;
 };
 
@@ -82,12 +81,11 @@ function morphToDocumentFragment(
 
 function morphToElement(fromElement: Element, toElement: Element, options?: MorphOptions): void {
   const forceAttribute = options?.forceAttribute;
-  const permanentAttribute = options?.permanentAttribute;
 
   morphdom(fromElement, toElement, {
     childrenOnly: options?.childrenOnly,
     onBeforeElUpdated(fromElement: Element, toElement: Element) {
-      const force = forceAttribute ? !!toElement.closest(`[${forceAttribute}]`) : false;
+      const force = forceAttribute ? !!toElement.closest(`[${forceAttribute}="server"]`) : false;
       const metadata = options?.metadata?.get(fromElement);
 
       if (force && metadata) {
@@ -100,8 +98,8 @@ function morphToElement(fromElement: Element, toElement: Element, options?: Morp
         return false;
       }
 
-      if (!force && permanentAttribute) {
-        const permanent = !!fromElement.closest(`[${permanentAttribute}]`);
+      if (!force && forceAttribute) {
+        const permanent = !!fromElement.closest(`[${forceAttribute}="browser"]`);
         if (permanent) {
           return false;
         }
@@ -142,9 +140,14 @@ function morphToElement(fromElement: Element, toElement: Element, options?: Morp
       return true;
     },
   });
+
   if (forceAttribute) {
-    fromElement.removeAttribute(forceAttribute);
-    for (const element of [...fromElement.querySelectorAll(`[${forceAttribute}]`)]) {
+    const forcedElements =
+      fromElement.getAttribute(forceAttribute) == 'server' ? [fromElement] : [];
+    for (const element of [
+      ...forcedElements,
+      ...fromElement.querySelectorAll(`[${forceAttribute}="server"]`),
+    ]) {
       element.removeAttribute(forceAttribute);
     }
   }

diff --git a/packages/actions/src/schema.ts b/packages/actions/src/schema.ts
@@ -2,14 +2,12 @@ export type Schema = {
   forceAttribute: string;
   focusGroupAttribute: string;
   focusDirectionAttribute: string;
-  permanentAttribute: string;
   hiddenClassName: string;
 };
 
 export const defaultSchema: Schema = {
   forceAttribute: 'data-turbo-force',
   focusGroupAttribute: 'data-turbo-focus-group',
   focusDirectionAttribute: 'data-turbo-focus-direction',
-  permanentAttribute: 'data-turbo-permanent',
   hiddenClassName: 'hidden',
 };
diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @coldwired/router
 
+## 0.11.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @coldwired/actions@0.11.0
+  - @coldwired/turbo-stream@0.11.0
+
 ## 0.10.0
 
 ### Patch Changes

diff --git a/packages/router/package.json b/packages/router/package.json
@@ -14,7 +14,7 @@
       "require": "./dist/index.cjs.js"
     }
   },
-  "version": "0.10.0",
+  "version": "0.11.0",
   "keywords": [
     "remix",
     "router",
@@ -33,8 +33,8 @@
     "clean": "del dist coverage node_modules/.vite"
   },
   "dependencies": {
-    "@coldwired/actions": "^0.10.0",
-    "@coldwired/turbo-stream": "^0.10.0",
+    "@coldwired/actions": "^0.11.0",
+    "@coldwired/turbo-stream": "^0.11.0",
     "@coldwired/utils": "^0.10.0",
     "@remix-run/router": "1.2.1",
     "nanoid": "^4.0.1",

diff --git a/packages/turbo-stream/CHANGELOG.md b/packages/turbo-stream/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @coldwired/turbo-stream
 
+## 0.11.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @coldwired/actions@0.11.0
+
 ## 0.10.0
 
 ### Patch Changes

diff --git a/packages/turbo-stream/package.json b/packages/turbo-stream/package.json
@@ -14,7 +14,7 @@
       "require": "./dist/index.cjs.js"
     }
   },
-  "version": "0.10.0",
+  "version": "0.11.0",
   "keywords": [
     "turbo"
   ],
@@ -31,7 +31,7 @@
     "clean": "del dist coverage node_modules/.vite"
   },
   "dependencies": {
-    "@coldwired/actions": "^0.10.0",
+    "@coldwired/actions": "^0.11.0",
     "@coldwired/utils": "^0.10.0",
     "tiny-invariant": "^1.3.1"
   },