@plumeria/compiler 0.6.1 → 0.6.3

package/bin/css.mjs

@@ -5,28 +5,30 @@ import path from 'path';
 import { styleText } from 'util';
 import fs from 'fs';
 
-const checkMark = styleText('greenBright', '✓');
-
 try {
+  process.env.PATH = `${path.resolve(process.cwd(), 'node_modules', '.bin')}:${process.env.PATH}`;
+  const checkMark = styleText('greenBright', '✓');
   const isPnpm = fs.existsSync(path.join(process.cwd(), 'node_modules/.pnpm'));
-
   const typecheck = process.argv.includes('--type-check');
+
   if (typecheck)
-    execSync('npx tsc --noEmit --incremental false', {
+    execSync('tsc --noEmit --incremental false', {
       stdio: 'inherit',
       cwd: process.cwd(),
     });
 
-  const plumeriaPath = isPnpm ? findPnpmPlumeriaPath() : path.join(process.cwd(), 'node_modules/@plumeria');
+  const plumeriaPath = isPnpm
+    ? findPnpmPlumeriaPath()
+    : path.join(process.cwd(), 'node_modules/@plumeria');
 
   const argv = process.argv.includes('--log') ? ' --log' : '';
-  execSync('npx tsx compiler/src/index.ts' + argv, {
+  execSync('rscute compiler/src/index.ts' + argv, {
     stdio: 'inherit',
     cwd: plumeriaPath,
   });
 
-  const completed = typecheck ? 'Type-check completed' : '';
-  console.log(` ${checkMark} Compiled... ${completed}`);
+  const compilation = typecheck ? 'Type-check completed' : '';
+  console.log(` ${checkMark} Compiled... ${compilation}`);
 } catch (error) {
   console.error('Compilation failed:', error.message);
   process.exit(1);
@@ -34,7 +36,9 @@ try {
 
 function findPnpmPlumeriaPath() {
   const pnpmPath = path.join(process.cwd(), 'node_modules/.pnpm');
-  const plumeriaDir = fs.readdirSync(pnpmPath).find(dir => dir.startsWith('@plumeria+compiler@'));
+  const plumeriaDir = fs
+    .readdirSync(pnpmPath)
+    .find((dir) => dir.startsWith('@plumeria+compiler@'));
 
   if (!plumeriaDir) {
     throw new Error('Could not find @plumeria package in pnpm directory');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Compiler for Plumeria that build and optimizes",
   "keywords": [
     "react",
@@ -13,22 +13,21 @@
   "license": "MIT",
   "files": [
     "bin",
-    "src",
-    "tsconfig.json"
+    "src"
   ],
   "bin": {
     "css": "./bin/css.mjs"
   },
   "dependencies": {
     "fast-glob": "^3.3.3",
+    "rscute": "^0.0.1",
     "postcss": "^8.4.49",
-    "postcss-combine-duplicated-selectors": "^10.0.3",
-    "tsx": "^4.19.2"
+    "postcss-combine-duplicated-selectors": "^10.0.3"
   },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "echo 'No build necessary'"
+    "build": "echo 'Build unnecessary'"
   }
 }

package/src/index.ts

@@ -1,13 +1,26 @@
+import { fileURLToPath } from 'url';
 import * as path from 'path';
 import * as fs from 'fs';
+import { execute } from 'rscute';
 import ts from 'typescript';
 import fg from 'fast-glob';
-import { cleanUp } from './clean-up';
 import { buildCreate } from '@plumeria/core/dist/method/create-build-helper';
 import { buildGlobal } from '@plumeria/core/dist/method/global-build-helper';
 import postcss from 'postcss';
 import combineSelectors from 'postcss-combine-duplicated-selectors';
 
+export const cleanUp = async () => {
+  const projectRoot = process.cwd().split('node_modules')[0];
+  const directPath = path.join(projectRoot, 'node_modules/@plumeria/core');
+  const coreFilePath = path.join(directPath, 'stylesheet/core.css');
+
+  try {
+    fs.writeFileSync(coreFilePath, '', 'utf-8');
+  } catch (err) {
+    console.error('An error occurred:', err);
+  }
+};
+
 function isCSS(filePath: string): boolean {
   const content = fs.readFileSync(filePath, 'utf8');
   const sourceFile = ts.createSourceFile(
@@ -39,8 +52,9 @@ async function getAppRoot(): Promise<string> {
 }
 
 async function optimizeCSS() {
-  const corePath = path.dirname(require.resolve('@plumeria/core/package.json'));
-  const cssPath = path.join(corePath, 'dist/styles/global.css');
+  const corePackagePath = import.meta.resolve('@plumeria/core/package.json');
+  const corePath = path.dirname(fileURLToPath(new URL(corePackagePath)));
+  const cssPath = path.join(corePath, 'stylesheet/core.css');
   const cssContent = fs.readFileSync(cssPath, 'utf8');
   const result = postcss([
     combineSelectors({ removeDuplicatedProperties: true }),
@@ -63,16 +77,14 @@ async function optimizeCSS() {
     ],
   });
   const styleFiles = files.filter(isCSS);
-  const importPromises = styleFiles.map(
-    (styleFile) => import(path.resolve(styleFile)),
-  );
-  await Promise.all(importPromises);
-
   for (let i = 0; i < styleFiles.length; i++) {
-    await buildCreate();
+    await execute(path.resolve(styleFiles[i]));
   }
   for (let i = 0; i < styleFiles.length; i++) {
     await buildGlobal();
   }
+  for (let i = 0; i < styleFiles.length; i++) {
+    await buildCreate();
+  }
   await optimizeCSS();
 })();

package/src/clean-up.ts

@@ -1,17 +0,0 @@
-import { writeFileSync } from 'fs';
-import path from 'path';
-
-export const cleanUp = async () => {
-  const projectRoot = process.cwd().split('node_modules')[0];
-  const directPath = path.join(projectRoot, 'node_modules/@plumeria/core');
-
-  const createFilePath = directPath + '/dist/styles/create.css';
-  const globalFilePath = directPath + '/dist/styles/global.css';
-
-  try {
-    writeFileSync(createFilePath, '', 'utf-8');
-    writeFileSync(globalFilePath, '', 'utf-8');
-  } catch (err) {
-    console.error('An error occurred:', err);
-  }
-};

package/tsconfig.json

@@ -1,6 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "ESNext",
-    "moduleResolution": "Bundler"
-  }
-}