@applicaster/zapplicaster-cli 16.0.0-alpha.5222020837 → 16.0.0-alpha.5803191443

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapplicaster-cli",
-  "version": "16.0.0-alpha.5222020837",
+  "version": "16.0.0-alpha.5803191443",
   "description": "CLI Tool for the zapp app and Quick Brick project",
   "main": "index.js",
   "publishConfig": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/zapp-react-dom-cli-template": "16.0.0-alpha.5222020837",
-    "@applicaster/zapp-react-native-android-tv-cli-template": "16.0.0-alpha.5222020837",
-    "@applicaster/zapp-react-native-cli-template": "16.0.0-alpha.5222020837",
-    "@applicaster/zapp-react-native-tvos-cli-template": "16.0.0-alpha.5222020837",
+    "@applicaster/zapp-react-dom-cli-template": "16.0.0-alpha.5803191443",
+    "@applicaster/zapp-react-native-android-tv-cli-template": "16.0.0-alpha.5803191443",
+    "@applicaster/zapp-react-native-cli-template": "16.0.0-alpha.5803191443",
+    "@applicaster/zapp-react-native-tvos-cli-template": "16.0.0-alpha.5803191443",
     "axios": "^0.28.0",
     "camelize": "^1.0.0",
     "chalk": "^2.3.2",

package/src/commands/prepareWorkspace/appBootstrapper.js

@@ -1,7 +1,8 @@
 const R = require("ramda");
 const fs = require("fs");
 const semver = require("semver");
-const { resolve } = require("path");
+const { resolve, join } = require("path");
+const { existsSync } = require("fs");
 const packageJSON = require("../../../package.json");
 
 const {
@@ -30,6 +31,36 @@ const {
 
 const { buildMobileApp } = require("./buildMobile");
 
+async function patchPackages() {
+  if (existsSync(join(process.cwd(), "quick_brick", "patch_rn.js"))) {
+    exec(`node ${process.cwd()}/quick_brick/patch_rn.js`);
+  } else if (
+    existsSync(join(process.cwd(), "development-app", "patch_rn.js"))
+  ) {
+    exec(`node ${process.cwd()}/development-app/patch_rn.js`);
+  } else if (
+    existsSync(
+      join(
+        process.cwd(),
+        "packages",
+        "zapp-react-dom-development-app",
+        "patch_rn.js"
+      )
+    )
+  ) {
+    const pathToFile = join(
+      process.cwd(),
+      "packages",
+      "zapp-react-dom-development-app",
+      "patch_rn.js"
+    );
+
+    exec(`node ${pathToFile}`);
+  } else {
+    logger.log("Cannot patch packages, can't find the patch_rn.js file");
+  }
+}
+
 /**
  * fallback to en for missing dayjslocalization
  * converts the locale code to a dayjs compatible locale code
@@ -101,12 +132,7 @@ async function appBootstrapper(configuration) {
 
   const { templatePath, filesToCopy } = template.files;
 
-  await copyFiles(
-    templatePath,
-    filesToCopy,
-    quickBrickProjectPath,
-    configuration
-  );
+  copyFiles(templatePath, filesToCopy, quickBrickProjectPath, configuration);
 
   logger.log("injecting dependencies...");
   const { dependencies, scripts } = template;
@@ -190,6 +216,8 @@ async function appBootstrapper(configuration) {
   const quickBrickVersion = packageJSON.version;
   checkAllPluginsSatisfiesQuickBrickVersion({ quickBrickVersion, plugins });
 
+  await patchPackages();
+
   if (buildMobile) {
     await buildMobileApp(configuration);
   }

package/src/file/__tests__/__snapshots__/file.test.js.snap

@@ -5,27 +5,10 @@ exports[`copyFiles when destination path has no package.json doesn't skips the c
   [
     "some/source/path/foo.json",
     "some/destination/Path/foo.json",
-    [Function],
   ],
   [
     "some/source/path/package.json",
     "some/destination/Path/package.json",
-    [Function],
-  ],
-]
-`;
-
-exports[`copyFiles when there is no package.json to copy copies the dir 1`] = `
-[
-  [
-    "some/source/path/files/file1.txt",
-    "some/destination/Path/files/file1.txt",
-    [Function],
-  ],
-  [
-    "some/source/path/files/file2.txt",
-    "some/destination/Path/files/file2.txt",
-    [Function],
   ],
 ]
 `;
@@ -35,12 +18,10 @@ exports[`copyFiles when there is no package.json to copy copies the files 1`] =
   [
     "some/source/path/foo.json",
     "some/destination/Path/foo.json",
-    [Function],
   ],
   [
     "some/source/path/bar.json",
     "some/destination/Path/bar.json",
-    [Function],
   ],
 ]
 `;

package/src/file/__tests__/file.test.js

@@ -38,27 +38,14 @@ describe("copyFiles", () => {
     fs.writeFile("foo.json", { foo: "bar" }, jest.fn());
     fs.writeFile("bar.json", { bar: "baz" }, jest.fn());
     fs.writeFile("qux.json", { qux: 42 }, jest.fn());
-    fs.copyFile.mockClear();
-    fs.readdir.mockClear();
+    fs.copyFileSync.mockClear();
   });
 
   describe("when there is no package.json to copy", () => {
-    it("copies the files", async () => {
-      await copyFiles(sourcePath, ["foo.json", "bar.json"], destinationPath);
-      expect(fs.copyFile).toHaveBeenCalledTimes(2);
-      expect(fs.copyFile.mock.calls).toMatchSnapshot();
-    });
-
-    it("copies the dir", async () => {
-      // Mock fs.readdir to return some files when the directory is read
-      fs.readdir.mockImplementationOnce((path, callback) => {
-        callback(null, ["file1.txt", "file2.txt"]);
-      });
-
-      await copyFiles(sourcePath, ["files/"], destinationPath);
-
-      expect(fs.copyFile).toHaveBeenCalledTimes(2);
-      expect(fs.copyFile.mock.calls).toMatchSnapshot();
+    it("copies the files", () => {
+      copyFiles(sourcePath, ["foo.json", "bar.json"], destinationPath);
+      expect(fs.copyFileSync).toHaveBeenCalledTimes(2);
+      expect(fs.copyFileSync.mock.calls).toMatchSnapshot();
     });
   });
 
@@ -73,40 +60,29 @@ describe("copyFiles", () => {
       fs.__resetFiles();
     });
 
-    it("overrides it", async () => {
+    it("overrides it", () => {
       const sourcePath = "some/source/path";
       const destinationPath = "some/destination/Path";
 
-      await copyFiles(
-        sourcePath,
-        ["foo.json", "package.json"],
-        destinationPath
-      );
-
-      expect(fs.copyFile).toHaveBeenCalledTimes(2);
+      copyFiles(sourcePath, ["foo.json", "package.json"], destinationPath);
+      expect(fs.copyFileSync).toHaveBeenCalledTimes(2);
 
-      expect(fs.copyFile).toHaveBeenCalledWith(
+      expect(fs.copyFileSync).toHaveBeenCalledWith(
         `${sourcePath}/foo.json`,
-        `${destinationPath}/foo.json`,
-        expect.any(Function)
+        `${destinationPath}/foo.json`
       );
     });
   });
 
   describe("when destination path has no package.json", () => {
-    it("doesn't skips the copy", async () => {
+    it("doesn't skips the copy", () => {
       const sourcePath = "some/source/path";
       const destinationPath = "some/destination/Path";
 
-      await copyFiles(
-        sourcePath,
-        ["foo.json", "package.json"],
-        destinationPath
-      );
-
-      expect(fs.copyFile).toHaveBeenCalledTimes(2);
+      copyFiles(sourcePath, ["foo.json", "package.json"], destinationPath);
+      expect(fs.copyFileSync).toHaveBeenCalledTimes(2);
 
-      expect(fs.copyFile.mock.calls).toMatchSnapshot();
+      expect(fs.copyFileSync.mock.calls).toMatchSnapshot();
       expect(logger.warn).not.toHaveBeenCalled();
     });
   });
@@ -124,7 +100,7 @@ describe("copyFolder", () => {
   });
 
   beforeEach(() => {
-    fs.copyFile.mockClear();
+    fs.copyFileSync.mockClear();
   });
 
   it("copies the file in the folder", async () => {
@@ -134,7 +110,7 @@ describe("copyFolder", () => {
     await copyFolder(sourcePath, destinationPath);
 
     expect(fs.readdir).toHaveBeenCalledWith(sourcePath, expect.any(Function));
-    expect(fs.copyFile).toHaveBeenCalledTimes(2);
+    expect(fs.copyFileSync).toHaveBeenCalledTimes(2);
   });
 
   afterAll(() => {

package/src/file/index.js

@@ -5,16 +5,7 @@ const R = require("ramda");
  * @module @applicaster/zapplicaster-cli/util/file
  */
 
-const {
-  writeFile,
-  readFile,
-  readdir,
-  copyFile,
-  lstatSync,
-  mkdirSync,
-  existsSync,
-} = require("fs");
-
+const { writeFile, readFile, readdir, copyFile, copyFileSync } = require("fs");
 const { promisify } = require("util");
 const { join } = require("path");
 
@@ -75,43 +66,19 @@ function destinationFileNameMapper(destinationFileName) {
  * @param {String} destination path
  * @returns {Promise[]} array of promises with the status of the copied files
  */
-async function copyFiles(source, filesOrFilesGetter, destination, config) {
+function copyFiles(source, filesOrFilesGetter, destination, config) {
   const files =
     typeof filesOrFilesGetter === "function"
       ? filesOrFilesGetter(config)
       : filesOrFilesGetter;
 
-  return Promise.all(
-    R.map(async (file) => {
-      let sourcePath, destinationPath;
-
-      try {
-        if (Array.isArray(file)) {
-          sourcePath = join(source, file[0]);
-
-          destinationPath = destinationFileNameMapper(
-            join(destination, file[1])
-          );
-        } else {
-          sourcePath = join(source, file);
-          destinationPath = destinationFileNameMapper(join(destination, file));
-        }
-
-        if (lstatSync(sourcePath).isDirectory()) {
-          if (!existsSync(destinationPath)) {
-            mkdirSync(destinationPath, { recursive: true });
-          }
-
-          return await copyFolder(sourcePath, destinationPath);
-        }
-
-        return await copyFileAsync(sourcePath, destinationPath);
-      } catch (error) {
-        throw new Error(
-          `Failed to copy "${sourcePath}" to "${destinationPath}": ${error.message}`
-        );
-      }
-    }, files)
+  return R.map(
+    (file) =>
+      copyFileSync(
+        join(source, file),
+        destinationFileNameMapper(join(destination, file))
+      ),
+    files
   );
 }
 

package/test_helpers/fsMock.js

@@ -2,10 +2,6 @@ const fs = jest.genMockFromModule("fs");
 const _fs = jest.requireActual("fs");
 const R = require("ramda");
 
-function mkdirSync() {
-  return undefined;
-}
-
 function readdirSync(folder) {
   return _fs.readdirSync(folder);
 }
@@ -81,16 +77,10 @@ function __resetFiles() {
   fs.__writenFiles = [];
 }
 
-fs.lstatSync = (_path) => ({
-  isDirectory: () => _path.endsWith("/"),
-  isFile: () => _path.endsWith("/") === false,
-});
-
 fs.__writenFiles = [];
 fs.__resetFiles = __resetFiles;
 fs.__addMockedFiles = __addMockedFiles;
 fs.readdirSync = readdirSync;
-fs.mkdirSync = mkdirSync;
 fs.readdir = jest.fn(readdir);
 fs.writeFile = jest.fn(writeFile);
 fs.readFile = jest.fn(readFile);