Merge ~twom/launchpad:sassy-css-no-op-css-compilation into launchpad:master

[Tom Wardill]

Move to node-sass for CSS concatenation

Use node-sass to combine and minify our CSS.
Also remove the combinecss file and entry point as we're not using it anymore.

f2baea6... by Tom Wardill on 2020-05-28

Add watch command for css building

f5b0bf6... by Tom Wardill on 2020-05-28

Remove more combo code

[Ioana Lasc (ilasc)]

I'm not an expert but the code looks good to me and it matches the goal in the Description of the MP.

review: Approve

a916108... by Tom Wardill on 2020-05-29

Rewrite urls to the correct build location

[Kristian Glass (doismellburning)]

Reads well to me - I've added a few minor quibbles/thoughts inline

review: Approve

[Thiago F. Pappacena (pappacena)]

Ran it locally, and it seems to work fine.

review: Approve

c0d06b8... by Tom Wardill on 2020-05-29

Comment and review tweaks

diff --git a/Makefile b/Makefile
index 1f01368..74f285e 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,6 @@ PIP_BIN = \
     $(PY) \
     bin/bingtestservice \
     bin/build-twisted-plugin-cache \
-    bin/combine-css \
     bin/harness \
     bin/iharness \
     bin/ipy \
@@ -183,7 +182,14 @@ css_combine: jsbuild_widget_css
 	${SHHH} bin/sprite-util create-image
 	${SHHH} bin/sprite-util create-css
 	ln -sfn ../../../../yarn/node_modules/yui $(ICING)/yui
-	${SHHH} bin/combine-css
+	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --output-style compressed --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING) $(WD)/$(ICING)/combo.scss
+
+css_watch: jsbuild_widget_css
+	${SHHH} bin/sprite-util create-image
+	${SHHH} bin/sprite-util create-css
+	ln -sfn ../../../../yarn/node_modules/yui $(ICING)/yui
+	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING) $(WD)/$(ICING)/ --watch --recursive
+
 
 jsbuild_widget_css: bin/jsbuild
 	${SHHH} bin/jsbuild \
diff --git a/lib/canonical/launchpad/icing/combo.scss b/lib/canonical/launchpad/icing/combo.scss
new file mode 100644
index 0000000..62afbfb
--- /dev/null
+++ b/lib/canonical/launchpad/icing/combo.scss
@@ -0,0 +1,28 @@
+@import 'css/base',
+'ubuntu-webfonts',
+'style',
+'yui/cssreset/cssreset',
+'yui/autocomplete-list/assets/skins/sam/autocomplete-list',
+'yui/calendar-base/assets/skins/sam/calendar-base',
+'yui/calendar/assets/skins/sam/calendar',
+'yui/calendarnavigator/assets/skins/sam/calendarnavigator',
+// Since the old cssgrids uses yui-, and the new uses yui3-, it is only
+// used for the calendar.
+'yui/cssgrids/cssgrids',
+// Use the old cssgrids instead of the new cssgrids.
+'cssgrids/grids',
+'build/launchpad-sam',
+'build/inline-sprites-1',
+'build/inline-sprites-2',
+'build/block-sprites-1',
+// Include our main stylesheets at the end so they
+// take precedence over the others.
+'css/base',
+'css/typography',
+'css/colours',
+'css/forms',
+'css/layout',
+'css/modifiers',
+// This shouldn't require the _index, but doesn't appear to be allowable
+// in this version of node-sass (v4.14.4)
+'css/components/_index';
diff --git a/lib/canonical/launchpad/icing/css/components/_index.scss b/lib/canonical/launchpad/icing/css/components/_index.scss
new file mode 100644
index 0000000..e1623c8
--- /dev/null
+++ b/lib/canonical/launchpad/icing/css/components/_index.scss
@@ -0,0 +1,8 @@
+@import 'batch_navigation',
+        'bug_picker',
+        'profiling_info',
+        'sidebar_portlets',
+        'bug_listing',
+        'portlets',
+        'sharing',
+        'yui_picker';
diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
index 6d9be5d..938d47d 100644
--- a/lib/lp/app/templates/base-layout-macros.pt
+++ b/lib/lp/app/templates/base-layout-macros.pt
@@ -190,7 +190,7 @@
   <tal:comment replace="nothing">
     This macro loads a single css file containing all our stylesheets.
     If you need to include a new css file here, add it to
-    lib/lp/scripts/utilities/js/combinecss.py instead.
+    lib/canonical/launchpad/icing/combo.scss instead.
 
     We load the CSS from the same host that served the HTML in order to optimize
     IE caching over SSL. This is inefficient when you cross subdomains (from
diff --git a/lib/lp/scripts/utilities/js/combinecss.py b/lib/lp/scripts/utilities/js/combinecss.py
deleted file mode 100755
index 885d11c..0000000
--- a/lib/lp/scripts/utilities/js/combinecss.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-import os
-
-import scandir
-
-from lp.scripts.utilities.js.combo import combine_files
-from lp.scripts.utilities.js.jsbuild import ComboFile
-from lp.services.config import config
-
-# It'd probably be nice to have this script find all the CSS files we might
-# need and combine them together, but if we do that we'd certainly end up
-# including lots of styles that we don't need/want, so keeping this hard-coded
-# list seems like the best option for now.
-names = [
-    'ubuntu-webfonts.css',
-    'style.css',
-    'yui/cssreset/cssreset.css',
-    'yui/autocomplete-list/assets/skins/sam/autocomplete-list.css',
-    'yui/calendar-base/assets/skins/sam/calendar-base.css',
-    'yui/calendar/assets/skins/sam/calendar.css',
-    'yui/calendarnavigator/assets/skins/sam/calendarnavigator.css',
-    # Since the old cssgrids uses yui-, and the new uses yui3-, it is only
-    # used for the calendar.
-    'yui/cssgrids/cssgrids.css',
-    # Use the old cssgrids instead of the new cssgrids.
-    'cssgrids/grids.css',
-    'build/ui/assets/skins/sam/lazr.css',
-    'build/ui/assets/skins/sam/banner.css',
-    'build/inlineedit/assets/skins/sam/editor.css',
-    'build/overlay/assets/skins/sam/pretty-overlay.css',
-    'build/formoverlay/assets/formoverlay-core.css',
-    'build/inlinehelp/assets/inlinehelp-core.css',
-    'build/indicator/assets/indicator-core.css',
-    'build/confirmationoverlay/assets/confirmationoverlay-core.css',
-    'build/picker/assets/skins/sam/picker.css',
-    'build/activator/assets/skins/sam/activator.css',
-    'build/choiceedit/assets/choiceedit-core.css',
-    'build/ordering/assets/ordering-core.css',
-    'build/gallery-accordion/assets/gallery-accordion-core.css',
-    'build/gallery-accordion/assets/skins/sam/gallery-accordion-skin.css',
-    'build/inline-sprites-1.css',
-    'build/inline-sprites-2.css',
-    'build/block-sprites-1.css',
-    # Include our main stylesheets at the end so they
-    # take precedence over the others.
-    'css/base.css',
-    'css/typography.css',
-    'css/colours.css',
-    'css/forms.css',
-    'css/layout.css',
-    'css/modifiers.css']
-
-
-def main():
-    icing = os.path.join(config.root, 'lib/canonical/launchpad/icing')
-    target = os.path.join(icing, 'combo.css')
-
-    # Get all the component css files so we don't have to edit this file
-    # every time a new component is added.
-    component_dir = 'css/components'
-    component_path = os.path.abspath(os.path.join(icing, component_dir))
-    for root, dirs, files in scandir.walk(component_path):
-        for file in files:
-            if file.endswith('.css'):
-                names.append('%s/%s' % (component_dir, file))
-
-    absolute_names = []
-    for name in names:
-        full_path_name = os.path.abspath(os.path.join(icing, name))
-        absolute_names.append(full_path_name)
-
-    combo = ComboFile(absolute_names, target)
-    if combo.needs_update():
-        result = b''
-        for content in combine_files(names, icing):
-            result += content
-
-        with open(target, 'wb') as f:
-            f.write(result)
diff --git a/lib/lp/scripts/utilities/js/combo.py b/lib/lp/scripts/utilities/js/combo.py
deleted file mode 100644
index 8b0969f..0000000
--- a/lib/lp/scripts/utilities/js/combo.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2011-2019 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-
-import os
-
-from six.moves.urllib.parse import (
-    parse_qsl,
-    urlsplit,
-    )
-
-from lp.scripts.utilities.js.jsbuild import (
-    CSSComboFile,
-    JSComboFile,
-    )
-
-
-def parse_url(url):
-    """Parse a combo URL.
-
-    Returns the list of arguments in the original order.
-    """
-    scheme, loc, path, query, frag = urlsplit(url)
-    return parse_qs(query)
-
-
-def parse_qs(query):
-    """Parse a query string.
-
-    Returns the list of arguments in the original order.
-    """
-    params = parse_qsl(query, keep_blank_values=True)
-    return tuple([param for param, value in params])
-
-
-def combine_files(fnames, root, resource_prefix=b"",
-                  minify_css=True, rewrite_urls=True):
-    """Combine many files into one.
-
-    Returns an iterator with the combined content of all the
-    files. The relative path to root will be included as a comment
-    between each file.
-
-    Although CSS files are conceptually closer to text than bytes, we always
-    yield bytes here since that's closer to what cssutils gives us, and it
-    saves having to know the encoding.
-    """
-
-    combo_by_kind = {
-        ".css": CSSComboFile([], os.path.join(root, "combo.css"),
-                             resource_prefix, minify_css, rewrite_urls),
-        ".js": JSComboFile([], os.path.join(root, "combo.js")),
-    }
-
-    for fname in fnames:
-        combo = combo_by_kind.get(os.path.splitext(fname)[-1])
-        if combo is None:
-            continue
-        full = os.path.abspath(os.path.join(root, fname))
-        yield combo.get_file_header(full)
-        if not full.startswith(root) or not os.path.exists(full):
-            yield combo.get_comment("[missing]")
-        else:
-            with open(full, "rb") as f:
-                content = f.read()
-            yield combo.filter_file_content(content, full)
diff --git a/lib/lp/scripts/utilities/js/jsbuild.py b/lib/lp/scripts/utilities/js/jsbuild.py
index 7af59d3..a1bdd2f 100644
--- a/lib/lp/scripts/utilities/js/jsbuild.py
+++ b/lib/lp/scripts/utilities/js/jsbuild.py
@@ -343,7 +343,10 @@ class Builder:
                 (self.name, skin_name))
 
             css_files = extra_css_files + self.skins[skin_name]
-            combined_css = CSSComboFile(css_files, skin_build_file)
+            # Embedded URL rewrite should start with build/ for correct
+            # filesystem location, as node-sass cannot add it.
+            combined_css = CSSComboFile(
+                css_files, skin_build_file, resource_prefix="build/")
             if combined_css.needs_update():
                 self.log('Updating %s...' % skin_build_file)
                 combined_css.update()
diff --git a/lib/lp/scripts/utilities/js/tests/__init__.py b/lib/lp/scripts/utilities/js/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/lib/lp/scripts/utilities/js/tests/__init__.py
+++ /dev/null
diff --git a/lib/lp/scripts/utilities/js/tests/test_combo.py b/lib/lp/scripts/utilities/js/tests/test_combo.py
deleted file mode 100644
index c745a6c..0000000
--- a/lib/lp/scripts/utilities/js/tests/test_combo.py
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2011-2012 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-
-import os
-import shutil
-import tempfile
-
-from lp.scripts.utilities.js.combo import (
-    combine_files,
-    parse_url,
-    )
-from lp.testing import TestCase
-
-
-class ComboTestBase(TestCase):
-
-    def setUp(self):
-        self.__cleanup_paths = []
-        self.addCleanup(self.__cleanup)
-        super(ComboTestBase, self).setUp()
-
-    def __cleanup(self):
-        for path in self.__cleanup_paths:
-            if os.path.isfile(path):
-                os.unlink(path)
-            elif os.path.isdir(path):
-                shutil.rmtree(path)
-
-    def makeFile(self, content=None, suffix="", prefix="tmp", basename=None,
-                 dirname=None, path=None):
-        """Create a temporary file and return the path to it.
-
-        @param content: Initial content for the file.
-        @param suffix: Suffix to be given to the file's basename.
-        @param prefix: Prefix to be given to the file's basename.
-        @param basename: Full basename for the file.
-        @param dirname: Put file inside this directory.
-
-        The file is removed after the test runs.
-        """
-        if path is not None:
-            self.__cleanup_paths.append(path)
-        elif basename is not None:
-            if dirname is None:
-                dirname = tempfile.mkdtemp()
-                self.__cleanup_paths.append(dirname)
-            path = os.path.join(dirname, basename)
-        else:
-            fd, path = tempfile.mkstemp(suffix, prefix, dirname)
-            self.__cleanup_paths.append(path)
-            os.close(fd)
-            if content is None:
-                os.unlink(path)
-        if content is not None:
-            file = open(path, "w")
-            file.write(content)
-            file.close()
-        return path
-
-    def makeDir(self, suffix="", prefix="tmp", dirname=None, path=None):
-        """Create a temporary directory and return the path to it.
-
-        @param suffix: Suffix to be given to the file's basename.
-        @param prefix: Prefix to be given to the file's basename.
-        @param dirname: Put directory inside this parent directory.
-
-        The directory is removed after the test runs.
-        """
-        if path is not None:
-            os.makedirs(path)
-        else:
-            path = tempfile.mkdtemp(suffix, prefix, dirname)
-        self.__cleanup_paths.append(path)
-        return path
-
-    def makeSampleFile(self, root, fname, content):
-        full = os.path.join(root, fname)
-        parent = os.path.dirname(full)
-        if not os.path.exists(parent):
-            os.makedirs(parent)
-        return self.makeFile(content=content, path=full)
-
-
-class TestCombo(ComboTestBase):
-
-    def test_parse_url_keeps_order(self):
-        """Parsing a combo loader URL returns an ordered list of filenames."""
-        self.assertEqual(
-            parse_url(("http://yui.yahooapis.com/combo?"
-                       "3.0.0/build/yui/yui-min.js&"
-                       "3.0.0/build/oop/oop-min.js&"
-                       "3.0.0/build/event-custom/event-custom-min.js&")),
-            ("3.0.0/build/yui/yui-min.js",
-             "3.0.0/build/oop/oop-min.js",
-             "3.0.0/build/event-custom/event-custom-min.js"))
-
-    def test_combine_files_includes_filename(self):
-        """
-        Combining files should include their relative filename at the top.
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("yui", "yui-min.js"),
-            "** yui-min **")
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("oop", "oop-min.js"),
-            "** oop-min **")
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("event-custom", "event-custom-min.js"),
-            "** event-custom-min **")
-
-        expected = "\n".join(("// yui/yui-min.js",
-                              "** yui-min **",
-                              "// oop/oop-min.js",
-                              "** oop-min **",
-                              "// event-custom/event-custom-min.js",
-                              "** event-custom-min **"))
-        self.assertEqual(
-            "".join(combine_files(["yui/yui-min.js",
-                                   "oop/oop-min.js",
-                                   "event-custom/event-custom-min.js"],
-                                  root=test_dir)).strip(),
-            expected)
-
-    def test_combine_css_minifies_and_makes_relative(self):
-        """
-        Combining CSS files minifies and makes URLs in CSS
-        declarations relative to the target path.
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("widget", "assets", "skins", "sam", "widget.css"),
-            """\
-            /* widget skin */
-            .yui-widget {
-               background: url("img/bg.png");
-            }
-            """)
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("editor", "assets", "skins", "sam", "editor.css"),
-            """\
-            /* editor skin */
-            .yui-editor {
-               background: url("img/bg.png");
-            }
-            """)
-
-        expected = "\n".join(
-            ("/* widget/assets/skins/sam/widget.css */",
-             ".yui-widget{background:url(widget/assets/skins/sam/img/bg.png)}",
-             "/* editor/assets/skins/sam/editor.css */",
-             ".yui-editor{background:url(editor/assets/skins/sam/img/bg.png)}",
-             ))
-        self.assertEqual(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir)).strip(),
-            expected)
-
-    def test_combine_css_handles_relative_links_from_top_level(self):
-        """
-        Combining CSS files handles making URLs relative even from the top
-        level (alongside combo.css).
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir, "ubuntu-webfonts.css",
-            """\
-            @font-face {
-              src: url('fonts/Ubuntu.woff');
-            }
-            """)
-
-        expected = "\n".join(
-            ("/* ubuntu-webfonts.css */",
-             "@font-face{src:url(fonts/Ubuntu.woff)}",
-             ))
-        self.assertEqual(
-            "".join(combine_files(["ubuntu-webfonts.css"],
-                                  root=test_dir)).strip(),
-            expected)
-
-    def test_combine_css_leaves_absolute_urls_untouched(self):
-        """
-        Combining CSS files does not touch absolute URLs in
-        declarations.
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("widget", "assets", "skins", "sam", "widget.css"),
-            """\
-            /* widget skin */
-            .yui-widget {
-               background: url("/static/img/bg.png");
-            }
-            """)
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("editor", "assets", "skins", "sam", "editor.css"),
-            """\
-            /* editor skin */
-            .yui-editor {
-               background: url("http://foo/static/img/bg.png");
-            }
-            """)
-
-        expected = "\n".join(
-            ("/* widget/assets/skins/sam/widget.css */",
-             ".yui-widget{background:url(/static/img/bg.png)}",
-             "/* editor/assets/skins/sam/editor.css */",
-             ".yui-editor{background:url(http://foo/static/img/bg.png)}",
-             ))
-        self.assertEqual(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir)).strip(),
-            expected)
-
-    def test_combine_css_leaves_data_uris_untouched(self):
-        """
-        Combining CSS files does not touch data uris in
-        declarations.
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("widget", "assets", "skins", "sam", "widget.css"),
-            """\
-            /* widget skin */
-            .yui-widget {
-            background: url("data:image/gif;base64,base64-data");
-            }
-            """)
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("editor", "assets", "skins", "sam", "editor.css"),
-            """\
-            /* editor skin */
-            .yui-editor {
-               background: url(data:image/gif;base64,base64-data);
-            }
-            """)
-
-        expected = "\n".join(
-            ('/* widget/assets/skins/sam/widget.css */',
-             '.yui-widget{background:url("data:image/gif;base64,base64-data")}',
-             '/* editor/assets/skins/sam/editor.css */',
-             '.yui-editor{background:url("data:image/gif;base64,base64-data")}',
-             ))
-        self.assertEqual(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir)).strip(),
-            expected)
-
-    def test_combine_css_disable_minify(self):
-        """
-        It is possible to disable CSS minification altogether, while
-        keeping the URL rewriting behaviour.
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("widget", "assets", "skins", "sam", "widget.css"),
-            "\n".join(
-                ('/* widget skin */',
-                 '.yui-widget {',
-                 '   background: url("img/bg.png");',
-                 '}'))
-            )
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("editor", "assets", "skins", "sam", "editor.css"),
-            "\n".join(('/* editor skin */',
-                       '.yui-editor {',
-                       '   background: url("img/bg.png");',
-                       '}'))
-            )
-
-        expected = "\n".join(
-            ("/* widget/assets/skins/sam/widget.css */",
-             "/* widget skin */",
-             ".yui-widget {",
-             "   background: url(widget/assets/skins/sam/img/bg.png);",
-             "}",
-             "/* editor/assets/skins/sam/editor.css */",
-             "/* editor skin */",
-             ".yui-editor {",
-             "   background: url(editor/assets/skins/sam/img/bg.png);",
-             "}",
-             ))
-        self.assertEqual(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir, minify_css=False)).strip(),
-            expected)
-
-    def test_combine_css_disable_rewrite_url(self):
-        """
-        It is possible to disable the rewriting of urls in the CSS
-        file.
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("widget", "assets", "skins", "sam", "widget.css"),
-            """\
-            /* widget skin */
-            .yui-widget {
-               background: url("img/bg.png");
-            }
-            """)
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("editor", "assets", "skins", "sam", "editor.css"),
-            """\
-            /* editor skin */
-            .yui-editor {
-               background: url("img/bg.png");
-            }
-            """)
-
-        expected = "\n".join(
-            ("/* widget/assets/skins/sam/widget.css */",
-             ".yui-widget{background:url(img/bg.png)}",
-             "/* editor/assets/skins/sam/editor.css */",
-             ".yui-editor{background:url(img/bg.png)}",
-             ))
-        self.assertEqual(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir, rewrite_urls=False)).strip(),
-            expected)
-
-    def test_combine_css_disable_rewrite_url_and_minify(self):
-        """
-        It is possible to disable both the rewriting of urls in the
-        CSS file and minification, in which case the files are
-        returned unchanged.
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("widget", "assets", "skins", "sam", "widget.css"),
-            "\n".join(
-                ('/* widget skin */',
-                 '.yui-widget {',
-                 '   background: url("img/bg.png");',
-                 '}'))
-            )
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("editor", "assets", "skins", "sam", "editor.css"),
-            "\n".join(('/* editor skin */',
-                       '.yui-editor {',
-                       '   background: url("img/bg.png");',
-                       '}'))
-            )
-
-        expected = "\n".join(
-            ('/* widget/assets/skins/sam/widget.css */',
-             '/* widget skin */',
-             '.yui-widget {',
-             '   background: url("img/bg.png");',
-             '}',
-             '/* editor/assets/skins/sam/editor.css */',
-             '/* editor skin */',
-             '.yui-editor {',
-             '   background: url("img/bg.png");',
-             '}',
-             ))
-        self.assertEqual(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir,
-                                  minify_css=False,
-                                  rewrite_urls=False)).strip(),
-            expected)
-
-    def test_combine_css_adds_custom_prefix(self):
-        """
-        Combining CSS files minifies and makes URLs in CSS
-        declarations relative to the target path. It's also possible
-        to specify an additional prefix for the rewritten URLs.
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("widget", "assets", "skins", "sam", "widget.css"),
-            """\
-            /* widget skin */
-            .yui-widget {
-               background: url("img/bg.png");
-            }
-            """)
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("editor", "assets", "skins", "sam", "editor.css"),
-            """\
-            /* editor skin */
-            .yui-editor {
-               background: url("img/bg.png");
-            }
-            """)
-
-        expected = "\n".join(
-            ("/* widget/assets/skins/sam/widget.css */",
-             ".yui-widget{background:url(" +
-             "/static/widget/assets/skins/sam/img/bg.png)}",
-             "/* editor/assets/skins/sam/editor.css */",
-             ".yui-editor{background:url(" +
-             "/static/editor/assets/skins/sam/img/bg.png)}",
-             ))
-        self.assertEqual(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir,
-                                  resource_prefix=b"/static/")).strip(),
-            expected)
-
-    def test_missing_file_is_ignored(self):
-        """
-        If a missing file is requested we should still combine the others.
-        """
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("yui", "yui-min.js"),
-            "** yui-min **")
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("event-custom", "event-custom-min.js"),
-            "** event-custom-min **")
-
-        expected = "\n".join(("// yui/yui-min.js",
-                              "** yui-min **",
-                              "// oop/oop-min.js",
-                              "// [missing]",
-                              "// event-custom/event-custom-min.js",
-                              "** event-custom-min **"))
-        self.assertEqual(
-            "".join(combine_files(["yui/yui-min.js",
-                                   "oop/oop-min.js",
-                                   "event-custom/event-custom-min.js"],
-                                  root=test_dir)).strip(),
-            expected)
-
-    def test_no_parent_hack(self):
-        """If someone tries to hack going up the root, they'll get a miss."""
-        test_dir = self.makeDir()
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("oop", "oop-min.js"),
-            "** oop-min **")
-
-        root = os.path.join(test_dir, "root", "lazr")
-        os.makedirs(root)
-
-        hack = "../../oop/oop-min.js"
-        self.assertTrue(os.path.exists(os.path.join(root, hack)))
-
-        expected = "\n".join(("// ../../oop/oop-min.js",
-                              "// [missing]"))
-        self.assertEqual(
-            "".join(combine_files([hack], root=root)).strip(),
-            expected)
-
-    def test_rewrite_url_normalizes_parent_references(self):
-        """URL references in CSS files get normalized for parent dirs."""
-        test_dir = self.makeDir()
-        files = [
-            self.makeSampleFile(
-                test_dir,
-                os.path.join("yui", "base", "base.css"),
-                ".foo{background-image:url(../../img.png)}"),
-            ]
-
-        expected = "\n".join(("/* yui/base/base.css */",
-                              ".foo{background-image:url(img.png)}"))
-        self.assertEqual(
-            "".join(combine_files(files, root=test_dir)).strip(),
-            expected)
-
-    def test_no_absolute_path_hack(self):
-        """If someone tries to fetch an absolute file, they'll get nothing."""
-        test_dir = self.makeDir()
-
-        hack = "/etc/passwd"
-        self.assertTrue(os.path.exists("/etc/passwd"))
-
-        expected = ""
-        self.assertEqual(
-            "".join(combine_files([hack], root=test_dir)).strip(),
-            expected)
diff --git a/setup.py b/setup.py
index acb19b7..9a126c9 100644
--- a/setup.py
+++ b/setup.py
@@ -306,7 +306,6 @@ setup(
                 'lp.services.sitesearch.bingtestservice:main',
             'build-twisted-plugin-cache = '
                 'lp.services.twistedsupport.plugincache:main',
-            'combine-css = lp.scripts.utilities.js.combinecss:main',
             'generate-key-pair = '
                 'lp.services.crypto.scripts.generatekeypair:main',
             'harness = lp.scripts.harness:python',