@plumeria/compiler 0.16.2 → 0.17.1

package/bin/css.js

@@ -1,32 +1,28 @@
 #!/usr/bin/env node
 
-const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
 const { styleText } = require('util');
 
 try {
   const checkMark = styleText('greenBright', '✓');
-  const isPnpm = fs.existsSync(path.join(process.cwd(), 'node_modules/.pnpm'));
   const typecheck = process.argv.includes('--type-check');
 
-  if (typecheck)
+  if (typecheck) {
     execSync('tsc --noEmit --incremental false', {
       stdio: 'inherit',
       cwd: process.cwd(),
     });
-
-  const plumeriaPath = isPnpm
-    ? findPnpmPath('@plumeria+compiler@', 'node_modules/@plumeria')
-    : path.join(process.cwd(), 'node_modules/@plumeria');
+  }
 
   const a1 = process.argv.includes('--view') ? '--view' : '';
   const a2 = process.argv.includes('--paths') ? '--paths' : '';
   const argv = [a1, a2].join(' ');
 
-  execSync(`node -r rscute compiler/dist/index.js ` + argv, {
+  const indexPath = path.resolve(__dirname, '../dist/index.js');
+
+  execSync(`node -r rscute ${indexPath} ` + argv, {
     stdio: 'inherit',
-    cwd: plumeriaPath,
   });
 
   const compilation = typecheck ? 'Type-check completed' : '';
@@ -35,14 +31,3 @@ try {
   console.error('Compilation failed:', error.message);
   process.exit(1);
 }
-
-function findPnpmPath(arg1, arg2) {
-  const pnpmPath = path.join(process.cwd(), 'node_modules/.pnpm');
-  const pnpmDir = fs.readdirSync(pnpmPath).find((dir) => dir.startsWith(arg1));
-
-  if (!pnpmDir) {
-    throw new Error(`Could not find ${arg1} package in pnpm directory`);
-  }
-
-  return path.join(pnpmPath, pnpmDir, arg2);
-}

package/dist/extract.js

@@ -210,51 +210,29 @@ function parseCssPropsArguments(args) {
     }
     return results;
 }
-async function extractVueAndSvelteAndAstro(filePath) {
+async function extractVueAndSvelte(filePath) {
     const ext = path.extname(filePath);
-    if (!(ext === '.svelte' || ext === '.vue' || ext === '.astro'))
+    if (!(ext === '.svelte' || ext === '.vue'))
         return filePath;
     const code = fs.readFileSync(filePath, 'utf8');
-    let tsCode = '';
     const lines = code.split(/\r?\n/);
-    if (ext === '.astro') {
-        let inFrontmatter = false;
-        const contentLines = [];
-        for (const line of lines) {
-            const trimmed = line.trim();
-            if (!inFrontmatter && trimmed === '---') {
-                inFrontmatter = true;
-                continue;
-            }
-            if (inFrontmatter && trimmed === '---') {
-                inFrontmatter = false;
-                continue;
-            }
-            if (inFrontmatter) {
-                contentLines.push(line);
-            }
+    let inScript = false;
+    const contentLines = [];
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!inScript && /^<script\b/.test(trimmed)) {
+            inScript = true;
+            continue;
         }
-        tsCode = contentLines.join('\n');
-    }
-    else {
-        let inScript = false;
-        const contentLines = [];
-        for (const line of lines) {
-            const trimmed = line.trim();
-            if (!inScript && /^<script\b/.test(trimmed)) {
-                inScript = true;
-                continue;
-            }
-            if (inScript && /^<\/script>/.test(trimmed)) {
-                inScript = false;
-                continue;
-            }
-            if (inScript) {
-                contentLines.push(line);
-            }
+        if (inScript && /^<\/script>/.test(trimmed)) {
+            inScript = false;
+            continue;
+        }
+        if (inScript) {
+            contentLines.push(line);
         }
-        tsCode = contentLines.join('\n');
     }
+    const tsCode = contentLines.join('\n');
     const propsMatches = [...extractCssProps(tsCode), ...extractCssProps(code)];
     const calls = propsMatches
         .filter(Boolean)
@@ -337,5 +315,5 @@ process.on('unhandledRejection', async (reason, promise) => {
 module.exports = {
     extractTSFile,
     restoreAllOriginals,
-    extractVueAndSvelteAndAstro,
+    extractVueAndSvelte,
 };

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require('path');
+const fs = require('fs');
 const { unlinkSync, existsSync, readFileSync, statSync } = require('fs');
 const { readFile, writeFile } = require('fs/promises');
 const { glob } = require('@rust-gear/glob');
@@ -8,13 +9,54 @@ const postcss = require('postcss');
 const combineSelectors = require('postcss-combine-duplicated-selectors');
 const combineMediaQuery = require('postcss-combine-media-query');
 const { execute } = require('rscute/execute');
-const { transform } = require('lightningcss');
+const { transform: lightningCSSTransform } = require('lightningcss');
 const { parseSync } = require('@swc/core');
+const { findUpSync } = require('find-up');
 const { buildGlobal, buildProps } = require('@plumeria/core/processors');
-const { extractTSFile, restoreAllOriginals, extractVueAndSvelteAndAstro, } = require('./extract');
-const projectRoot = process.cwd().split('node_modules')[0];
-const directPath = path.join(projectRoot, 'node_modules/@plumeria/core');
-const coreFilePath = path.join(directPath, 'stylesheet.css');
+const { extractTSFile, restoreAllOriginals, extractVueAndSvelte, } = require('./extract');
+let projectRoot;
+const workspaceRootFile = findUpSync((directory) => {
+    const pnpmWsPath = path.join(directory, 'pnpm-workspace.yaml');
+    if (fs.existsSync(pnpmWsPath)) {
+        return pnpmWsPath;
+    }
+    const pkgJsonPath = path.join(directory, 'package.json');
+    if (fs.existsSync(pkgJsonPath)) {
+        try {
+            const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8'));
+            if (pkgJson.workspaces) {
+                return pkgJsonPath;
+            }
+        }
+        catch (err) {
+            console.error(err);
+        }
+    }
+    return undefined;
+});
+if (workspaceRootFile) {
+    projectRoot = path.dirname(workspaceRootFile);
+}
+else {
+    const singleProjectRootFile = findUpSync('package.json');
+    if (singleProjectRootFile) {
+        projectRoot = path.dirname(singleProjectRootFile);
+    }
+    else {
+        projectRoot = process.cwd();
+    }
+}
+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');
+}
+else {
+    const coreInstalledPath = path.dirname(require.resolve('@plumeria/core/package.json'));
+    coreFilePath = path.join(coreInstalledPath, 'stylesheet.css');
+}
 const cleanUp = async () => {
     if (process.env.CI && existsSync(coreFilePath)) {
         unlinkSync(coreFilePath);
@@ -79,7 +121,7 @@ async function optimizeCSS() {
         from: coreFilePath,
         to: coreFilePath,
     });
-    const light = transform({
+    const light = lightningCSSTransform({
         filename: coreFilePath,
         code: Buffer.from(merged.css),
         minify: process.env.NODE_ENV === 'production',
@@ -95,21 +137,18 @@ async function optimizeCSS() {
 }
 (async () => {
     await cleanUp();
-    const files = await glob(path.join(projectRoot, '**/*.{js,jsx,ts,tsx,vue,svelte,astro}'), {
-        exclude: [
-            '**/node_modules/**',
-            '**/dist/**',
-            '**/build/**',
-            '**/.next/**',
-        ],
-        cwd: projectRoot,
+    const scanRoot = process.cwd();
+    const files = await glob('**/*.{js,jsx,ts,tsx,vue,svelte}', {
+        cwd: scanRoot,
+        absolute: true,
+        exclude: ['**/node_modules/**', '**/dist/**', '**/build/**', '**/.next/**'],
     });
     const projectName = path.basename(projectRoot);
     const filesSupportExtensions = [];
     for (const file of files) {
         const ext = path.extname(file);
         if (ext === '.vue' || ext === '.svelte') {
-            const tsFile = await extractVueAndSvelteAndAstro(file);
+            const tsFile = await extractVueAndSvelte(file);
             filesSupportExtensions.push(tsFile);
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "0.16.2",
+  "version": "0.17.1",
   "description": "Plumeria Rust-based compiler",
   "repository": {
     "type": "git",
@@ -16,13 +16,14 @@
     "css": "./bin/css.js"
   },
   "dependencies": {
-    "@swc/core": "^1.11.24",
     "@rust-gear/glob": "^0.2.2",
-    "rscute": "^0.2.7",
+    "@swc/core": "^1.11.24",
     "lightningcss": "^1.29.3",
     "postcss": "^8.5.3",
     "postcss-combine-duplicated-selectors": "^10.0.3",
-    "postcss-combine-media-query": "^2.0.0"
+    "postcss-combine-media-query": "^2.0.0",
+    "rscute": "^0.2.7",
+    "find-up": "^7.0.0"
   },
   "publishConfig": {
     "access": "public"