Merge remote-tracking branch 'origin/main' into feat/ns-9

Author: NathanWalker

packages/template-blank-solid-ts/webpack.config.js

@@ -1,12 +1,12 @@
-const webpack = require('@nativescript/webpack');
+const webpack = require('@nativescript/webpack')
 
 module.exports = (env) => {
-  webpack.init(env);
-  
+  webpack.init(env)
+
   webpack.chainWebpack((config) => {
     config.devServer.hotOnly(true)
     config.devServer.hot(true)
-  });
+  })
 
-  return webpack.resolveConfig();
-};
+  return webpack.resolveConfig()
+}

packages/template-blank-solid-vision/src/app.css

@@ -1,3 +1,3 @@
 @tailwind base;
 @tailwind components;
-@tailwind utilities;
+@tailwind utilities;

packages/template-blank-solid-vision/tailwind.config.js

@@ -1,15 +1,13 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-    content: ['./src/**/*.{css,xml,html,vue,svelte,ts,tsx}'],
-    // use the .ns-dark class to control dark mode (applied by NativeScript) - since 'media' (default) is not supported.
-    darkMode: ['class', '.ns-dark'],
-    theme: {
-        extend: {},
-    },
-    plugins: [],
-    corePlugins: {
-        preflight: false, // disables browser-specific resets
-    },
-};
-
-  
+  content: ['./src/**/*.{css,xml,html,vue,svelte,ts,tsx}'],
+  // use the .ns-dark class to control dark mode (applied by NativeScript) - since 'media' (default) is not supported.
+  darkMode: ['class', '.ns-dark'],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+  corePlugins: {
+    preflight: false, // disables browser-specific resets
+  },
+}

packages/template-blank-solid-vision/tsconfig.json

@@ -16,11 +16,7 @@
       "@/*": ["src/*"]
     },
     "allowJs": true,
-    "types": [
-      "node",
-      "@nativescript-dom/core-types",
-      "@nativescript-dom/solidjs-types"
-    ],
+    "types": ["node", "@nativescript-dom/core-types", "@nativescript-dom/solidjs-types"],
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "experimentalDecorators": true,
@@ -32,4 +28,4 @@
   },
   "include": ["src"],
   "exclude": ["node_modules", "platforms"]
-}
+}

packages/template-blank-solid-vision/webpack.config.js

@@ -1,9 +1,9 @@
-const webpack = require("@nativescript/webpack");
+const webpack = require('@nativescript/webpack')
 module.exports = (env) => {
-  webpack.init(env);
+  webpack.init(env)
   webpack.chainWebpack((config) => {
-    config.devServer.hotOnly(true);
-    config.devServer.hot(true);
-  });
-  return webpack.resolveConfig();
-};
+    config.devServer.hotOnly(true)
+    config.devServer.hot(true)
+  })
+  return webpack.resolveConfig()
+}

packages/template-blank-solid/webpack.config.js

@@ -1,12 +1,12 @@
-const webpack = require('@nativescript/webpack');
+const webpack = require('@nativescript/webpack')
 
 module.exports = (env) => {
-  webpack.init(env);
-  
+  webpack.init(env)
+
   webpack.chainWebpack((config) => {
     config.devServer.hotOnly(true)
     config.devServer.hot(true)
-  });
+  })
 
-  return webpack.resolveConfig();
-};
+  return webpack.resolveConfig()
+}

packages/template-blank-svelte-vision/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nativescript/template-blank-svelte-vision",
   "main": "src/app.ts",
-  "version": "8.9.1",
+  "version": "8.9.2",
   "description": "Nativescript visionOS Starter with Svelte",
   "author": "NativeScript Team <[email protected]>",
   "license": "Apache-2.0",
@@ -39,16 +39,16 @@
     "url": "https://github.com/NativeScript/NativeScript/issues"
   },
   "dependencies": {
-    "@nativescript/core": "~8.9.0",
-    "@nativescript-community/svelte-native": "~1.0.29"
+    "@nativescript-community/svelte-native": "~1.0.29",
+    "@nativescript/core": "~8.9.9"
   },
   "devDependencies": {
-    "@nativescript/types": "~8.9.0",
-    "@nativescript/webpack": "~5.0.0",
-    "svelte": "~4.2.2",
-    "svelte-loader": "^3.2.0",
-    "svelte-native-preprocessor": "^1.0.0",
-    "svelte-preprocess": "^5.1.3",
-    "typescript": "~5.7.0"
+    "@nativescript-community/svelte-native-preprocessor": "^1.0.1",
+    "@nativescript/types": "~8.9.1",
+    "@nativescript/webpack": "~5.0.24",
+    "svelte": "~4.2.20",
+    "svelte-loader": "^3.2.4",
+    "svelte-preprocess": "^6.0.3",
+    "typescript": "~5.9.2"
   }
 }

packages/template-blank-svelte-vision/src/app.css

@@ -12,4 +12,3 @@
   font-family: 'Font Awesome 5 Free', 'fa-regular-400';
   font-weight: 400;
 }
-

packages/template-blank-svelte-vision/svelte.config.js

@@ -1,9 +1,33 @@
 const sveltePreprocess = require('svelte-preprocess')
-const svelteNativePreprocessor = require('svelte-native-preprocessor')
+const svelteNativePreprocessor = require('@nativescript-community/svelte-native-preprocessor')
 
+// this can be called either through svelte-loader where we want either __ANDROID__ or __IOS__ to be defined but not both
+// or through svelte-check where we want both so everything is checked
+const webpack_env = process.env['NATIVESCRIPT_WEBPACK_ENV']
+  ? JSON.parse(process.env['NATIVESCRIPT_WEBPACK_ENV'])
+  : {
+      android: true,
+      ios: true,
+    }
 module.exports = {
   compilerOptions: {
-    namespace: "foreign"
+    namespace: 'foreign',
   },
-  preprocess: [ sveltePreprocess(), svelteNativePreprocessor() ]
-}
+  preprocess: [
+    sveltePreprocess({
+      replace: [
+        [/__ANDROID__/g, !!webpack_env.android],
+        [/__IOS__/g, !!webpack_env.ios],
+      ],
+      typescript: {
+        compilerOptions: {
+          verbatimModuleSyntax: true,
+          target: 'es2020',
+        },
+      },
+    }),
+    // if you want bind:text="{email}" to be transformed to text="{email}" on:textChanged="{e => email = e.value}"
+    // enable svelteNativePreprocessor. Keep in mind that it is pretty slow
+    /* svelteNativePreprocessor() */
+  ],
+}

packages/template-blank-svelte/app/app.css

@@ -1,7 +1,4 @@
-@import '@nativescript/theme/css/core.css';
-@import '@nativescript/theme/css/default.css';
-
-.fab {
+.fab {
   font-family: 'Font Awesome 5 Brands', 'fa-brands-400';
   font-weight: 400;
 }
@@ -15,4 +12,3 @@
   font-family: 'Font Awesome 5 Free', 'fa-regular-400';
   font-weight: 400;
 }
-