fix executor

Author: GoodDayForSurf

packages/devextreme-themebuilder/src/modules/post-compiler.ts

@@ -10,29 +10,29 @@ export function addBasePath(css: string | Buffer, basePath: string): string {
   return css.toString().replace(/(url\()("|')?(icons|fonts)/g, `$1$2${normalizedPath}$3`);
 }
 
-export function addInfoHeader(
-  css: string | Buffer,
-  version: string,
-  preserveCharsetBoundary = false,
-): string {
+function buildThemeBuilderInfoHeader(version: string): string {
   const generatedBy = '* Generated by the DevExpress ThemeBuilder';
   const versionString = `* Version: ${version}`;
   const link = '* http://js.devexpress.com/ThemeBuilder/';
 
-  const header = `/*${generatedBy}\n${versionString}\n${link}\n*/\n\n`;
+  return `/*${generatedBy}\n${versionString}\n${link}\n*/\n\n`;
+}
+
+export function addInfoHeader(
+  css: string | Buffer,
+  version: string,
+  appendInfoHeaderAfterBody = false,
+): string {
+  const header = buildThemeBuilderInfoHeader(version);
   const source = css.toString();
   const encoding = '@charset "UTF-8";';
 
   // clean-css may emit @charset immediately followed by :root / @import with no newline.
-  // Keep backward-compatible output by default (charset + header). In parity mode keep
-  // @charset as the very first statement and move the info header to the end, so:
-  // 1) charset decoding stays correct in browsers
-  // 2) normalized comparison keeps '\n' between @charset and next rule.
   const charsetPrefix = /^@charset\s+"utf-8";\s*/i;
   const match = source.match(charsetPrefix);
   if (match) {
     const rest = source.slice(match[0].length).replace(/^\s*/, '');
-    return preserveCharsetBoundary
+    return appendInfoHeaderAfterBody
       ? `${encoding}\n${rest}\n${header}`
       : `${encoding}\n${header}${rest}`;
   }

packages/nx-infra-plugin/src/executors/scss-build/executor.ts

@@ -35,7 +35,6 @@ interface BuildDependencies {
   cleanCssSanitizeOptions: unknown;
   cleanCssDevOptions: unknown;
   devextremeVersion: string;
-  browsersList: string[];
 }
 
 type MinifyProfile = 'all' | 'ci';
@@ -52,9 +51,13 @@ function resolveDataUri(filePath: string, svgEncoding?: string): string {
   return `data:image/${ext};base64,${data.toString('base64')}`;
 }
 
-function createLicenseHeader(fileName: string, version: string): string {
+/**
+ * Same shape as `packages/devextreme/build/gulp/license-header.txt` with
+ * `gulp-header` `commentType: '*'` (starLicense) — matches legacy Gulp output.
+ */
+function createStarLicenseHeader(fileName: string, version: string): string {
   return [
-    '/*!',
+    '/**',
     `* DevExtreme (${fileName.replace(/\\/g, '/')})`,
     `* Version: ${version}`,
     `* Build date: ${new Date().toDateString()}`,
@@ -66,16 +69,13 @@ function createLicenseHeader(fileName: string, version: string): string {
   ].join('\n');
 }
 
-function moveCharsetToTop(css: string): string {
-  const match = css.match(/@charset\s+[^;]+;\s*/);
-  if (!match) {
-    return css;
-  }
-
-  const charset = match[0].trim();
-  const withoutCharset = css.replace(match[0], '').replace(/^\s+/, '');
-
-  return `${charset}\n${withoutCharset}`;
+/**
+ * Mirrors `style-compiler.js`: starLicense prepend, then
+ * `.replace(/([\s\S]*)(@charset.*?;\s)/, '$2$1')` so `@charset` is the first bytes of output.
+ */
+function prependLicenseAndMoveCharsetFirst(minifiedCss: string, license: string): string {
+  const withLicense = `${license}${minifiedCss}`;
+  return withLicense.replace(/([\s\S]*)(@charset[^;]+;\s*)/, '$2$1');
 }
 
 function generateBundleName(theme: string, size: string, color: string, mode?: string): string {
@@ -136,8 +136,6 @@ function loadDependencies(projectRoot: string): BuildDependencies {
     ),
     devextremeVersion: workspaceRequire(path.resolve(projectRoot, '../devextreme/package.json'))
       .version,
-    browsersList: workspaceRequire(path.resolve(projectRoot, '../devextreme/package.json'))
-      .browserslist,
   };
 }
 
@@ -199,12 +197,8 @@ async function compileFile(
   });
 
   const postcssFactory = (deps.postcss as unknown as { default?: any }).default || deps.postcss;
-  const prefixed = await postcssFactory([
-    deps.autoprefixer({
-      overrideBrowserslist: deps.browsersList,
-    }),
-  ]).process(compiled.css, {
-    from: undefined,
+   const prefixed = await postcssFactory([deps.autoprefixer()]).process(compiled.css, {
+    from: sourceFile,
   });
 
   const minifierOptions =
@@ -213,8 +207,8 @@ async function compileFile(
   const minified = minifier.minify(prefixed.css).styles;
 
   const outFileName = path.basename(sourceFile, '.scss') + '.css';
-  const withHeader =
-    createLicenseHeader(outFileName, deps.devextremeVersion) + moveCharsetToTop(minified);
+  const license = createStarLicenseHeader(outFileName, deps.devextremeVersion);
+  const withHeader = prependLicenseAndMoveCharsetFirst(minified, license);
   await writeFileText(path.join(outputDir, outFileName), withHeader);
 }