Commit ad494c24 authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1796143 - Allow esmify to fix sjs files. r=arai 

Differential Revision: https://phabricator.services.mozilla.com/D159708
parent 593dc51b

tools/esmify/mach_commands.py

+14 −30
Original line number Diff line number Diff line
@@ -198,21 +198,12 @@ class HgUtils(VCSUtils): 
    def find_all_jss(self, path):

        jss = []



        cmd = ["hg", "files", f'set:glob:"{path}/**/*.jsm"']

        for line in self.run(cmd):

            js = pathlib.Path(line)

            if is_excluded_from_imports(js):

                continue

            jss.append(js)



        cmd = ["hg", "files", f'set:glob:"{path}/**/*.js"']

        for line in self.run(cmd):

            js = pathlib.Path(line)

            if is_excluded_from_imports(js):

                continue

            jss.append(js)



        cmd = ["hg", "files", f'set:glob:"{path}/**/*.sys.mjs"']

        cmd = [

            "hg",

            "files",

            f'set:glob:"{path}/**/*.jsm" or glob:"{path}/**/*.js" or '

            + f'glob:"{path}/**/*.mjs" or glob:"{path}/**/*.sjs"',

        ]

        for line in self.run(cmd):

            js = pathlib.Path(line)

            if is_excluded_from_imports(js):
@@ -260,21 +251,14 @@ class GitUtils(VCSUtils): 
    def find_all_jss(self, path):

        jss = []



        cmd = ["git", "ls-files", f"{path}/*.jsm"]

        for line in self.run(cmd):

            js = pathlib.Path(line)

            if is_excluded_from_imports(js):

                continue

            jss.append(js)



        cmd = ["git", "ls-files", f"{path}/*.js"]

        for line in self.run(cmd):

            js = pathlib.Path(line)

            if is_excluded_from_imports(js):

                continue

            jss.append(js)



        cmd = ["git", "ls-files", f"{path}/*.mjs"]

        cmd = [

            "git",

            "ls-files",

            f"{path}/*.jsm",

            f"{path}/*.js",

            f"{path}/*.mjs",

            f"{path}/*.sjs",

        ]

        for line in self.run(cmd):

            js = pathlib.Path(line)

            if is_excluded_from_imports(js):