@embroider/core 3.4.10-unstable.bdf4aae → 3.4.10-unstable.c8b5bd4

package/src/virtual-vendor-styles.js

@@ -27,17 +27,23 @@ function getVendorStyles(owner, resolver) {
             resolver.packageCache.get(addon.root),
             addon.canResolveFromFile,
         ])),
-        isApp: true,
+        isApp: engineConfig.root === resolver.options.engines[0].root,
         modulePrefix: resolver.options.modulePrefix,
         appRelativePath: 'NOT_USED_DELETE_ME',
     };
     return generateVendorStyles(engine);
 }
 function generateVendorStyles(engine) {
-    let result = impliedAddonVendorStyles(engine).map((sourcePath) => {
-        let source = (0, fs_1.readFileSync)(sourcePath);
-        return `${source}`;
-    });
+    let result = impliedAddonVendorStyles(engine).map(sourcePath => (0, fs_1.readFileSync)(sourcePath, 'utf-8'));
+    // add the engines own styles but only if it is not the top-level app, that is provided by @embroider/synthesized-styles
+    if (!engine.isApp) {
+        let engineStyles = [];
+        engineStyles = getAddonImplicitStyles(engine.package).map(sourcePath => (0, fs_1.readFileSync)(sourcePath, 'utf-8'));
+        // add engine's own implicit styles after all vendor styles
+        if (engineStyles.length) {
+            result = [...result, ...engineStyles];
+        }
+    }
     return result.join('');
 }
 function impliedAddonVendorStyles(engine) {
@@ -52,21 +58,26 @@ function impliedAddonVendorStyles(engine) {
                 return 1000;
         }
     })) {
-        let implicitStyles = addon.meta['implicit-styles'];
-        if (implicitStyles) {
-            let styles = [];
-            let options = { basedir: addon.root };
-            for (let mod of implicitStyles) {
-                // exclude engines because they will handle their own css importation
-                if (!addon.isLazyEngine()) {
-                    styles.push(resolve_1.default.sync(mod, options));
-                }
-            }
-            if (styles.length) {
-                result = [...styles, ...result];
-            }
+        // exclude lazy engines because they will handle their own css importation
+        if (addon.isLazyEngine()) {
+            continue;
+        }
+        let styles = getAddonImplicitStyles(addon);
+        if (styles.length) {
+            result = [...styles, ...result];
         }
     }
     return result;
 }
+function getAddonImplicitStyles(pkg) {
+    let implicitStyles = pkg.meta['implicit-styles'];
+    let styles = [];
+    if (implicitStyles) {
+        let options = { basedir: pkg.root };
+        for (let mod of implicitStyles) {
+            styles.push(resolve_1.default.sync(mod, options));
+        }
+    }
+    return styles;
+}
 //# sourceMappingURL=virtual-vendor-styles.js.map

package/src/virtual-vendor-styles.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-vendor-styles.js","sourceRoot":"","sources":["virtual-vendor-styles.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Package } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { readFileSync } from 'fs';\nimport { sortBy } from 'lodash';\nimport resolve from 'resolve';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\nimport type { Engine } from './app-files';\n\nexport function decodeVirtualVendorStyles(filename: string): boolean {\n  return filename.endsWith('-embroider-vendor-styles.css');\n}\n\nexport function renderVendorStyles(filename: string, resolver: Resolver): VirtualContentResult {\n  const owner = resolver.packageCache.ownerOfFile(filename);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${filename}`);\n  }\n  return { src: getVendorStyles(owner, resolver), watches: [] };\n}\n\nfunction getVendorStyles(owner: Package, resolver: Resolver): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let engine: Engine = {\n    package: owner,\n    addons: new Map(\n      engineConfig.activeAddons.map(addon => [\n        resolver.packageCache.get(addon.root) as V2AddonPackage,\n        addon.canResolveFromFile,\n      ])\n    ),\n    isApp: true,\n    modulePrefix: resolver.options.modulePrefix,\n    appRelativePath: 'NOT_USED_DELETE_ME',\n  };\n\n  return generateVendorStyles(engine);\n}\n\nfunction generateVendorStyles(engine: Engine): string {\n  let result: string[] = impliedAddonVendorStyles(engine).map((sourcePath: string): string => {\n    let source = readFileSync(sourcePath);\n    return `${source}`;\n  });\n\n  return result.join('') as string;\n}\n\nfunction impliedAddonVendorStyles(engine: Engine): string[] {\n  let result: Array<string> = [];\n  for (let addon of sortBy(Array.from(engine.addons.keys()), pkg => {\n    switch (pkg.name) {\n      case 'loader.js':\n        return 0;\n      case 'ember-source':\n        return 10;\n      default:\n        return 1000;\n    }\n  })) {\n    let implicitStyles = addon.meta['implicit-styles'];\n    if (implicitStyles) {\n      let styles = [];\n      let options = { basedir: addon.root };\n      for (let mod of implicitStyles) {\n        // exclude engines because they will handle their own css importation\n        if (!addon.isLazyEngine()) {\n          styles.push(resolve.sync(mod, options));\n        }\n      }\n      if (styles.length) {\n        result = [...styles, ...result];\n      }\n    }\n  }\n  return result;\n}\n"]}
+{"version":3,"file":"virtual-vendor-styles.js","sourceRoot":"","sources":["virtual-vendor-styles.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Package } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { readFileSync } from 'fs';\nimport { sortBy } from 'lodash';\nimport resolve from 'resolve';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\nimport type { Engine } from './app-files';\n\nexport function decodeVirtualVendorStyles(filename: string): boolean {\n  return filename.endsWith('-embroider-vendor-styles.css');\n}\n\nexport function renderVendorStyles(filename: string, resolver: Resolver): VirtualContentResult {\n  const owner = resolver.packageCache.ownerOfFile(filename);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${filename}`);\n  }\n  return { src: getVendorStyles(owner, resolver), watches: [] };\n}\n\nfunction getVendorStyles(owner: Package, resolver: Resolver): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let engine: Engine = {\n    package: owner,\n    addons: new Map(\n      engineConfig.activeAddons.map(addon => [\n        resolver.packageCache.get(addon.root) as V2AddonPackage,\n        addon.canResolveFromFile,\n      ])\n    ),\n    isApp: engineConfig.root === resolver.options.engines[0].root,\n    modulePrefix: resolver.options.modulePrefix,\n    appRelativePath: 'NOT_USED_DELETE_ME',\n  };\n\n  return generateVendorStyles(engine);\n}\n\nfunction generateVendorStyles(engine: Engine): string {\n  let result: string[] = impliedAddonVendorStyles(engine).map(sourcePath => readFileSync(sourcePath, 'utf-8'));\n\n  // add the engines own styles but only if it is not the top-level app, that is provided by @embroider/synthesized-styles\n  if (!engine.isApp) {\n    let engineStyles = [];\n\n    engineStyles = getAddonImplicitStyles(engine.package as V2AddonPackage).map(sourcePath =>\n      readFileSync(sourcePath, 'utf-8')\n    );\n\n    // add engine's own implicit styles after all vendor styles\n    if (engineStyles.length) {\n      result = [...result, ...engineStyles];\n    }\n  }\n\n  return result.join('') as string;\n}\n\nfunction impliedAddonVendorStyles(engine: Engine): string[] {\n  let result: Array<string> = [];\n  for (let addon of sortBy(Array.from(engine.addons.keys()), pkg => {\n    switch (pkg.name) {\n      case 'loader.js':\n        return 0;\n      case 'ember-source':\n        return 10;\n      default:\n        return 1000;\n    }\n  })) {\n    // exclude lazy engines because they will handle their own css importation\n    if (addon.isLazyEngine()) {\n      continue;\n    }\n\n    let styles = getAddonImplicitStyles(addon);\n\n    if (styles.length) {\n      result = [...styles, ...result];\n    }\n  }\n  return result;\n}\n\nfunction getAddonImplicitStyles(pkg: V2AddonPackage): string[] {\n  let implicitStyles = pkg.meta['implicit-styles'];\n  let styles = [];\n  if (implicitStyles) {\n    let options = { basedir: pkg.root };\n    for (let mod of implicitStyles) {\n      styles.push(resolve.sync(mod, options));\n    }\n  }\n  return styles;\n}\n"]}