ember-native 2.2.1 → 3.0.1

package/declarations/dom/nodes/ViewNode.d.ts

@@ -8,8 +8,6 @@ export default class ViewNode {
     _tagName: any;
     parentNode: ViewNode | null;
     childNodes: ViewNode[];
-    prevSibling: ViewNode | null;
-    nextSibling: ViewNode | null;
     _ownerDocument: any;
     _meta: any;
     get textContent(): string;
@@ -26,6 +24,8 @@ export default class ViewNode {
     get tagName(): any;
     get firstChild(): ViewNode | null | undefined;
     get lastChild(): ViewNode | null | undefined;
+    get nextSibling(): ViewNode | null;
+    get prevSibling(): ViewNode | null;
     get meta(): any;
     get isConnected(): boolean;
     get ownerDocument(): DocumentNode | null;

package/dist/dom/native/FrameElement.js

@@ -74,12 +74,6 @@ class FrameElement extends NativeElementNode {
       return;
     }
     childNode.parentNode = null;
-
-    // reset the prevSibling and nextSibling. If not, a keep-alived component will
-    // still have a filled nextSibling attribute so vue will not
-    // insert the node again to the parent. See #220
-    childNode.prevSibling = null;
-    childNode.nextSibling = null;
     this.childNodes = this.childNodes.filter(node => node !== childNode);
     childNode.removeChildren();
     this.onRemovedChild(childNode);

package/dist/dom/native/NativeElementNode.js

@@ -283,6 +283,9 @@ class NativeElementNode extends ElementNode {
         parentView._removeView(childView);
       }
     } else if (parentView instanceof View) {
+      if (childNode.parentNode !== parentNode) {
+        return;
+      }
       parentView._removeView(childView);
     } else ;
   }

package/dist/dom/nodes/ViewNode.js

@@ -50,16 +50,12 @@ class ViewNode {
     _defineProperty(this, "nodeType", void 0);
     _defineProperty(this, "_tagName", void 0);
     _defineProperty(this, "childNodes", void 0);
-    _defineProperty(this, "prevSibling", void 0);
-    _defineProperty(this, "nextSibling", void 0);
     _defineProperty(this, "_ownerDocument", void 0);
     _defineProperty(this, "_meta", void 0);
     this.nodeType = null;
     this._tagName = null;
     this.parentNode = null;
     this.childNodes = [];
-    this.prevSibling = null;
-    this.nextSibling = null;
     this._ownerDocument = null;
     this._meta = null;
     this.attributes = [];
@@ -87,6 +83,26 @@ class ViewNode {
   get lastChild() {
     return this.childNodes.length ? this.childNodes[this.childNodes.length - 1] : null;
   }
+  get nextSibling() {
+    if (!this.parentNode) {
+      return null;
+    }
+    const index = this.parentNode.childNodes.indexOf(this);
+    if (index === -1 || index === this.parentNode.childNodes.length - 1) {
+      return null;
+    }
+    return this.parentNode.childNodes[index + 1];
+  }
+  get prevSibling() {
+    if (!this.parentNode) {
+      return null;
+    }
+    const index = this.parentNode.childNodes.indexOf(this);
+    if (index <= 0) {
+      return null;
+    }
+    return this.parentNode.childNodes[index - 1];
+  }
   get meta() {
     if (this._meta) {
       return this._meta;
@@ -138,12 +154,15 @@ class ViewNode {
     if (childNode.parentNode && childNode.parentNode !== this) {
       throw new Error(`Can't insert child, because it already has a different parent.`);
     }
-    if (childNode.parentNode === this) ;
+    if (childNode.parentNode === this) {
+      // we don't need to throw an error here, because it is a valid case
+      // for example when switching the order of elements in the tree
+      // fixes #127 - see for more details
+      // fixes #240
+      // throw new Error(`Can't insert child, because it is already a child.`)
+      this.removeChild(childNode);
+    }
     const index = this.childNodes.indexOf(referenceNode);
-    childNode.nextSibling = referenceNode;
-    childNode.prevSibling = this.childNodes[index - 1];
-    this.childNodes[index - 1].nextSibling = childNode;
-    referenceNode.prevSibling = childNode;
     this.childNodes.splice(index, 0, childNode);
     childNode.parentNode = this;
     this.onInsertedChild(childNode, index);
@@ -155,10 +174,13 @@ class ViewNode {
     if (childNode.parentNode && childNode.parentNode !== this) {
       throw new Error(`Can't append child, because it already has a different parent.`);
     }
-    if (childNode.parentNode === this) ;
-    if (this.lastChild) {
-      childNode.prevSibling = this.lastChild;
-      this.lastChild.nextSibling = childNode;
+    if (childNode.parentNode === this) {
+      // we don't need to throw an error here, because it is a valid case
+      // for example when switching the order of elements in the tree
+      // fixes #127 - see for more details
+      // fixes #240
+      // throw new Error(`Can't append child, because it is already a child.`)
+      this.removeChild(childNode);
     }
     this.childNodes.push(childNode);
     childNode.parentNode = this;
@@ -175,12 +197,6 @@ class ViewNode {
       throw new Error(`Can't remove child, because it has a different parent.`);
     }
     childNode.parentNode = null;
-    if (childNode.prevSibling) {
-      childNode.prevSibling.nextSibling = childNode.nextSibling;
-    }
-    if (childNode.nextSibling) {
-      childNode.nextSibling.prevSibling = childNode.prevSibling;
-    }
 
     // reset the prevSibling and nextSibling. If not, a keep-alived component will
     // still have a filled nextSibling attribute so vue will not

package/dist/utils/babel-plugin.js

@@ -152,7 +152,7 @@ export default function hotReplaceAst(babel) {
         visitor: {
             Program(path, state) {
                 var _a;
-                if (!hotAstProcessor.meta.importVar) {
+                if (!hotAstProcessor.meta.importVar || !hotAstProcessor.meta.importBindings) {
                     return;
                 }
                 if (process.env['EMBER_HMR_ENABLED'] !== 'true') {

package/dist/utils/babel-plugin.ts

@@ -198,7 +198,7 @@ export default function hotReplaceAst(babel: typeof Babel) {
     },
     visitor: {
       Program(path, state) {
-        if (!hotAstProcessor.meta.importVar) {
+        if (!hotAstProcessor.meta.importVar || !hotAstProcessor.meta.importBindings) {
           return;
         }
         if (process.env['EMBER_HMR_ENABLED'] !== 'true') {

package/dist/utils/embroider-template-tag-loader.js

@@ -0,0 +1,50 @@
+/**
+ * Webpack loader that uses @embroider/vite's templateTag plugin
+ * to transform .gts/.gjs files
+ */
+
+let templateTagPlugin;
+
+try {
+  const { templateTag } = require('@embroider/vite');
+  templateTagPlugin = templateTag();
+} catch (e) {
+  console.warn('Failed to load @embroider/vite templateTag plugin:', e.message);
+  console.warn('Falling back to content-tag-loader');
+  // Fallback to content-tag-loader
+  module.exports = require('./content-tag-loader.js');
+  return;
+}
+
+module.exports = function embroiderTemplateTagLoader(source) {
+  const callback = this.async();
+  const id = this.resourcePath;
+
+  // Create a minimal context for the plugin
+  const context = {
+    parse: (code) => ({ code }),
+  };
+
+  // Call the transform hook from the templateTag plugin
+  Promise.resolve()
+    .then(() => {
+      if (templateTagPlugin.transform) {
+        return templateTagPlugin.transform.call(context, source, id);
+      }
+      return null;
+    })
+    .then((result) => {
+      if (result && result.code) {
+        // Return just the code, like content-tag-loader does
+        // This avoids the .inputSourceMap error with babel-loader
+        callback(null, result.code);
+      } else {
+        // If no transformation, pass through
+        callback();
+      }
+    })
+    .catch((error) => {
+      console.error('Template tag transformation error:', error);
+      callback(error);
+    });
+};

package/dist/utils/embroider-webpack-adapter.js

@@ -0,0 +1,174 @@
+/**
+ * Webpack adapter for @embroider/vite plugins
+ *
+ * This adapter allows using @embroider/vite's resolver() and templateTag() plugins
+ * in webpack builds, similar to how they're used in rollup.config.mjs
+ */
+
+const path = require('path');
+const fs = require('fs');
+const { existsSync, statSync } = require("fs");
+const { resolve: resolvePath } = require("path");
+
+function tryExtensions(basePath, extensions = ['js', 'ts', 'gts', '.gjs']) {
+  // Try with extensions first
+  basePath = basePath
+    .replace('.js', '')
+    .replace('.ts', '')
+    .replace('.gjs', '')
+    .replace('.gts', '')
+    .replace('file://', '');
+  for (const ext of extensions) {
+    const fullPath = `${basePath}.${ext}`;
+    if (existsSync(fullPath)) {
+      try {
+        const stats = statSync(fullPath);
+        if (stats.isFile()) {
+          return fs.realpathSync(fullPath);
+        }
+        // eslint-disable-next-line no-unused-vars
+      } catch (e) {
+        // Continue to next extension
+      }
+    }
+  }
+
+  // Try index files
+  for (const ext of extensions) {
+    const indexPath = resolvePath(basePath, `index.${ext}`);
+    if (existsSync(indexPath)) {
+      try {
+        const stats = statSync(indexPath);
+        if (stats.isFile()) {
+          return indexPath;
+        }
+        // eslint-disable-next-line no-unused-vars
+      } catch (e) {
+        // Continue to next extension
+      }
+    }
+  }
+  return null;
+}
+
+/**
+ * Creates a webpack resolver plugin that uses @embroider/vite's resolver
+ */
+function createResolverPlugin() {
+  let resolverPlugin;
+
+  try {
+    const { resolver } = require('@embroider/vite');
+    resolverPlugin = resolver();
+  } catch (e) {
+    console.warn('Failed to load @embroider/vite resolver plugin:', e.message);
+    return null;
+  }
+
+  return class EmbroiderResolverPlugin {
+    apply(resolver) {
+      const target = resolver.ensureHook('resolved');
+
+      resolver
+        .getHook('described-resolve')
+        .tapAsync('EmbroiderResolverPlugin', (request, resolveContext, callback) => {
+          const issuer = request.context?.issuer || request.path;
+
+          if (!request.context?.issuer) {
+            callback();
+            return;
+          }
+
+          // Create a context compatible with vite plugins
+          // The resolver expects a context with a resolve method
+          const context = {
+            resolve: async (spec, from) => {
+              // Return a simple object with id property
+              // Let webpack handle the actual resolution
+              const res = tryExtensions(spec);
+              if (res) {
+                return { id: res };
+              }
+              try {
+                if (spec.startsWith('ember-source')) {
+                  return { id: fs.realpathSync(require.resolve(spec)) };
+                }
+                from = fs.realpathSync(from);
+                return { id: fs.realpathSync(require.resolve(spec, { paths: [path.dirname(from)] })) };
+                // eslint-disable-next-line no-unused-vars
+              } catch (e) {
+                return null;
+              }
+            }
+          };
+
+          // Call resolveId from the resolver plugin
+          Promise.resolve()
+            .then(() => {
+              if (resolverPlugin.resolveId) {
+                return resolverPlugin.resolveId.call(context, request.request, issuer, {});
+              }
+              return null;
+            })
+            .then((result) => {
+              if (result && result.id) {
+                // Embroider resolved it - continue with the resolved path
+                const obj = {
+                  ...request,
+                  request: result.id,
+                  path: result.id
+                };
+                resolver.doResolve(target, obj, null, resolveContext, callback);
+              } else {
+                // Embroider couldn't resolve it - let the next plugin try
+                callback();
+              }
+            })
+            // eslint-disable-next-line no-unused-vars
+            .catch((error) => {
+              callback();
+            });
+        });
+    }
+  };
+}
+
+/**
+ * Configures webpack to use @embroider/vite plugins via adapters
+ */
+module.exports = function configureEmbroiderWebpackAdapter(webpack) {
+  const ResolverPlugin = createResolverPlugin();
+
+  webpack.chainWebpack((config) => {
+    // Add resolver plugin if available
+    if (ResolverPlugin) {
+      config.resolve
+        .plugin('embroider-resolver')
+        .use(ResolverPlugin);
+    }
+
+    // Configure .gts/.gjs file handling using the embroider-template-tag-loader
+    // This loader wraps @embroider/vite's templateTag() plugin
+    const loaderPath = path.resolve(__dirname, 'embroider-template-tag-loader.js');
+
+    config.module
+      .rule('gts/gjs')
+      .test(/\.g[jt]s$/)
+      .use('babel-loader')
+      .loader('babel-loader')
+      .end()
+      .use('embroider-template-tag-loader')
+      .loader(loaderPath)
+      .end();
+
+    // Configure regular .js/.ts files
+    config.module
+      .rule('js/ts')
+      .test(/\.([jt]s)$/)
+      .use('babel-loader')
+      .loader('babel-loader')
+      .end();
+  });
+};
+
+module.exports.createResolverPlugin = createResolverPlugin;

package/dist/utils/webpack.config.js

@@ -1,55 +1,27 @@
-const fs = require('fs');
-const path = require('path');
 
+/**
+ * Configures webpack for ember-native using @embroider/vite adapter
+ *
+ * This configuration uses @embroider/vite plugins via the webpack adapter
+ * with automatic fallback to custom loaders if unavailable.
+ */
 module.exports = (webpack) => {
+  try {
+    const configureAdapter = require('./embroider-webpack-adapter.js');
+    configureAdapter(webpack);
+    console.log('✓ Using @embroider/vite webpack adapter');
+  } catch (e) {
+    console.warn('⚠ Failed to load embroider adapter, using fallback loaders:', e.message);
+  }
+
+  // Configure @glimmer/env alias (still needed)
   webpack.chainWebpack((config) => {
-    const glimmerDirs = fs.readdirSync(
-      path.resolve(
-        process.cwd(),
-        './node_modules/ember-source/dist/packages/@glimmer',
-      ),
-    );
-    for (const glimmerDir of glimmerDirs) {
-      config.resolve.alias.set(
-        `@glimmer/${glimmerDir}`,
-        `ember-source/dist/packages/@glimmer/${glimmerDir}`,
-      );
-    }
-    // change the "@" alias to "app/libs"
-    config.resolve.alias.set('@ember', 'ember-source/dist/packages/@ember');
-    config.resolve.alias.set('ember', 'ember-source/dist/packages/ember');
-    config.resolve.alias.set(
-      '@glimmer/component',
-      '@glimmer/component/addon/index.ts',
-    );
     config.resolve.alias.set(
       '@glimmer/env',
       require.resolve('./glimmer-env.js'),
     );
   });
 
-  webpack.chainWebpack((config) => {
-    // add a new rule for *.something files
-    config.module
-      .rule('gts/gjs')
-      .test(/\.g[jt]s$/)
-      .use('babel-loader')
-      .loader('babel-loader')
-      .end()
-      .use('gjs-loader')
-      .loader(require.resolve('./content-tag-loader.js'))
-      .end();
-
-    config.module
-      .rule('js/ts')
-      .test(/\.([jt]s)$/)
-      .use('fix-glimmer-content-owner')
-      .loader(require.resolve('./fix-glimmer-content-owner.js'))
-      .end()
-      .use('babel-loader')
-      .loader('babel-loader');
-  });
-
   webpack.chainWebpack((config) => {
     config.plugin('DefinePlugin').tap((args) => {
       Object.assign(args[0], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-native",
-  "version": "2.2.1",
+  "version": "3.0.1",
   "description": "the Ember framework with Nativescript",
   "keywords": [
     "ember-addon"
@@ -19,10 +19,6 @@
   ],
   "peerDependencies": {
     "@glimmer/component": "*",
-    "@glimmer/reference": "*",
-    "@glimmer/runtime": "*",
-    "@glimmer/tracking": "*",
-    "@glimmer/validator": "*",
     "@nativescript/core": "*",
     "ember-modifier": "*",
     "ember-source": "*",
@@ -34,10 +30,9 @@
     "@ember/render-modifiers": "^3.0.0",
     "@ember/string": "^4.0.0",
     "@ember/test-waiters": "^4.1.1",
-    "@embroider/addon-shim": "^1.10.0",
+    "@embroider/addon-shim": "^1.10.2",
     "@eslint/js": "^9.28.0",
     "@glimmer/component": "^2.0.0",
-    "@glimmer/tracking": "^1.1.2",
     "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@types/node": "^24.1.0",
@@ -58,43 +53,42 @@
   },
   "devDependencies": {
     "@babel/types": "^7.28.5",
+    "@babel/eslint-parser": "^7.28.5",
     "@ember/optional-features": "^2.0.0",
     "@embroider/addon-dev": "^8.1.0",
     "@embroider/compat": "^4.1.0",
-    "@embroider/core": "^4.1.1",
-    "@embroider/macros": "^1.18.1",
-    "@embroider/shared-internals": "^3.0.0",
+    "@embroider/core": "^4.4.0",
+    "@embroider/macros": "^1.19.5",
+    "@embroider/shared-internals": "^3.0.1",
+    "@embroider/vite": "^1.4.2",
     "@embroider/util": "^1.13.3",
     "@embroider/webpack": "^4.1.1",
-    "@glimmer/interfaces": "^0.94.6",
-    "@glimmer/reference": "^0.94.8",
-    "@glimmer/runtime": "^0.94.10",
     "@glimmer/syntax": "^0.94.9",
-    "@glimmer/validator": "^0.95.0",
     "@glint/core": "^1.5.0",
     "@glint/environment-ember-loose": "^1.5.0",
     "@glint/environment-ember-template-imports": "^1.5.0",
-    "@glint/template": "^1.5.0",
+    "@glint/template": "^1.7.3",
     "@nativescript/core": "^8.9.7",
     "@release-it-plugins/lerna-changelog": "^8.0.1",
-    "@rollup/plugin-babel": "^6.0.3",
-    "@tsconfig/ember": "^3.0.8",
+    "@rollup/plugin-babel": "^6.1.0",
+    "@tsconfig/ember": "^3.0.12",
     "@types/babel__core": "^7.20.5",
     "@types/jquery": "^3.5.16",
-    "@types/qunit": "^2.19.5",
+    "@types/qunit": "^2.19.13",
     "@types/qunit-dom": "^0.7.0",
-    "@typescript-eslint/eslint-plugin": "^8.13.0",
-    "@typescript-eslint/parser": "^8.38.0",
+    "@typescript-eslint/eslint-plugin": "^8.47.0",
+    "@typescript-eslint/parser": "^8.48.0",
+    "typescript-eslint": "^8.38.0",
     "babel-import-util": "^3.0.0",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.0.1",
     "bower": "^1.8.8",
     "globals": "^16.5.0",
-    "broccoli": "^3.4.2",
+    "broccoli": "^4.0.0",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^9.2.0",
+    "concurrently": "^9.2.1",
     "content-tag": "^4.0.0",
     "css-loader": "^7.1.2",
-    "ember-eslint-parser": "^0.5.9",
+    "ember-eslint-parser": "^0.5.13",
     "ember-modifier": "^4.2.0",
     "ember-source": "^6.6.0",
     "ember-template-lint": "^7.9.1",
@@ -106,19 +100,19 @@
     "eslint-plugin-n": "^17.21.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-qunit": "^8.1.1",
+    "eslint-plugin-qunit": "^8.2.5",
     "fix-bad-declaration-output": "^1.1.4",
     "loader.js": "^4.7.0",
     "nativescript-ui-listview": "^15.2.3",
     "prettier": "^3.6.2",
     "prettier-plugin-ember-template-tag": "^2.1.0",
-    "qunit": "^2.19.4",
+    "qunit": "^2.24.3",
     "qunit-dom": "^3.4.0",
     "release-it": "^15.10.3",
     "rollup": "^4.46.3",
-    "rollup-plugin-copy": "^3.4.0",
+    "rollup-plugin-copy": "^3.5.0",
     "router_js": "^8.0.6",
-    "sass": "^1.89.2",
+    "sass": "^1.94.2",
     "sass-embedded": "^1.90.0",
     "sass-loader": "^16.0.4",
     "typescript": "^5.9.2",
@@ -156,6 +150,7 @@
       "types": "./declarations/*.d.ts",
       "default": "./dist/*.js"
     },
+    "./utils/*": "./dist/utils/*",
     "./addon-main.js": "./addon-main.cjs"
   },
   "typesVersions": {
@@ -166,7 +161,7 @@
     }
   },
   "scripts": {
-    "build": "concurrently 'npm:build:*'",
+    "build": "pnpm build:js && pnpm build:utils && pnpm build:types",
     "build:js": "rollup --config",
     "build:utils": "cd utils && tsc --project tsconfig.json",
     "build:types": "glint --declaration && npx fix-bad-declaration-output './declarations/**/*.d.ts'",

package/dist/utils/content-tag-loader.js

@@ -1,9 +0,0 @@
-const ContentTag = require('content-tag');
-
-const Preprocessor = new ContentTag.Preprocessor();
-
-module.exports = function (source) {
-  return Preprocessor.process(source, {
-    inline_source_map: true,
-  }).code;
-};