@plumeria/compiler 0.6.5 → 0.7.3

package/bin/css.mjs

@@ -1,12 +1,22 @@
 #!/usr/bin/env node
 
-import { execSync } from 'child_process';
+import fs from 'fs';
 import path from 'path';
+import { execSync } from 'child_process';
 import { styleText } from 'util';
-import fs from 'fs';
+
+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);
+}
 
 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');
@@ -18,11 +28,15 @@ try {
     });
 
   const plumeriaPath = isPnpm
-    ? findPnpmPlumeriaPath()
+    ? findPnpmPath('@plumeria+compiler@', 'node_modules/@plumeria')
     : path.join(process.cwd(), 'node_modules/@plumeria');
 
+  const rscutePath = isPnpm
+    ? findPnpmPath('rscute@', 'node_modules/rscute/dist/execute.js')
+    : path.join(process.cwd(), 'node_modules/rscute/dist/execute.js');
+
   const argv = process.argv.includes('--log') ? ' --log' : '';
-  execSync('rscute compiler/src/index.ts' + argv, {
+  execSync(`node ${rscutePath} compiler/dist/index.js` + argv, {
     stdio: 'inherit',
     cwd: plumeriaPath,
   });
@@ -33,16 +47,3 @@ try {
   console.error('Compilation failed:', error.message);
   process.exit(1);
 }
-
-function findPnpmPlumeriaPath() {
-  const pnpmPath = path.join(process.cwd(), 'node_modules/.pnpm');
-  const plumeriaDir = fs
-    .readdirSync(pnpmPath)
-    .find((dir) => dir.startsWith('@plumeria+compiler@'));
-
-  if (!plumeriaDir) {
-    throw new Error('Could not find @plumeria package in pnpm directory');
-  }
-
-  return path.join(pnpmPath, plumeriaDir, 'node_modules/@plumeria');
-}

package/dist/index.js

@@ -0,0 +1,59 @@
+import * as path from 'path';
+import * as fs from 'fs';
+import { execute } from 'rscute';
+import ts from 'typescript';
+import fg from 'fast-glob';
+import { buildCreate } from '@plumeria/core/dist/method/create-build-helper';
+import { buildGlobal } from '@plumeria/core/dist/method/global-build-helper';
+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) {
+    const content = fs.readFileSync(filePath, 'utf8');
+    const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
+    const checker = (node) => {
+        if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.name)) {
+            const expressionText = node.expression.getText(sourceFile);
+            const methodName = node.name.getText(sourceFile);
+            return (expressionText === 'css' && ['create', 'global'].includes(methodName));
+        }
+        return ts.forEachChild(node, checker) || false;
+    };
+    return checker(sourceFile);
+}
+async function getAppRoot() {
+    const threeLevelsUp = path.join(process.cwd(), '../../../../..');
+    return fs.existsSync(path.join(threeLevelsUp, 'node_modules/.pnpm'))
+        ? path.join(process.cwd(), '../../../../../')
+        : path.join(process.cwd(), '../../');
+}
+(async () => {
+    await cleanUp();
+    const appRoot = await getAppRoot();
+    const files = await fg([path.join(appRoot, '**/*.{js,jsx,ts,tsx}')], {
+        ignore: [
+            '**/main.{js,ts}/**',
+            '**/dist/**',
+            '**/.next/**',
+            '**/node_modules/**',
+        ],
+    });
+    const styleFiles = files.filter(isCSS);
+    for (let i = 0; i < styleFiles.length; i++) {
+        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();
+    }
+})();

package/package.json

@@ -1,33 +1,31 @@
 {
   "name": "@plumeria/compiler",
-  "version": "0.6.5",
-  "description": "Compiler for Plumeria that build and optimizes",
+  "version": "0.7.3",
+  "description": "A faster compiler for Plumeria",
   "keywords": [
-    "react",
     "css",
     "css-in-js",
     "plumeria",
-    "styling"
+    "rscute",
+    "compiler"
   ],
   "repository": "github:zss-in-js/plumeria",
   "license": "MIT",
   "files": [
-    "bin",
-    "src"
+    "bin/",
+    "dist/"
   ],
   "bin": {
     "css": "./bin/css.mjs"
   },
+  "scripts": {
+    "build": "rimraf dist && tsc"
+  },
   "dependencies": {
-    "rscute": "^0.0.7",
     "fast-glob": "^3.3.3",
-    "postcss": "^8.4.49",
-    "postcss-combine-duplicated-selectors": "^10.0.3"
+    "rscute": "^0.0.14"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "echo 'Build unnecessary'"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 zss-in-js contributer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/src/index.ts

@@ -1,90 +0,0 @@
-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 { 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(
-    filePath,
-    content,
-    ts.ScriptTarget.Latest,
-    true,
-  );
-
-  const checker = (node: ts.Node): boolean => {
-    if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.name)) {
-      const expressionText = node.expression.getText(sourceFile);
-      const methodName = node.name.getText(sourceFile);
-      return (
-        expressionText === 'css' && ['create', 'global'].includes(methodName)
-      );
-    }
-    return ts.forEachChild(node, checker) || false;
-  };
-
-  return checker(sourceFile);
-}
-
-async function getAppRoot(): Promise<string> {
-  const threeLevelsUp = path.join(process.cwd(), '../../../../..');
-  return fs.existsSync(path.join(threeLevelsUp, 'node_modules/.pnpm'))
-    ? path.join(process.cwd(), '../../../../../')
-    : path.join(process.cwd(), '../../');
-}
-
-async function optimizeCSS() {
-  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 }),
-  ]).process(cssContent, {
-    from: cssPath,
-    to: cssPath,
-  });
-  fs.writeFileSync(cssPath, result.css);
-}
-
-(async () => {
-  await cleanUp();
-  const appRoot = await getAppRoot();
-  const files = await fg([path.join(appRoot, '**/*.{js,jsx,ts,tsx}')], {
-    ignore: [
-      '**/main.{js,ts}/**',
-      '**/dist/**',
-      '**/.next/**',
-      '**/node_modules/**',
-    ],
-  });
-  const styleFiles = files.filter(isCSS);
-  for (let i = 0; i < styleFiles.length; i++) {
-    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();
-})();