🏗 Replace hack to prevent inlining of cssText with a @noinline anno…

…tation (ampproject#23373)
logly · Jul 24, 2019 · cb0a21c · cb0a21c
1 parent 0be932e
commit cb0a21c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/build-system/runner/dist/runner.jar b/build-system/runner/dist/runner.jar
diff --git a/build-system/runner/src/org/ampproject/AmpCodingConvention.java b/build-system/runner/src/org/ampproject/AmpCodingConvention.java
@@ -52,14 +52,6 @@ public AmpCodingConvention(CodingConvention convention) {
    * delivery), this could go away there.
    */
   @Override public boolean isExported(String name, boolean local) {
-    // Bad hack, but we should really not try to inline CSS as these strings can
-    // be very long.
-    // See https://github.com/ampproject/amphtml/issues/10118
-    // cssText is defined in build-system/tasks/css.js#writeCss
-    if (name.startsWith("cssText$$module$build$")) {
-      return true;
-    }
-
     if (local) {
       return false;
     }

diff --git a/build-system/tasks/css.js b/build-system/tasks/css.js
@@ -86,10 +86,13 @@ function compileCss(watch, opt_compileAll) {
    */
   function writeCss(css, jsFilename, cssFilename, append) {
     return toPromise(
-      // cssText is hardcoded in AmpCodingConvention.java
-      file(jsFilename, 'export const cssText = ' + JSON.stringify(css), {
-        src: true,
-      })
+      file(
+        jsFilename,
+        '/** @noinline */ export const cssText = ' + JSON.stringify(css),
+        {
+          src: true,
+        }
+      )
         .pipe(gulp.dest('build'))
         .on('end', function() {
           mkdirSync('build');