@salesforce/templates 66.1.0 → 66.2.0

package/lib/utils/webappTemplateUtils.js

@@ -0,0 +1,210 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FULL_TEMPLATE_SKIP_DIRS = exports.FULL_TEMPLATE_DEFAULT_NAMES = exports.BUILT_IN_FULL_TEMPLATES = exports.EJS_EXTENSIONS = void 0;
+exports.isLikelyText = isLikelyText;
+exports.renderEjsFile = renderEjsFile;
+exports.generateBuiltInFullTemplate = generateBuiltInFullTemplate;
+exports.generateFromProjectTemplateDir = generateFromProjectTemplateDir;
+const tslib_1 = require("tslib");
+/*
+ * Copyright (c) 2019, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const fs = require("fs");
+const promises_1 = require("node:fs/promises");
+const path = require("path");
+/** File extensions that should be processed as EJS templates */
+exports.EJS_EXTENSIONS = new Set([
+    '.json',
+    '.js',
+    '.ts',
+    '.jsx',
+    '.tsx',
+    '.md',
+    '.txt',
+    '.xml',
+    '.html',
+    '.yml',
+    '.yaml',
+    '.env',
+    '.cfg',
+    '.config.js',
+    '.config.ts',
+]);
+/** Templates that have a full folder under src/templates/project/ (populated at build time from npm) */
+exports.BUILT_IN_FULL_TEMPLATES = new Set(['react-b2e', 'react-b2x']);
+/**
+ * Default app/site names embedded in each full template; all are renamed to the project name.
+ * Order matters: replace longer (suffix) first to avoid partial replacements.
+ */
+exports.FULL_TEMPLATE_DEFAULT_NAMES = {
+    'react-b2e': {
+        base: 'appreacttemplateb2e',
+        withSuffix: 'appreacttemplateb2e1',
+    },
+    'react-b2x': {
+        base: 'appreacttemplateb2x',
+        withSuffix: 'appreacttemplateb2x1',
+    },
+};
+/** Directories to skip when walking a full template dir (e.g. node_modules) */
+exports.FULL_TEMPLATE_SKIP_DIRS = new Set(['node_modules', '.git']);
+/** Heuristic: treat as text if no null byte in the first chunk and decodable as UTF-8 */
+function isLikelyText(filename, buffer) {
+    const ext = path.extname(filename).toLowerCase();
+    const binaryExts = new Set([
+        '.png',
+        '.jpg',
+        '.jpeg',
+        '.gif',
+        '.ico',
+        '.svg',
+        '.woff',
+        '.woff2',
+        '.ttf',
+        '.eot',
+        '.pdf',
+        '.zip',
+    ]);
+    if (binaryExts.has(ext)) {
+        return false;
+    }
+    const chunk = buffer.slice(0, 1024);
+    if (chunk.includes(0)) {
+        return false;
+    }
+    try {
+        chunk.toString('utf8');
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+}
+/** Renders an EJS template file with the given data (stateless, no generator dependency). */
+function renderEjsFile(sourcePath, data) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { renderFile } = yield Promise.resolve().then(() => require('ejs'));
+        return new Promise((resolve, reject) => {
+            renderFile(sourcePath, data, (err, str) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(str !== null && str !== void 0 ? str : '');
+                }
+            });
+        });
+    });
+}
+/**
+ * Generate project files from a built-in full template (e.g. react-b2e, react-b2x).
+ * Builds template vars and name replacements and delegates to generateFromProjectTemplateDir.
+ */
+function generateBuiltInFullTemplate(template, projectname, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { templateDir, projectDir, defaultpackagedir, ns, loginurl, apiversion, renderEjs, onFileCreated, } = options;
+        const templateVars = {
+            projectname,
+            defaultpackagedir,
+            namespace: ns,
+            ns,
+            loginurl,
+            apiversion,
+            name: projectname,
+            company: (process.env.USER || 'Demo') + ' company',
+        };
+        const nameReplacementsEntry = exports.FULL_TEMPLATE_DEFAULT_NAMES[template];
+        const nameReplacements = nameReplacementsEntry
+            ? [
+                [nameReplacementsEntry.withSuffix, projectname + '1'],
+                [nameReplacementsEntry.base, projectname],
+            ]
+            : undefined;
+        yield generateFromProjectTemplateDir(templateDir, projectDir, templateVars, {
+            nameReplacements,
+            renderEjs,
+            onFileCreated,
+        });
+    });
+}
+/**
+ * Recursively walk a full project template directory (e.g. react-b2e, react-b2x),
+ * rendering EJS for text files and copying the rest. Renames template default app/site
+ * names (e.g. appreacttemplateb2e) to the project name in paths and file contents.
+ */
+function generateFromProjectTemplateDir(sourceDir, destDir, templateVars, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { nameReplacements, renderEjs, onFileCreated } = options;
+        if (!fs.existsSync(sourceDir)) {
+            return;
+        }
+        const applyReplacements = (s) => {
+            if (!nameReplacements) {
+                return s;
+            }
+            let out = s;
+            for (const [from, to] of nameReplacements) {
+                out = out.split(from).join(to);
+            }
+            return out;
+        };
+        const entries = yield (0, promises_1.readdir)(sourceDir, { withFileTypes: true });
+        for (const entry of entries) {
+            const sourcePath = path.join(sourceDir, entry.name);
+            if (entry.isDirectory()) {
+                if (exports.FULL_TEMPLATE_SKIP_DIRS.has(entry.name)) {
+                    continue;
+                }
+                const destName = applyReplacements(entry.name);
+                const destPath = path.join(destDir, destName);
+                yield (0, promises_1.mkdir)(destPath, { recursive: true });
+                yield generateFromProjectTemplateDir(sourcePath, destPath, templateVars, options);
+                continue;
+            }
+            if (!entry.isFile()) {
+                continue;
+            }
+            const destName = applyReplacements(entry.name);
+            const destPath = path.join(destDir, destName);
+            const ext = path.extname(entry.name);
+            const isEjsTemplate = exports.EJS_EXTENSIONS.has(ext) ||
+                entry.name.endsWith('.config.js') ||
+                entry.name.endsWith('.config.ts');
+            if (isEjsTemplate) {
+                try {
+                    const rendered = yield renderEjs(sourcePath, templateVars);
+                    const content = applyReplacements(rendered);
+                    yield (0, promises_1.mkdir)(path.dirname(destPath), { recursive: true });
+                    yield (0, promises_1.writeFile)(destPath, content, 'utf8');
+                    onFileCreated(destPath);
+                }
+                catch (_a) {
+                    const raw = yield (0, promises_1.readFile)(sourcePath);
+                    const str = raw.toString('utf8');
+                    const content = applyReplacements(str);
+                    yield (0, promises_1.mkdir)(path.dirname(destPath), { recursive: true });
+                    yield (0, promises_1.writeFile)(destPath, content, 'utf8');
+                    onFileCreated(destPath);
+                }
+            }
+            else {
+                yield (0, promises_1.mkdir)(path.dirname(destPath), { recursive: true });
+                const content = yield (0, promises_1.readFile)(sourcePath);
+                const isText = isLikelyText(entry.name, content);
+                if (isText && (nameReplacements === null || nameReplacements === void 0 ? void 0 : nameReplacements.length)) {
+                    const str = content.toString('utf8');
+                    const replaced = applyReplacements(str);
+                    yield (0, promises_1.writeFile)(destPath, replaced, 'utf8');
+                }
+                else {
+                    yield (0, promises_1.writeFile)(destPath, new Uint8Array(content));
+                }
+                onFileCreated(destPath);
+            }
+        }
+    });
+}
+//# sourceMappingURL=webappTemplateUtils.js.map

package/lib/utils/webappTemplateUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webappTemplateUtils.js","sourceRoot":"","sources":["../../src/utils/webappTemplateUtils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/templates",
-  "version": "66.1.0",
+  "version": "66.2.0",
   "description": "Salesforce JS library for templates",
   "bugs": "https://github.com/forcedotcom/salesforcedx-templates/issues",
   "main": "lib/index.js",
@@ -18,14 +18,16 @@
     "hpagent": "^1.2.0",
     "mime-types": "^3.0.2",
     "proxy-from-env": "^1.1.0",
-    "tar": "^7.5.8",
+    "tar": "^7.5.9",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
     "@salesforce/dev-config": "^4.3.2",
     "@salesforce/dev-scripts": "^11.0.2",
-    "@salesforce/webapp-template-base-react-app-experimental": "^1.30.0",
-    "@salesforce/webapp-template-base-web-app-experimental": "^1.30.0",
+    "@salesforce/webapp-template-app-react-template-b2e-experimental": "^1.48.0",
+    "@salesforce/webapp-template-app-react-template-b2x-experimental": "^1.48.0",
+    "@salesforce/webapp-template-base-react-app-experimental": "^1.48.1",
+    "@salesforce/webapp-template-base-web-app-experimental": "^1.48.1",
     "@salesforce/prettier-config": "^0.0.4",
     "@types/chai-as-promised": "^7.1.8",
     "@types/ejs": "^3.1.5",
@@ -63,9 +65,9 @@
     "node": ">=18.18.2"
   },
   "scripts": {
-    "build": "yarn run clean:lib && yarn build:copy-webapp-templates && yarn build:templates && yarn compile",
+    "build": "yarn run clean:lib && yarn build:copy-templates && yarn build:templates && yarn compile",
     "build:templates": "node scripts/build-templates",
-    "build:copy-webapp-templates": "node scripts/copy-webapp-templates",
+    "build:copy-templates": "node scripts/copy-templates",
     "clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output",
     "commit": "git-cz",
     "compile": "tsc -b",

package/lib/templates/webapplication/reactbasic/src/pages/About.tsx

@@ -1,12 +0,0 @@
-function About() {
-  return (
-    <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
-      <div className="text-center">
-        <h1 className="text-4xl font-bold text-gray-900 mb-4">About</h1>
-        <p className="text-lg text-gray-600">This is the about page.</p>
-      </div>
-    </div>
-  );
-}
-
-export default About;