@plumeria/compiler 0.8.4 → 0.8.6

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 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/bin/css.mjs

@@ -20,15 +20,11 @@ try {
     ? 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 a1 = process.argv.includes('--view') ? '--view' : '';
   const a2 = process.argv.includes('--paths') ? '--paths' : '';
   const argv = [a1, a2].join(' ');
 
-  execSync(`node ${rscutePath} compiler/dist/index.js ` + argv, {
+  execSync(`node --import jttx compiler/dist/index.js ` + argv, {
     stdio: 'inherit',
     cwd: plumeriaPath,
   });

package/dist/index.js

@@ -1,14 +1,29 @@
 import * as path from 'path';
-import * as fs from 'fs';
+import { unlinkSync, existsSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
 import fg from 'fast-glob';
 import postcss from 'postcss';
 import combineSelectors from 'postcss-combine-duplicated-selectors';
 import { transform } from 'lightningcss';
 import { parseSync } from '@swc/core';
-import { execute } from 'rscute';
 import { buildGlobal, buildCreate } from '@plumeria/core/build-helper';
-function isCSS(filePath) {
-    const code = fs.readFileSync(filePath, 'utf8');
+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');
+const cleanUp = async () => {
+    if (process.env.CI && existsSync(coreFilePath)) {
+        unlinkSync(coreFilePath);
+        console.log('File deleted successfully');
+    }
+    try {
+        await writeFile(coreFilePath, '', 'utf-8');
+    }
+    catch (err) {
+        console.error('An error occurred:', err);
+    }
+};
+async function isCSS(filePath) {
+    const code = await readFile(filePath, 'utf8');
     const ast = parseSync(code, {
         syntax: 'typescript',
         tsx: filePath.endsWith('.tsx'),
@@ -40,28 +55,17 @@ function isCSS(filePath) {
     visit(ast);
     return found;
 }
-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');
-const cleanUp = async () => {
-    try {
-        fs.writeFileSync(coreFilePath, '', 'utf-8');
-    }
-    catch (err) {
-        console.error('An error occurred:', err);
-    }
-};
 async function optimizeCSS() {
-    const code = fs.readFileSync(coreFilePath, 'utf8');
-    const mergedResult = postcss([
+    const cssCode = await readFile(coreFilePath, 'utf8');
+    const merged = postcss([
         combineSelectors({ removeDuplicatedProperties: true }),
-    ]).process(code, {
+    ]).process(cssCode, {
         from: coreFilePath,
         to: coreFilePath,
     });
-    const prefixResult = transform({
+    const light = transform({
         filename: coreFilePath,
-        code: Buffer.from(mergedResult.css),
+        code: Buffer.from(merged.css),
         minify: true,
         targets: {
             safari: 16,
@@ -70,11 +74,12 @@ async function optimizeCSS() {
             chrome: 110,
         },
     });
-    fs.writeFileSync(coreFilePath, prefixResult.code);
+    const optimizedCss = Buffer.from(light.code).toString('utf-8');
+    await writeFile(coreFilePath, optimizedCss, 'utf-8');
 }
 async function getAppRoot() {
     const threeLevelsUp = path.join(process.cwd(), '../../../../..');
-    return fs.existsSync(path.join(threeLevelsUp, 'node_modules/.pnpm'))
+    return existsSync(path.join(threeLevelsUp, 'node_modules/.pnpm'))
         ? path.join(process.cwd(), '../../../../../')
         : path.join(process.cwd(), '../../');
 }
@@ -84,9 +89,10 @@ async function getAppRoot() {
     const files = await fg([path.join(appRoot, '**/*.{js,jsx,ts,tsx}')], {
         ignore: ['**/node_modules/**', '**/dist/**', '**/.next/**'],
     });
-    const styleFiles = files.filter(isCSS);
+    const results = await Promise.all(files.map((file) => isCSS(file)));
+    const styleFiles = files.filter((_, i) => results[i]);
     for (let i = 0; i < styleFiles.length; i++) {
-        await execute(path.resolve(styleFiles[i]));
+        await import(path.resolve(styleFiles[i]));
         if (process.argv.includes('--paths'))
             console.log(styleFiles[i]);
     }
@@ -95,6 +101,7 @@ async function getAppRoot() {
     }
     for (let i = 0; i < styleFiles.length; i++) {
         await buildCreate(coreFilePath);
+        await new Promise((resolve) => setImmediate(resolve));
     }
     await optimizeCSS();
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "A faster compiler for Plumeria",
   "keywords": [
     "css",
@@ -18,18 +18,18 @@
   "bin": {
     "css": "./bin/css.mjs"
   },
-  "scripts": {
-    "build": "rimraf dist && tsc"
-  },
   "dependencies": {
     "@swc/core": "^1.11.22",
     "fast-glob": "^3.3.3",
+    "jttx": "^1.2.1",
     "lightningcss": "^1.29.3",
     "postcss": "^8.5.3",
-    "postcss-combine-duplicated-selectors": "^10.0.3",
-    "rscute": "^0.2.1"
+    "postcss-combine-duplicated-selectors": "^10.0.3"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "build": "rimraf dist && tsc"
   }
-}
+}