@plumeria/compiler 0.18.3 → 0.19.0

package/dist/extract.js

@@ -187,9 +187,9 @@ function extractCssKeyframes(code) {
     }
     return cssCreateMatches.join('\n');
 }
-function extractCssDefineConsts(code) {
+function extractCssViewTransition(code) {
     const cssCreateMatches = [];
-    const regex = /(?:(?:\s*const\s+[a-zA-Z0-9_$]+\s*=\s*css\.defineConsts\([\s\S]*?\);\s*))/g;
+    const regex = /(?:(?:\s*const\s+[a-zA-Z0-9_$]+\s*=\s*css\.viewTransition\([\s\S]*?\);\s*))/g;
     let match;
     while ((match = regex.exec(code))) {
         if (isInComment(code, match.index) ||
@@ -201,9 +201,9 @@ function extractCssDefineConsts(code) {
     }
     return cssCreateMatches.join('\n');
 }
-function extractCssDefineVars(code) {
+function extractCssDefineConsts(code) {
     const cssCreateMatches = [];
-    const regex = /(?:(?:\s*const\s+[a-zA-Z0-9_$]+\s*=\s*css\.defineVars\([\s\S]*?\);\s*))/g;
+    const regex = /(?:(?:\s*const\s+[a-zA-Z0-9_$]+\s*=\s*css\.defineConsts\([\s\S]*?\);\s*))/g;
     let match;
     while ((match = regex.exec(code))) {
         if (isInComment(code, match.index) ||
@@ -215,9 +215,9 @@ function extractCssDefineVars(code) {
     }
     return cssCreateMatches.join('\n');
 }
-function extractCssDefineTheme(code) {
+function extractCssDefineTokens(code) {
     const cssCreateMatches = [];
-    const regex = /(?:(?:\s*const\s+[a-zA-Z0-9_$]+\s*=\s*css\.defineTheme\([\s\S]*?\);\s*))/g;
+    const regex = /(?:(?:\s*const\s+[a-zA-Z0-9_$]+\s*=\s*css\.defineTokens\([\s\S]*?\);\s*))/g;
     let match;
     while ((match = regex.exec(code))) {
         if (isInComment(code, match.index) ||
@@ -286,9 +286,9 @@ async function extractVueAndSvelte(filePath) {
     const staticVariableSection = extractStaticStringLiteralVariable(tsCode);
     const cssCreateSection = extractCssCreate(tsCode);
     const cssKeyframesSection = extractCssKeyframes(tsCode);
+    const cssViewTransitionSection = extractCssViewTransition(tsCode);
     const cssDefineConstsSection = extractCssDefineConsts(tsCode);
-    const cssDefineVarsSection = extractCssDefineVars(tsCode);
-    const cssDefineThemeSection = extractCssDefineTheme(tsCode);
+    const cssDefineTokensSection = extractCssDefineTokens(tsCode);
     let finalCode = '';
     if (importSection) {
         finalCode += importSection + '\n';
@@ -299,14 +299,14 @@ async function extractVueAndSvelte(filePath) {
     if (cssKeyframesSection) {
         finalCode += cssKeyframesSection + '\n';
     }
+    if (cssViewTransitionSection) {
+        finalCode += cssViewTransitionSection + '\n';
+    }
     if (cssDefineConstsSection) {
         finalCode += cssDefineConstsSection + '\n';
     }
-    if (cssDefineVarsSection) {
-        finalCode += cssDefineVarsSection + '\n';
-    }
-    if (cssDefineThemeSection) {
-        finalCode += cssDefineThemeSection + '\n';
+    if (cssDefineTokensSection) {
+        finalCode += cssDefineTokensSection + '\n';
     }
     if (cssCreateSection) {
         finalCode += cssCreateSection + '\n';
@@ -327,9 +327,9 @@ async function extractTSFile(filePath) {
     const staticVariableSection = extractStaticStringLiteralVariable(code);
     const cssCreateSection = extractCssCreate(code);
     const cssKeyframesSection = extractCssKeyframes(code);
+    const cssViewTransitionSection = extractCssViewTransition(code);
     const cssDefineConstsSection = extractCssDefineConsts(code);
-    const cssDefineVarsSection = extractCssDefineVars(code);
-    const cssDefineThemeSection = extractCssDefineTheme(code);
+    const cssDefineTokensSection = extractCssDefineTokens(code);
     const propsMatches = extractCssProps(code);
     const calls = propsMatches
         .filter(Boolean)
@@ -342,12 +342,12 @@ async function extractTSFile(filePath) {
         finalCode += staticVariableSection + '\n';
     if (cssKeyframesSection)
         finalCode += cssKeyframesSection + '\n';
+    if (cssViewTransitionSection)
+        finalCode += cssViewTransitionSection + '\n';
     if (cssDefineConstsSection)
         finalCode += cssDefineConstsSection + '\n';
-    if (cssDefineVarsSection)
-        finalCode += cssDefineVarsSection + '\n';
-    if (cssDefineThemeSection)
-        finalCode += cssDefineThemeSection + '\n';
+    if (cssDefineTokensSection)
+        finalCode += cssDefineTokensSection + '\n';
     if (cssCreateSection)
         finalCode += cssCreateSection + '\n';
     finalCode += calls;

package/dist/index.js

@@ -46,16 +46,28 @@ else {
     }
 }
 let coreFilePath;
-try {
-    const corePackageJsonPath = require.resolve('@plumeria/core/package.json', {
-        paths: [projectRoot, process.cwd()],
-    });
-    coreFilePath = path.join(path.dirname(corePackageJsonPath), 'stylesheet.css');
+const coreSourcePackageJsonPath = path.join(process.cwd(), 'package.json');
+const coreSourcePackageJson = JSON.parse(fs.readFileSync(coreSourcePackageJsonPath, 'utf-8'));
+const dependencies = {
+    ...coreSourcePackageJson.dependencies,
+    ...coreSourcePackageJson.devDependencies,
+};
+const coreVersion = dependencies['@plumeria/core'];
+const resolvedCorePackageJsonPath = require.resolve('@plumeria/core/package.json', {
+    paths: [projectRoot, process.cwd()],
+});
+if (workspaceRootFile) {
+    if (coreVersion.includes('workspace')) {
+        coreFilePath = path.join(path.dirname(resolvedCorePackageJsonPath), 'stylesheet.css');
+    }
+    else {
+        const corePackageJson = JSON.parse(fs.readFileSync(resolvedCorePackageJsonPath, 'utf-8'));
+        const exactCoreVersion = corePackageJson.version;
+        coreFilePath = path.join(projectRoot, 'node_modules', '.pnpm', `@plumeria+core@${exactCoreVersion}`, 'node_modules', '@plumeria', 'core', 'stylesheet.css');
+    }
 }
-catch (error) {
-    console.error('Could not find "@plumeria/core/stylesheet.css". Please make sure it is installed.' +
-        error);
-    process.exit(1);
+else {
+    coreFilePath = path.join(path.dirname(resolvedCorePackageJsonPath), 'stylesheet.css');
 }
 const cleanUp = async () => {
     if (process.env.CI && existsSync(coreFilePath)) {

package/package.json

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