create-sparkling-app 2.1.0-rc.24 → 2.1.0-rc.26

package/dist/core/project-builder/template.js

@@ -146,7 +146,7 @@ async function copyTemplateWithVariables({ checkEmpty = true, from, isMergePacka
             throw new UserCancelledError();
         }
     }
-    const allSkipFiles = new Set(['dist', 'node_modules', 'Pods', '.gradle', ...skipFiles]);
+    const allSkipFiles = new Set(['dist', 'node_modules', 'Pods', '.gradle', '.sparkling', ...skipFiles]);
     node_fs_1.default.mkdirSync(to, { recursive: true });
     for (const file of node_fs_1.default.readdirSync(from)) {
         if (allSkipFiles.has(file)) {

package/dist/create-app/namespace.js

@@ -11,8 +11,7 @@ exports.applyPackageNamespace = applyPackageNamespace;
 // LICENSE file in the root directory of this source tree.
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const DEFAULT_ANDROID_NAMESPACE = 'com.tiktok.sparkling.go';
-const DEFAULT_ANDROID_TEST_PACKAGE = 'com.tiktok.sparkling.app';
+const DEFAULT_ANDROID_NAMESPACE = 'com.example.sparkling.go';
 const DEFAULT_IOS_BUNDLE_ID = 'com.sparkling.app.SparklingGo';
 const DEFAULT_IOS_TEST_BUNDLE_ID = 'com.sparkling.app.SparklingGoTests';
 const DEFAULT_IOS_UITEST_BUNDLE_ID = 'com.sparkling.app.SparklingGoUITests';
@@ -40,32 +39,56 @@ function replaceInTree(targetPath, replacements) {
         }
         return;
     }
+    // Apply longer keys first so a shorter key that is a prefix of a longer one
+    // (e.g. main bundle id vs `${bundleId}Tests`) does not mangle the longer one.
+    const ordered = Object.entries(replacements)
+        .filter(([from]) => from)
+        .sort(([a], [b]) => b.length - a.length);
     let content = node_fs_1.default.readFileSync(targetPath, 'utf8');
     let updated = content;
-    for (const [from, to] of Object.entries(replacements)) {
-        if (!from)
-            continue;
+    for (const [from, to] of ordered) {
         updated = updated.split(from).join(to);
     }
     if (updated !== content) {
         node_fs_1.default.writeFileSync(targetPath, updated, 'utf8');
     }
 }
+function removeEmptyParentDirs(startDir, stopDir) {
+    let current = startDir;
+    const stop = node_path_1.default.resolve(stopDir);
+    while (node_path_1.default.resolve(current) !== stop) {
+        if (!node_fs_1.default.existsSync(current)) {
+            current = node_path_1.default.dirname(current);
+            continue;
+        }
+        const stat = node_fs_1.default.statSync(current);
+        if (!stat.isDirectory()) {
+            return;
+        }
+        if (node_fs_1.default.readdirSync(current).length > 0) {
+            return;
+        }
+        node_fs_1.default.rmdirSync(current);
+        current = node_path_1.default.dirname(current);
+    }
+}
 function moveAndroidPackageDirs(appDir, oldNamespace, newNamespace) {
+    if (oldNamespace === newNamespace) {
+        return;
+    }
     const oldParts = oldNamespace.split('.');
     const newParts = newNamespace.split('.');
     const srcRoots = ['main', 'androidTest', 'test'];
     for (const root of srcRoots) {
-        const oldPath = node_path_1.default.join(appDir, 'src', root, 'java', ...oldParts);
-        const newPath = node_path_1.default.join(appDir, 'src', root, 'java', ...newParts);
-        if (!node_fs_1.default.existsSync(oldPath)) {
-            continue;
-        }
-        if (oldPath === newPath) {
+        const javaRoot = node_path_1.default.join(appDir, 'src', root, 'java');
+        const oldPath = node_path_1.default.join(javaRoot, ...oldParts);
+        const newPath = node_path_1.default.join(javaRoot, ...newParts);
+        if (!node_fs_1.default.existsSync(oldPath) || oldPath === newPath) {
             continue;
         }
         node_fs_1.default.mkdirSync(node_path_1.default.dirname(newPath), { recursive: true });
         node_fs_1.default.renameSync(oldPath, newPath);
+        removeEmptyParentDirs(node_path_1.default.dirname(oldPath), javaRoot);
     }
 }
 function applyAndroidNamespace(projectDir, namespace) {
@@ -75,8 +98,10 @@ function applyAndroidNamespace(projectDir, namespace) {
     }
     const replacements = {
         [DEFAULT_ANDROID_NAMESPACE]: namespace,
-        [DEFAULT_ANDROID_TEST_PACKAGE]: namespace,
     };
+    // `replaceInTree` walks the entire `app` source set (main, test, androidTest,
+    // gradle/manifest files), so unit-test sources that import or declare the
+    // default package get rewritten alongside production code.
     replaceInTree(appDir, replacements);
     moveAndroidPackageDirs(appDir, DEFAULT_ANDROID_NAMESPACE, namespace);
 }
@@ -85,6 +110,9 @@ function applyIosBundleIdentifiers(projectDir, namespace) {
     if (!node_fs_1.default.existsSync(pbxproj)) {
         return;
     }
+    // Order matters: longer / more specific test bundle ids must be replaced
+    // before the shorter main bundle id (which is their prefix). `replaceInTree`
+    // sorts replacements by key length descending, so we just declare them all here.
     const replacements = {
         [DEFAULT_IOS_BUNDLE_ID]: namespace,
         [DEFAULT_IOS_TEST_BUNDLE_ID]: `${namespace}.tests`,

package/dist/create-app.js

@@ -215,6 +215,7 @@ async function createSparklingApp(options) {
                 ? packageName.split("/").pop()
                 : packageName,
             appNameCamel: toPascalCase(packageName),
+            packageNamespace,
             version: version ?? "0.0.0",
             enableESLint: enableESLintPrettier.toString(),
             enablePrettier: enableESLintPrettier.toString(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sparkling-app",
-  "version": "2.1.0-rc.24",
+  "version": "2.1.0-rc.26",
   "homepage": "https://tiktok.github.io/sparkling/",
   "repository": {
     "type": "git",