@plumeria/compiler 0.18.0 → 0.18.2

package/dist/index.js

@@ -46,15 +46,16 @@ else {
     }
 }
 let coreFilePath;
-if (workspaceRootFile) {
-    const coreSourcePackageJsonPath = path.join(projectRoot, 'packages', 'core', 'package.json');
-    const coreSourcePackageJson = JSON.parse(fs.readFileSync(coreSourcePackageJsonPath, 'utf-8'));
-    const coreVersion = coreSourcePackageJson.version;
-    coreFilePath = path.join(projectRoot, 'node_modules', '.pnpm', `@plumeria+core@${coreVersion}`, 'node_modules', '@plumeria', 'core', 'stylesheet.css');
+try {
+    const corePackageJsonPath = require.resolve('@plumeria/core/package.json', {
+        paths: [projectRoot, process.cwd()],
+    });
+    coreFilePath = path.join(path.dirname(corePackageJsonPath), 'stylesheet.css');
 }
-else {
-    const coreInstalledPath = path.dirname(require.resolve('@plumeria/core/package.json'));
-    coreFilePath = path.join(coreInstalledPath, 'stylesheet.css');
+catch (error) {
+    console.error('Could not find "@plumeria/core/stylesheet.css". Please make sure it is installed.' +
+        error);
+    process.exit(1);
 }
 const cleanUp = async () => {
     if (process.env.CI && existsSync(coreFilePath)) {
@@ -68,7 +69,7 @@ const cleanUp = async () => {
         console.error('An error occurred:', err);
     }
 };
-function isCSS(filePath, target) {
+function isCSS(filePath) {
     if (statSync(filePath).isDirectory()) {
         return false;
     }
@@ -83,13 +84,7 @@ function isCSS(filePath, target) {
     function visit(node) {
         if (node.type === 'MemberExpression' && node.property?.value) {
             if (node.object?.type === 'Identifier' && node.object.value === 'css') {
-                if (target === 'props') {
-                    if (node.property.value === 'props') {
-                        found = true;
-                    }
-                }
-                else if (node.property.value === 'props' ||
-                    node.property.value === 'global') {
+                if (node.property.value === 'props') {
                     found = true;
                 }
             }
@@ -153,11 +148,8 @@ async function optimizeCSS() {
         }
     }
     const styleFiles = filesSupportExtensions
-        .filter((file) => isCSS(file, ''))
+        .filter((file) => isCSS(file))
         .sort();
-    const propsFiles = styleFiles.filter((file) => {
-        return isCSS(file, 'props');
-    });
     for (let i = 0; i < styleFiles.length; i++) {
         await execute(path.resolve(styleFiles[i]));
         if (process.argv.includes('--paths'))
@@ -166,7 +158,7 @@ async function optimizeCSS() {
     for (let i = 0; i < styleFiles.length; i++) {
         await buildGlobal(coreFilePath);
     }
-    for (let i = 0; i < propsFiles.length; i++) {
+    for (let i = 0; i < styleFiles.length; i++) {
         await buildProps(coreFilePath);
     }
     await optimizeCSS();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "description": "Plumeria Rust-based compiler",
   "repository": {
     "type": "git",