ember-native 2.2.0 → 3.0.0

package/declarations/dom/element-registry.d.ts

@@ -9,7 +9,7 @@ export declare function getViewMeta(elementName: string): {
     isUnaryTag: boolean;
     tagNamespace: string;
     canBeLeftOpenTag: boolean;
-    component: null;
+    component: any;
 };
 export declare function isKnownView(elementName: string): any;
 export declare function createElement<T extends keyof NativeElementsTagNameMap>(elementName: T): NativeElementsTagNameMap[T];

package/declarations/dom/native/NativeElementNode.d.ts

@@ -12,8 +12,8 @@ export default class NativeElementNode<T extends ViewBase | null = ViewBase> ext
     _meta: ComponentMeta;
     constructor(tagName: string, viewClass: typeof View | null, meta?: ComponentMeta | null);
     setStyle(property: string, value: string | number | null): void;
-    get style(): import("@nativescript/core").Style | undefined;
-    set style(v: import("@nativescript/core").Style | undefined);
+    get style(): import("@nativescript/core").Style;
+    set style(v: import("@nativescript/core").Style);
     updateText(): void;
     get nativeView(): T;
     set nativeView(view: T);
@@ -44,5 +44,5 @@ export default class NativeElementNode<T extends ViewBase | null = ViewBase> ext
         width: number;
         height: number;
         right?: undefined;
-    } | null;
+    };
 }

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

@@ -42,9 +42,9 @@ export default class DocumentNode extends ViewNode {
             bottom: any;
             width: any;
             height: any;
-        } | null;
+        };
     };
     querySelectorAll(selector: string): {
         getAttribute(): string;
-    } | undefined;
+    };
 }

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

@@ -6,4 +6,6 @@ export default class TextNode extends ViewNode {
     set parentNode(node: ViewNode | null);
     get parentNode(): ViewNode | null;
     setText(text: string): void;
+    get nodeValue(): string;
+    set nodeValue(value: string);
 }

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

@@ -38,7 +38,7 @@ export default class ViewNode {
     removeChild(childNode: ViewNode): void;
     clear(node: any): void;
     removeChildren(): void;
-    firstElement(): ViewNode | null;
+    firstElement(): ViewNode;
     getBoundingClientRect(): {
         left: number;
         top: number;

package/declarations/instance-initializers/history.d.ts

@@ -1,7 +1,7 @@
 import ApplicationInstance from '@ember/application/instance';
 declare const Initializer: {
     name: string;
-    after: never[];
+    after: any[];
     initialize(application: ApplicationInstance): void;
 };
 export default Initializer;

package/dist/components/InspectorSupport.js

@@ -14,7 +14,7 @@ class InspectorSupport extends Component {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "setupInspector", () => {
-      let i = setInterval(() => {
+      const i = setInterval(() => {
         const viewInspection = globalThis.EmberInspector?.viewDebug?.viewInspection;
         if (viewInspection && this.tooltip) {
           this.tooltip.querySelector = () => {

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/TextNode.js

@@ -30,6 +30,12 @@ class TextNode extends ViewNode {
       this.parentNode.updateText();
     }
   }
+  get nodeValue() {
+    return this.text;
+  }
+  set nodeValue(value) {
+    this.setText(value);
+  }
 }
 
 export { TextNode as default };

package/dist/services/history.js

@@ -17,7 +17,7 @@ let HistoryService = (_dec = service('ember-native/native-router'), _class = cla
     });
     _defineProperty(this, "back", () => {
       const h = this.stack.pop();
-      if (h && h.from) {
+      if (h?.from) {
         const from = h.from;
         this.stack = [...this.stack];
         const transition = this.nativeRouter.transitionTo(from.name, from.params?.['model'], {

package/dist/setup.js

@@ -25,14 +25,14 @@ function setup() {
     };
   }
   handleBackburnerErrors();
-  SimpleDynamicAttribute.prototype.set = function (dom, value, _env) {
+  SimpleDynamicAttribute.prototype.set = function (dom, value) {
     const {
       name,
       namespace
     } = this.attribute;
     dom.__setAttribute(name, value, namespace);
   };
-  SimpleDynamicAttribute.prototype.update = function (value, _env) {
+  SimpleDynamicAttribute.prototype.update = function (value) {
     const normalizedValue = value;
     const {
       element: element,

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

@@ -1,7 +1,6 @@
 import { parse, type PluginObj } from '@babel/core';
-import type * as BabelTypesNamespace from '@babel/types';
-import type { Program, Statement } from '@babel/types';
 import type * as Babel from '@babel/core';
+import type { types } from '@babel/core';
 import * as glimmer from '@glimmer/syntax';
 import { ASTv1, type NodeVisitor, WalkerPath } from '@glimmer/syntax';
 import { ImportUtil } from 'babel-import-util';
@@ -25,7 +24,7 @@ class HotAstProcessor {
     locals: Set<string>;
     importVar: any;
     importBindings: Set<string>;
-    babelProgram?: Program;
+    babelProgram?: types.Program;
   };
   didCreateImportClass: boolean = false;
 
@@ -82,7 +81,7 @@ class HotAstProcessor {
   }: {
     importVar: string;
     importBindings: Set<string>;
-    babelProgram: Program;
+    babelProgram: types.Program;
   }) {
     const findImport = function findImport(specifier: string) {
       return babelProgram.body.find(
@@ -127,7 +126,7 @@ class HotAstProcessor {
         ) {
           return;
         }
-        const original = node.original.split('.')[0]!;
+        const original = node.original.split('.')[0];
         if (original === 'this') return;
         if (original.startsWith('@')) return;
         if (original === 'block') return;
@@ -171,7 +170,7 @@ class HotAstProcessor {
         element: ASTv1.ElementNode,
         p: WalkerPath<ASTv1.ElementNode>,
       ) => {
-        const original = element.tag.split('.')[0]!;
+        const original = element.tag.split('.')[0];
         if (findBlockParams(original, p)) return;
         if (importVar) {
           if (findImport(original)) {
@@ -199,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') {
@@ -208,8 +207,8 @@ export default function hotReplaceAst(babel: typeof Babel) {
         if (state.filename?.includes('node_modules')) {
           return;
         }
-        const util = new ImportUtil(babel, path);
-        const tracked = util.import(path, '@glimmer/tracking', 'tracked');
+        const util = new ImportUtil(babel as any, path as any);
+        const tracked = util.import(path as any, '@glimmer/tracking', 'tracked');
         const klass = t.classExpression(
           path.scope.generateUidIdentifier('Imports'),
           null,
@@ -233,22 +232,22 @@ export default function hotReplaceAst(babel: typeof Babel) {
 
         const varDeclaration =
           path.node.body.findIndex(
-            (e: BabelTypesNamespace.Statement) =>
+            (e) =>
               e.type === 'VariableDeclaration' &&
-              (e.declarations[0]!.id as BabelTypesNamespace.Identifier).name ===
+              (e.declarations[0].id as any).name ===
                 hotAstProcessor.meta.importVar,
           ) + 1;
 
         const lastImportIndex =
           [...path.node.body].findLastIndex(
-            (e: BabelTypesNamespace.Statement) =>
+            (e) =>
               e.type === 'ImportDeclaration',
           ) + 1;
 
         path.node.body.splice(
           Math.max(varDeclaration, lastImportIndex),
           0,
-          assign as unknown as Statement,
+          assign as any,
         );
 
         const findImport = function findImport(specifier: string) {
@@ -263,7 +262,7 @@ export default function hotReplaceAst(babel: typeof Babel) {
         for (const imp of bindings) {
           const importDeclaration = findImport(
             imp,
-          ) as BabelTypesNamespace.ImportDeclaration;
+          ) as any;
           if (!importDeclaration) {
             console.log('could not find import for ', imp);
             continue;
@@ -281,7 +280,7 @@ export default function hotReplaceAst(babel: typeof Babel) {
               configFile: false,
             },
           );
-          const accept = ast!.program.body;
+          const accept = ast.program.body;
           ifHotStatements.push(...accept);
         }
         const ifHot = t.ifStatement(
@@ -291,7 +290,7 @@ export default function hotReplaceAst(babel: typeof Babel) {
           ),
           t.blockStatement([...ifHotStatements]),
         );
-        path.node.body.push(ifHot);
+        path.node.body.push(ifHot as any);
         path.scope.crawl();
       },
     },

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/glimmer-env.js

@@ -1,3 +1,7 @@
-export const DEBUG = true;
-export const CI = false;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQztBQUMzQixNQUFNLENBQUMsTUFBTSxFQUFFLEdBQUcsS0FBSyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNvbnN0IERFQlVHID0gZmFsc2U7XG5leHBvcnQgY29uc3QgQ0kgPSBmYWxzZTtcbiJdfQ==
+const DEBUG = true;
+const CI = false;
+
+module.exports = {
+  DEBUG,
+  CI,
+}

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.0",
+  "version": "3.0.0",
   "description": "the Ember framework with Nativescript",
   "keywords": [
     "ember-addon"
@@ -19,28 +19,23 @@
   ],
   "peerDependencies": {
     "@glimmer/component": "*",
-    "@glimmer/reference": "*",
-    "@glimmer/runtime": "*",
-    "@glimmer/tracking": "*",
-    "@glimmer/validator": "*",
     "@nativescript/core": "*",
     "ember-modifier": "*",
     "ember-source": "*",
     "loader.js": "*"
   },
   "dependencies": {
-    "@babel/core": "^7.27.3",
+    "@babel/core": "^7.27.7",
     "@babel/plugin-syntax-decorators": "^7.22.5",
     "@ember/render-modifiers": "^3.0.0",
     "@ember/string": "^4.0.0",
-    "@ember/test-waiters": "^4.0.0",
-    "@embroider/addon-shim": "^1.10.0",
-    "@eslint/js": "^9.26.0",
+    "@ember/test-waiters": "^4.1.1",
+    "@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": "^22.9.1",
+    "@types/node": "^24.1.0",
     "astroturf": "^1.2.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.2.0",
@@ -57,26 +52,24 @@
     "rollup-plugin-styles": "^4.0.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.27.3",
+    "@babel/types": "^7.28.5",
+    "@babel/eslint-parser": "^7.28.5",
     "@ember/optional-features": "^2.0.0",
-    "@embroider/addon-dev": "^8.0.1",
+    "@embroider/addon-dev": "^8.1.0",
     "@embroider/compat": "^4.1.0",
-    "@embroider/core": "^4.1.0",
-    "@embroider/macros": "^1.16.9",
+    "@embroider/core": "^4.2.8",
+    "@embroider/macros": "^1.18.1",
     "@embroider/shared-internals": "^3.0.0",
-    "@embroider/util": "^1.13.2",
-    "@embroider/webpack": "^4.1.0",
-    "@glimmer/interfaces": "^0.94.6",
-    "@glimmer/reference": "^0.94.8",
-    "@glimmer/runtime": "^0.94.10",
+    "@embroider/vite": "^1.4.2",
+    "@embroider/util": "^1.13.3",
+    "@embroider/webpack": "^4.1.1",
     "@glimmer/syntax": "^0.94.9",
-    "@glimmer/validator": "^0.94.8",
     "@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",
-    "@nativescript/core": "^8.9.2",
-    "@release-it-plugins/lerna-changelog": "^7.0.0",
+    "@nativescript/core": "^8.9.7",
+    "@release-it-plugins/lerna-changelog": "^8.0.1",
     "@rollup/plugin-babel": "^6.0.3",
     "@tsconfig/ember": "^3.0.8",
     "@types/babel__core": "^7.20.5",
@@ -84,44 +77,46 @@
     "@types/qunit": "^2.19.5",
     "@types/qunit-dom": "^0.7.0",
     "@typescript-eslint/eslint-plugin": "^8.13.0",
-    "@typescript-eslint/parser": "^8.13.0",
+    "@typescript-eslint/parser": "^8.38.0",
+    "typescript-eslint": "^8.38.0",
     "babel-import-util": "^3.0.0",
     "babel-plugin-ember-template-compilation": "^3.0.0",
     "bower": "^1.8.8",
+    "globals": "^16.5.0",
     "broccoli": "^3.4.2",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^9.1.2",
+    "concurrently": "^9.2.0",
     "content-tag": "^4.0.0",
     "css-loader": "^7.1.2",
     "ember-eslint-parser": "^0.5.9",
     "ember-modifier": "^4.2.0",
-    "ember-source": "^6.4.0",
-    "ember-template-lint": "^7.7.0",
-    "eslint": "^8.57.0",
+    "ember-source": "^6.6.0",
+    "ember-template-lint": "^7.9.1",
+    "eslint": "^9.27.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^10.1.5",
+    "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-ember": "^12.3.1",
     "eslint-plugin-ember-template-lint": "^0.21.0",
-    "eslint-plugin-n": "^17.18.0",
+    "eslint-plugin-n": "^17.21.3",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-qunit": "^8.1.1",
     "fix-bad-declaration-output": "^1.1.4",
     "loader.js": "^4.7.0",
     "nativescript-ui-listview": "^15.2.3",
-    "prettier": "^3.3.2",
-    "prettier-plugin-ember-template-tag": "^2.0.4",
+    "prettier": "^3.6.2",
+    "prettier-plugin-ember-template-tag": "^2.1.0",
     "qunit": "^2.19.4",
     "qunit-dom": "^3.4.0",
     "release-it": "^15.10.3",
-    "rollup": "^4.41.1",
-    "rollup-plugin-copy": "^3.4.0",
+    "rollup": "^4.46.3",
+    "rollup-plugin-copy": "^3.5.0",
     "router_js": "^8.0.6",
-    "sass": "^1.81.0",
-    "sass-embedded": "^1.88.0",
+    "sass": "^1.89.2",
+    "sass-embedded": "^1.90.0",
     "sass-loader": "^16.0.4",
-    "typescript": "^5.6.3",
-    "typescript-plugin-css-modules": "^5.0.1",
+    "typescript": "^5.9.2",
+    "typescript-plugin-css-modules": "^5.2.0",
     "yui": "^3.18.1"
   },
   "publishConfig": {
@@ -155,6 +150,7 @@
       "types": "./declarations/*.d.ts",
       "default": "./dist/*.js"
     },
+    "./utils/*": "./dist/utils/*",
     "./addon-main.js": "./addon-main.cjs"
   },
   "typesVersions": {
@@ -165,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/types/globals.d.ts

@@ -0,0 +1,42 @@
+declare module '*.scss';
+
+type AnyFunction = (...args: any) => any;
+
+// Add global functions
+declare global {
+  const __inspectorSendEvent: AnyFunction;
+  const __decorate: AnyFunction;
+  const __metadata: AnyFunction;
+}
+
+declare namespace globalThis {
+  const __inspectorSendEvent: AnyFunction;
+  const __decorate: AnyFunction;
+  const __metadata: AnyFunction;
+}
+
+// Add properties to globalThis
+interface Window {
+  define: AnyFunction;
+  requirejs: AnyFunction;
+  requireModule: AnyFunction;
+  Element: any;
+  Node: any;
+  __metadata: AnyFunction;
+  __decorate: AnyFunction;
+  __inspectorSendEvent: AnyFunction;
+  emberDebugInjected: boolean;
+  MessageChannel: MessageChannel;
+  postMessage: AnyFunction;
+  triggerEvent: AnyFunction;
+  EmberInspector: any;
+}
+
+interface Document {
+  nodeMap: any;
+}
+
+declare module 'loader.js' {
+  const require: AnyFunction;
+  const define: AnyFunction;
+}

package/declarations/types/globals.d.ts

@@ -1,56 +0,0 @@
-declare module '*.scss';
-type AnyFunction = (...args: any) => any;
-declare namespace globalThis {
-    var define: AnyFunction;
-    var requirejs: AnyFunction;
-    var requireModule: AnyFunction;
-    var Element: import('../dom/nodes/ElementNode.ts').default;
-    var Node: import('../dom/nodes/ElementNode.ts').default;
-    var __metadata: AnyFunction;
-    var __decorate: AnyFunction;
-    var __inspectorSendEvent: AnyFunction;
-    var emberDebugInjected: boolean;
-    var MessageChannel: MessageChannel;
-    var postMessage: AnyFunction;
-    var triggerEvent: AnyFunction;
-    var EmberInspector: any;
-}
-interface Document {
-    nodeMap: any;
-}
-declare module 'loader.js' {
-    const require: AnyFunction;
-    const define: AnyFunction;
-}
-interface HTMLElementTagNameMap {
-    'rad-list-view': import('../dom/native/NativeElementNode').default<import('nativescript-ui-listview').RadListView>;
-    'list-view': import('../dom/native/NativeElementNode').default<import('@nativescript/core').ListView>;
-    'html-view': import('../dom/native/NativeElementNode').default<import('@nativescript/core').HtmlView>;
-    'scroll-view': import('../dom/native/NativeElementNode').default<import('@nativescript/core').ScrollView>;
-    'text-field': import('../dom/native/NativeElementNode').default<import('@nativescript/core').TextField>;
-    'text-view': import('../dom/native/NativeElementNode').default<import('@nativescript/core').TextView>;
-    'web-view': import('../dom/native/NativeElementNode').default<import('@nativescript/core').WebView>;
-    'content-view': import('../dom/native/NativeElementNode').default<import('@nativescript/core').ContentView>;
-    'tab-view': import('../dom/native/NativeElementNode').default<import('@nativescript/core').TabView>;
-    'tab-view-item': import('../dom/native/NativeElementNode').default<import('@nativescript/core').TabViewItem>;
-    switch: import('../dom/native/NativeElementNode').default<import('@nativescript/core').Switch>;
-    'formatted-string': import('../dom/native/NativeElementNode').default<import('@nativescript/core').FormattedString>;
-    frame: import('../dom/native/FrameElement.ts').default;
-    page: import('../dom/native/PageElement.ts').default;
-    span: import('../dom/native/NativeElementNode').default<import('@nativescript/core').Span>;
-    'action-bar': import('../dom/native/NativeElementNode').default<import('@nativescript/core').ActionBar>;
-    'action-item': import('../dom/native/NativeElementNode').default<import('@nativescript/core').ActionItem>;
-    comment: import('../dom/native/NativeElementNode').default<import('@nativescript/core').Placeholder>;
-    button: import('../dom/native/NativeElementNode').default<import('@nativescript/core').Button>;
-    'navigation-button': import('../dom/native/NativeElementNode').default<import('@nativescript/core').NavigationButton>;
-    image: import('../dom/native/NativeElementNode').default<import('@nativescript/core').Image>;
-    label: import('../dom/native/NativeElementNode').default<import('@nativescript/core').Label>;
-    'list-picker': import('../dom/native/NativeElementNode').default<import('@nativescript/core').ListPicker>;
-    'date-picker': import('../dom/native/NativeElementNode').default<import('@nativescript/core').DatePicker>;
-    'dock-layout': import('../dom/native/NativeElementNode').default<import('@nativescript/core').DockLayout>;
-    'wrap-layout': import('../dom/native/NativeElementNode').default<import('@nativescript/core').WrapLayout>;
-    'stack-layout': import('../dom/native/NativeElementNode').default<import('@nativescript/core').StackLayout>;
-    'grid-layout': import('../dom/native/NativeElementNode').default<import('@nativescript/core').GridLayout>;
-    'flexbox-layout': import('../dom/native/NativeElementNode').default<import('@nativescript/core').FlexboxLayout>;
-    'absolute-layout': import('../dom/native/NativeElementNode').default<import('@nativescript/core').AbsoluteLayout>;
-}

package/dist/types/globals.js

@@ -1,2 +0,0 @@
-
-//# sourceMappingURL=globals.js.map

package/dist/types/globals.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"globals.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

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;
-};