Merge branch 'main' into main

Author: rmorshea

.github/workflows/publish-js.yml

@@ -15,8 +15,10 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "14.x"
+          registry-url: "https://registry.npmjs.org"
+      - name: Install Specific NPM Version
+        run: npm install -g [email protected]
       - name: Prepare Release
         working-directory: ./src/client
         run: |

.github/workflows/publish-py.yml

@@ -12,9 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2-beta
+      - uses: actions/setup-node@v2
         with:
           node-version: "14.x"
+      - name: Install Specific NPM Version
+        run: npm install -g [email protected]
       - name: Set up Python
         uses: actions/setup-python@v1
         with:

.github/workflows/test.yml

@@ -16,9 +16,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: nanasess/setup-chromedriver@master
-      - uses: actions/setup-node@v2-beta
+      - uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "14.x"
+      - name: Install Specific NPM Version
+        run: npm install -g [email protected]
       - name: Use Latest Python
         uses: actions/setup-python@v2
         with:
@@ -37,9 +39,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: nanasess/setup-chromedriver@master
-      - uses: actions/setup-node@v2-beta
+      - uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "14.x"
+      - name: Install Specific NPM Version
+        run: npm install -g [email protected]
       - name: Use Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
@@ -53,9 +57,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2-beta
+      - uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "14.x"
+      - name: Install Specific NPM Version
+        run: npm install -g [email protected]
       - name: Use Latest Python
         uses: actions/setup-python@v2
         with:
@@ -69,9 +75,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2-beta
+      - uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "14.x"
+      - name: Install Specific NPM Version
+        run: npm install -g [email protected]
       - name: Install Python Dependencies
         run: pip install -r requirements/nox-deps.txt
       - name: Run Tests

VERSION

@@ -1 +1 @@
-0.35.1
+0.35.4

docs/source/developing-idom/changelog.rst

@@ -7,6 +7,55 @@ team are working on, or have feedback on how issues should be prioritized, feel
 :discussion-type:`open up a discussion <question>`.
 
 
+0.35.4
+------
+
+Keys for elements at the root of a component were not being tracked. Thus key changes
+for elements at the root did not trigger unmounts.
+
+**Closed Issues**
+
+- Change Key of Parent Element Does Not Unmount Children - :issue:`622`
+
+**Pull Requests**
+
+- fix issue with key-based identity - :pull:`623`
+
+
+0.35.3
+------
+
+As part of :pull:`614`, elements which changed type were not deeply unmounted. This
+behavior is probably undesireable though since the state for children of the element
+in question would persist (probably unexpectedly).
+
+**Pull Requests**
+
+- Always deeply unmount - :pull:`620`
+
+
+0.35.2
+------
+
+This release includes several bug fixes. The most significant of which is the ability to
+change the type of an element in the try (i.e. to and from being a component) without
+getting an error. Originally the errors were introduced because it was though changing
+element type would not be desireable. This was not the case though - swapping types
+turns out to be quite common and useful.
+
+**Closed Issues**
+
+- Allow Children with the Same Key to Vary in Type - :issue:`613`
+- Client Always Looks for Server at "/"  - :issue:`611`
+- Web modules get double file extensions with v0.35.x - :issue:`605`
+
+**Pull Requests**
+
+- allow elements with the same key to change type - :pull:`614`
+- make connection to websocket relative path - :pull:`612`
+- fix double file extension - :pull:`606`
+
+
 0.35.1
 ------
 

docs/source/reference-material/_examples/snake_game.py

@@ -18,12 +18,7 @@ def GameView():
     game_state, set_game_state = idom.hooks.use_state(GameState.init)
 
     if game_state == GameState.play:
-        return GameLoop(
-            grid_size=6,
-            block_scale=50,
-            set_game_state=set_game_state,
-            key="game loop",
-        )
+        return GameLoop(grid_size=6, block_scale=50, set_game_state=set_game_state)
 
     start_button = idom.html.button(
         {"onClick": lambda event: set_game_state(GameState.play)},
@@ -45,12 +40,7 @@ def GameView():
         """
     )
 
-    return idom.html.div(
-        {"className": "snake-game-menu"},
-        menu_style,
-        menu,
-        key="menu",
-    )
+    return idom.html.div({"className": "snake-game-menu"}, menu_style, menu)
 
 
 class Direction(enum.Enum):

src/client/package-lock.json

@@ -14,7 +14,7 @@
     "publish": "npm --workspaces publish",
     "test": "npm --workspaces test"
   },
-  "version": "0.35.1",
+  "version": "0.35.4",
   "workspaces": [
     "./packages/*"
   ]

src/client/package.json

@@ -21,5 +21,5 @@
     "format": "prettier --write ./src",
     "test": "echo 'no tests'"
   },
-  "version": "0.35.1"
+  "version": "0.35.4"
 }

src/client/packages/idom-app-react/package.json

@@ -4,7 +4,7 @@ export function mount(mountPoint) {
   const serverInfo = new LayoutServerInfo({
     host: document.location.hostname,
     port: document.location.port,
-    path: "/",
+    path: "../",
     query: queryParams.user.toString(),
     secture: document.location.protocol == "https",
   });

src/client/packages/idom-app-react/src/index.js

@@ -31,5 +31,5 @@
     "test": "uvu tests"
   },
   "type": "module",
-  "version": "0.35.1"
+  "version": "0.35.4"
 }

src/client/packages/idom-client-react/package.json

@@ -34,6 +34,8 @@ export function Element({ model }) {
     } else {
       return null;
     }
+  } else if (model.tagName == "script") {
+    return html`<${ScriptElement} script=${model.children[0]} />`;
   } else if (model.importSource) {
     return html`<${ImportedElement} model=${model} />`;
   } else {
@@ -56,6 +58,12 @@ function StandardElement({ model }) {
   );
 }
 
+function ScriptElement({ script }) {
+  const el = React.useRef();
+  React.useEffect(eval(script), [script]);
+  return null;
+}
+
 function ImportedElement({ model }) {
   const layoutContext = React.useContext(LayoutContext);
 

src/client/packages/idom-client-react/src/components.js

@@ -23,13 +23,20 @@ export function LayoutServerInfo({ host, port, path, query, secure }) {
   const httpProtocol = "http" + (secure ? "s" : "");
 
   const uri = host + ":" + port;
+  path = new URL(path, document.baseURI).pathname;
   const url = (uri + path).split("/").slice(0, -1).join("/");
 
   const wsBaseUrl = wsProtocol + "://" + url;
   const httpBaseUrl = httpProtocol + "://" + url;
 
+  if (query) {
+    query = "?" + query;
+  } else {
+    query = "";
+  }
+
   this.path = {
-    stream: wsBaseUrl + "/stream" + "?" + query,
+    stream: wsBaseUrl + "/stream" + query,
     module: (source) => httpBaseUrl + `/modules/${source}`,
   };
 }

src/client/packages/idom-client-react/src/server.js

@@ -21,7 +21,7 @@
 
 
 __author__ = "idom-team"
-__version__ = "0.35.1"  # DO NOT MODIFY
+__version__ = "0.35.4"  # DO NOT MODIFY
 
 __all__ = [
     "component",