sv-arcgis 1.3.0-next.1 → 1.3.0-next.3

package/README.md

@@ -1,11 +1,12 @@
 ## 🎬 Prereqs
 
-- SvelteKit installed (`npx sv create [project_name]`)
+- SvelteKit: `npx sv create [project_name]`
+- (Or Svelte: `npm create vite@latest`)
 
 ## 🗜️ Setup
-1. Install [sv-arcgis](https://www.npmjs.com/package/sv-arcgis) `npm i sv-arcgis`
-2. Run sv-arcgis `npx sv-arcgis`
-3. ⚠️ Follow instructions in terminal
+
+1. Install [sv-arcgis](https://www.npmjs.com/package/sv-arcgis) `npx sv-arcgis`
+2. Follow instructions in terminal 👍
 
 ## 📕 Notes
 
@@ -15,10 +16,10 @@
 
 ## 🗺️ Roadmap
 
-- Option for / intergrate OAuth2 https://developers.arcgis.com/documentation/security-and-authentication/user-authentication/arcgis-apis/
-- Update to use determine if Svelte Vite app? (Demo would need to be different)
-- Create tests (see https://www.youtube.com/watch?v=Xk8yaN9_PZA)
 - Create CI / CD (w/ tests)
+- Create tests (see https://www.youtube.com/watch?v=Xk8yaN9_PZA)
+- Option for / intergrate OAuth2 https://developers.arcgis.com/documentation/security-and-authentication/user-authentication/arcgis-apis/
+- [x] Update to work Svelte / Vite app (not just Kit)? (Demo would need to be different)
 
 ## 🙏 Help
 

package/bin/sv-arcgis-setup.js

@@ -1,37 +1,37 @@
 #!/usr/bin/env node
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process');
+const fs = require("fs");
+const path = require("path");
+const { execSync } = require("child_process");
 
-const packageJsonPath = path.join(process.cwd(), 'package.json');
+const packageJsonPath = path.join(process.cwd(), "package.json");
 
 if (!fs.existsSync(packageJsonPath)) {
-  console.error('No package.json found in current directory');
+  console.error("No package.json found in current directory");
   process.exit(1);
 }
 
-const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
 
 // Detect package manager
-const hasPnpmLock = fs.existsSync(path.join(process.cwd(), 'pnpm-lock.yaml'));
-const hasYarnLock = fs.existsSync(path.join(process.cwd(), 'yarn.lock'));
+const hasPnpmLock = fs.existsSync(path.join(process.cwd(), "pnpm-lock.yaml"));
+const hasYarnLock = fs.existsSync(path.join(process.cwd(), "yarn.lock"));
 
-let packageManager = 'npm';
+let packageManager = "npm";
 if (hasPnpmLock) {
-  packageManager = 'pnpm';
+  packageManager = "pnpm";
 } else if (hasYarnLock) {
-  packageManager = 'yarn';
+  packageManager = "yarn";
 }
 
 // Create config directory
-const configDirectory = path.join(process.cwd(), '.config');
+const configDirectory = path.join(process.cwd(), ".config");
 if (!fs.existsSync(configDirectory)) {
   fs.mkdirSync(configDirectory, { recursive: true });
   // console.log("✅ Created .config directory");
 }
 
 // Create init-sv-arcgis.js file
-const initConfigPath = path.join(configDirectory, 'init-sv-arcgis.js');
+const initConfigPath = path.join(configDirectory, "init-sv-arcgis.js");
 const initConfigContent = `#!/usr/bin/env node
 
 import fs from 'fs';
@@ -333,7 +333,7 @@ if (calcite.CALCITE === true) {
   console.log("📦 Installing ArcGIS Core, Map Components, and Calcite Components...");
   initPromises.push(
     new Promise((resolve, reject) => {
-      exec(\`\${packageManager} install @arcgis/core@4.33.12 @arcgis/map-components@4.33.12 @esri/calcite-components@2.13.0\`, (error, stdout, stderr) => {
+      exec(\`\${packageManager} install @arcgis/core@4.33.14 @arcgis/map-components@4.33.24 @esri/calcite-components@3.3.3\`, (error, stdout, stderr) => {
         if (error) {
           console.log('error:', chalk.white.bgRed(error.message));
           reject(error);
@@ -347,7 +347,7 @@ if (calcite.CALCITE === true) {
  console.log("📦 Installing ArcGIS Core and Map Components...");
   initPromises.push(
     new Promise((resolve, reject) => {
-      exec(\`\${packageManager} install @arcgis/core@4.33.12 @arcgis/map-components@4.33.12\`, (error, stdout, stderr) => {
+      exec(\`\${packageManager} install @arcgis/core@4.33.14 @arcgis/map-components@4.33.24\`, (error, stdout, stderr) => {
         if (error) {
           console.log('error:', chalk.white.bgRed(error.message));
           reject(error);
@@ -368,6 +368,8 @@ if (initPromises.length > 0) {
     } catch (error) {
     console.log("");
     console.log("❌ Package installation failed:", error.message);
+    console.log("");
+    console.log("❓ Do you already have one of these installed @arcgis/core, @arcgis/map-components, or @esri/calcite-components? This may be the issue. If you're comfortable with it, uninstall them, delete the node_modules folder, package-lock.json, and run this tool again.");
   }
 }
 
@@ -417,7 +419,7 @@ if (demo.DEMO === true) {
         import("@arcgis/map-components/dist/loader").then(
           ({ defineCustomElements }) => {
             defineCustomElements(window, {
-              resourcesUrl: "https://js.arcgis.com/map-components/4.33.12/assets",
+              resourcesUrl: "https://js.arcgis.com/map-components/4.33.24/assets",
             });
           }
         );
@@ -461,7 +463,7 @@ if (demo.DEMO === true) {
     </main>
 
     <style>
-      @import "https://js.arcgis.com/4.31/@arcgis/core/assets/esri/themes/dark/main.css";\${calcite.CALCITE ? '\\n    @import "@esri/calcite-components/dist/calcite/calcite.css";' : ''}
+      @import "https://js.arcgis.com/4.33/@arcgis/core/assets/esri/themes/dark/main.css";\${calcite.CALCITE ? '\\n    @import "@esri/calcite-components/dist/calcite/calcite.css";' : ''}
 
       :global(body:has(.e-demo)) {
         margin: 0;
@@ -592,7 +594,7 @@ if (demo.DEMO === true) {
       import("@arcgis/map-components/dist/loader").then(
         ({ defineCustomElements }) => {
           defineCustomElements(window, {
-            resourcesUrl: "https://js.arcgis.com/map-components/4.33.12/assets",
+            resourcesUrl: "https://js.arcgis.com/map-components/4.33.24/assets",
           });
         }
       );
@@ -635,7 +637,7 @@ if (demo.DEMO === true) {
     </main>
   
     <style>
-      @import "https://js.arcgis.com/4.31/@arcgis/core/assets/esri/themes/dark/main.css";\${calcite.CALCITE ? '\\n    @import "@esri/calcite-components/dist/calcite/calcite.css";' : ''}
+      @import "https://js.arcgis.com/4.33/@arcgis/core/assets/esri/themes/dark/main.css";\${calcite.CALCITE ? '\\n    @import "@esri/calcite-components/dist/calcite/calcite.css";' : ''}
   
       :global(body:has(.e-demo)) {
         margin: 0;
@@ -749,7 +751,7 @@ if (demo.DEMO === true) {
 
   fs.writeFileSync(demoPagePath, demoPageContent);
   if (isSvelte) {
-    console.log(\`✅ Created demo page at ./src/routes/arcgis/ArcGIS.svelte\`);
+    console.log(\`✅ Created demo page at ./src/lib/arcgis/ArcGIS.svelte\`);
   } else {
     console.log(\`✅ Created demo page at ./src/routes/arcgis/+page.svelte\`);
   }
@@ -757,7 +759,7 @@ if (demo.DEMO === true) {
   // Update root page
   const rootRouteDir = isSvelte ? path.join(process.cwd(), 'src') : path.join(process.cwd(), 'src', 'routes');
   const rootPagePath = isSvelte ? path.join(rootRouteDir, 'App.svelte') : path.join(rootRouteDir, '+page.svelte');
-  const rootPageUpdate = isSvelte ?  \`import ArcGIS from './lib/ArcGIS.svelte';\` : \`<p>Visit the <a href="arcgis">arcgis demo page</a> and view console.log output</p>\`;
+  const rootPageUpdate = isSvelte ?  \n\`import ArcGIS from './lib/ArcGIS.svelte';\` : \`<p>Visit the <a href="arcgis">arcgis demo page</a> and view console.log output</p>\`;
 
   // Read existing root page content and append the demo link
   if (fs.existsSync(rootPagePath) && isSvelteKit) {
@@ -878,7 +880,8 @@ console.log("✅ Created .config/init-sv-arcgis.js");
 
 // Add script
 if (!packageJson.scripts) packageJson.scripts = {};
-packageJson.scripts.config = 'SUPPRESS_NO_CONFIG_WARNING=true node ./.config/init-sv-arcgis.js';
+packageJson.scripts.config =
+  "SUPPRESS_NO_CONFIG_WARNING=true node ./.config/init-sv-arcgis.js";
 
 // Write back to package.json
 fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
@@ -887,12 +890,19 @@ fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 console.log("📦 Installing required dependencies...");
 
 try {
-  if (packageManager === 'pnpm') {
-    execSync('pnpm add -D chalk@5.4.1 prompts@2.4.2 cross-env@10.0.0', { stdio: 'inherit' });
-  } else if (packageManager === 'yarn') {
-    execSync('yarn add -D chalk@5.4.1 prompts@2.4.2 cross-env@10.0.0', { stdio: 'inherit' });
+  if (packageManager === "pnpm") {
+    execSync("pnpm add -D chalk@5.4.1 prompts@2.4.2 cross-env@10.0.0", {
+      stdio: "inherit",
+    });
+  } else if (packageManager === "yarn") {
+    execSync("yarn add -D chalk@5.4.1 prompts@2.4.2 cross-env@10.0.0", {
+      stdio: "inherit",
+    });
   } else {
-    execSync('npm install --save-dev chalk@5.4.1 prompts@2.4.2 cross-env@10.0.0', { stdio: 'inherit' });
+    execSync(
+      "npm install --save-dev chalk@5.4.1 prompts@2.4.2 cross-env@10.0.0",
+      { stdio: "inherit" }
+    );
   }
   console.log("✅ Dependencies installed successfully");
 } catch (error) {
@@ -904,9 +914,9 @@ console.log("✅ Added config script to package.json");
 console.log("");
 
 console.log("🚀 Now run:");
-if (packageManager === 'pnpm') {
+if (packageManager === "pnpm") {
   console.log("   `pnpm run config`");
-} else if (packageManager === 'yarn') {
+} else if (packageManager === "yarn") {
   console.log("   `yarn run config`");
 } else {
   console.log("   `npm run config`");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sv-arcgis",
-  "version": "1.3.0-next.1",
+  "version": "1.3.0-next.3",
   "main": "index.js",
   "bin": {
     "sv-arcgis": "./bin/sv-arcgis-setup.js"