xpine 0.0.15 → 0.0.17

package/TODO

@@ -1 +1,2 @@
-- npx create-xpine-app
+- static files from a +config.ts file in a folder (similar to vike)
+  - with a method of getting a list of file paths to feed into dynamic slugs, e.g. post/[id] slugs

package/dist/index.js

@@ -71,13 +71,8 @@ function convertEntryPointsToSingleFile(entryPoints, tempWritePath) {
     entryPoints.map((entry) => `import "${entry}"`).join(";\n")
   );
 }
-function removeClientScriptInTSXFile(pathName) {
+function removeClientScriptInTSXFile(pathName, source) {
   const content = fs.readFileSync(pathName, "utf-8");
-  const source = ts.createSourceFile(
-    pathName,
-    content,
-    ts.ScriptTarget.Latest
-  );
   let toRemoveFrom;
   let clientDataStart;
   const clientImportsToHoist = [];
@@ -119,6 +114,17 @@ function removeClientScriptInTSXFile(pathName) {
     clientDataStart
   };
 }
+function createStaticFile(pathName, source) {
+  source.forEachChild((child) => {
+    if (child.kind === ts.SyntaxKind.ExpressionStatement) {
+      const text = child.getText(source);
+      const cleanedText = text.replace(/["';]/g, "");
+      if (cleanedText === "xpine-static") {
+        console.log("make this file static", pathName);
+      }
+    }
+  });
+}
 
 // src/scripts/build.ts
 import { globSync } from "glob";
@@ -196,6 +202,20 @@ var config = {
   ...userConfig
 };
 
+// src/util/postcss/remove-layers.ts
+var plugin = (opts = {}) => {
+  return {
+    postcssPlugin: "postcssRemoveLayers",
+    AtRule: {
+      layer: (atRule) => {
+        atRule.replaceWith(atRule.nodes);
+      }
+    }
+  };
+};
+plugin.postcss = true;
+var remove_layers_default = plugin;
+
 // src/scripts/build.ts
 var extensions = [".ts", ".tsx"];
 var packageJson = JSON.parse(fs2.readFileSync(config.packageJsonPath, "utf-8"));
@@ -257,7 +277,14 @@ async function buildAppFiles(files, isDev) {
         name: "insert-html-banner-and-remove-client-scripts",
         setup(build2) {
           build2.onLoad({ filter: /.tsx/ }, (args) => {
-            const cleanedContent = removeClientScriptInTSXFile(args.path);
+            const content = fs2.readFileSync(args.path, "utf-8");
+            const source = ts2.createSourceFile(
+              args.path,
+              content,
+              ts2.ScriptTarget.Latest
+            );
+            const cleanedContent = removeClientScriptInTSXFile(args.path, source);
+            createStaticFile(args.path, source);
             const htmlImportStart = "import { html } from 'xpine';\n";
             const newContent = `${htmlImportStart}${cleanedContent.content}`;
             componentData.push({
@@ -388,7 +415,7 @@ async function buildCSS() {
   const cssFiles = globSync(config.srcDir + "/**/*.css");
   for (const file of cssFiles) {
     const fileContents = fs2.readFileSync(file, "utf-8");
-    const result = await postcss([tailwindPostcss()]).process(fileContents, { from: file });
+    const result = await postcss([tailwindPostcss(), remove_layers_default()]).process(fileContents, { from: file });
     const newPath = file.replace(config.srcDir, config.distDir);
     fs2.ensureFileSync(newPath);
     fs2.writeFileSync(newPath, result.css);

package/dist/src/scripts/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/scripts/build.ts"],"names":[],"mappings":"AAyBA,wBAAsB,QAAQ,CAAC,KAAK,UAAQ,iBAa3C;AA4LD,wBAAsB,QAAQ,kBAW7B;AAGD,wBAAsB,yBAAyB,kBAgB9C;AAOD,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,EAAE,eAAe,WAAkB,iBAahH"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/scripts/build.ts"],"names":[],"mappings":"AA0BA,wBAAsB,QAAQ,CAAC,KAAK,UAAQ,iBAa3C;AA4LD,wBAAsB,QAAQ,kBAW7B;AAGD,wBAAsB,yBAAyB,kBAgB9C;AAOD,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,EAAE,eAAe,WAAkB,iBAahH"}

package/dist/src/scripts/xpine-build.js

@@ -66,13 +66,8 @@ function convertEntryPointsToSingleFile(entryPoints, tempWritePath) {
     entryPoints.map((entry) => `import "${entry}"`).join(";\n")
   );
 }
-function removeClientScriptInTSXFile(pathName) {
+function removeClientScriptInTSXFile(pathName, source) {
   const content = fs.readFileSync(pathName, "utf-8");
-  const source = ts.createSourceFile(
-    pathName,
-    content,
-    ts.ScriptTarget.Latest
-  );
   let toRemoveFrom;
   let clientDataStart;
   const clientImportsToHoist = [];
@@ -114,6 +109,17 @@ function removeClientScriptInTSXFile(pathName) {
     clientDataStart
   };
 }
+function createStaticFile(pathName, source) {
+  source.forEachChild((child) => {
+    if (child.kind === ts.SyntaxKind.ExpressionStatement) {
+      const text = child.getText(source);
+      const cleanedText = text.replace(/["';]/g, "");
+      if (cleanedText === "xpine-static") {
+        console.log("make this file static", pathName);
+      }
+    }
+  });
+}
 
 // src/scripts/build.ts
 import { globSync } from "glob";
@@ -191,6 +197,20 @@ var config = {
   ...userConfig
 };
 
+// src/util/postcss/remove-layers.ts
+var plugin = (opts = {}) => {
+  return {
+    postcssPlugin: "postcssRemoveLayers",
+    AtRule: {
+      layer: (atRule) => {
+        atRule.replaceWith(atRule.nodes);
+      }
+    }
+  };
+};
+plugin.postcss = true;
+var remove_layers_default = plugin;
+
 // src/scripts/build.ts
 var extensions = [".ts", ".tsx"];
 var packageJson = JSON.parse(fs2.readFileSync(config.packageJsonPath, "utf-8"));
@@ -252,7 +272,14 @@ async function buildAppFiles(files, isDev) {
         name: "insert-html-banner-and-remove-client-scripts",
         setup(build2) {
           build2.onLoad({ filter: /.tsx/ }, (args) => {
-            const cleanedContent = removeClientScriptInTSXFile(args.path);
+            const content = fs2.readFileSync(args.path, "utf-8");
+            const source = ts2.createSourceFile(
+              args.path,
+              content,
+              ts2.ScriptTarget.Latest
+            );
+            const cleanedContent = removeClientScriptInTSXFile(args.path, source);
+            createStaticFile(args.path, source);
             const htmlImportStart = "import { html } from 'xpine';\n";
             const newContent = `${htmlImportStart}${cleanedContent.content}`;
             componentData.push({
@@ -383,7 +410,7 @@ async function buildCSS() {
   const cssFiles = globSync(config.srcDir + "/**/*.css");
   for (const file of cssFiles) {
     const fileContents = fs2.readFileSync(file, "utf-8");
-    const result = await postcss([tailwindPostcss()]).process(fileContents, { from: file });
+    const result = await postcss([tailwindPostcss(), remove_layers_default()]).process(fileContents, { from: file });
     const newPath = file.replace(config.srcDir, config.distDir);
     fs2.ensureFileSync(newPath);
     fs2.writeFileSync(newPath, result.css);

package/dist/src/scripts/xpine-dev.js

@@ -73,13 +73,8 @@ function convertEntryPointsToSingleFile(entryPoints, tempWritePath) {
     entryPoints.map((entry) => `import "${entry}"`).join(";\n")
   );
 }
-function removeClientScriptInTSXFile(pathName) {
+function removeClientScriptInTSXFile(pathName, source) {
   const content = fs.readFileSync(pathName, "utf-8");
-  const source = ts.createSourceFile(
-    pathName,
-    content,
-    ts.ScriptTarget.Latest
-  );
   let toRemoveFrom;
   let clientDataStart;
   const clientImportsToHoist = [];
@@ -121,6 +116,17 @@ function removeClientScriptInTSXFile(pathName) {
     clientDataStart
   };
 }
+function createStaticFile(pathName, source) {
+  source.forEachChild((child) => {
+    if (child.kind === ts.SyntaxKind.ExpressionStatement) {
+      const text = child.getText(source);
+      const cleanedText = text.replace(/["';]/g, "");
+      if (cleanedText === "xpine-static") {
+        console.log("make this file static", pathName);
+      }
+    }
+  });
+}
 
 // src/scripts/build.ts
 import { globSync } from "glob";
@@ -198,6 +204,20 @@ var config = {
   ...userConfig
 };
 
+// src/util/postcss/remove-layers.ts
+var plugin = (opts = {}) => {
+  return {
+    postcssPlugin: "postcssRemoveLayers",
+    AtRule: {
+      layer: (atRule) => {
+        atRule.replaceWith(atRule.nodes);
+      }
+    }
+  };
+};
+plugin.postcss = true;
+var remove_layers_default = plugin;
+
 // src/scripts/build.ts
 var extensions = [".ts", ".tsx"];
 var packageJson = JSON.parse(fs2.readFileSync(config.packageJsonPath, "utf-8"));
@@ -259,7 +279,14 @@ async function buildAppFiles(files, isDev) {
         name: "insert-html-banner-and-remove-client-scripts",
         setup(build2) {
           build2.onLoad({ filter: /.tsx/ }, (args) => {
-            const cleanedContent = removeClientScriptInTSXFile(args.path);
+            const content = fs2.readFileSync(args.path, "utf-8");
+            const source = ts2.createSourceFile(
+              args.path,
+              content,
+              ts2.ScriptTarget.Latest
+            );
+            const cleanedContent = removeClientScriptInTSXFile(args.path, source);
+            createStaticFile(args.path, source);
             const htmlImportStart = "import { html } from 'xpine';\n";
             const newContent = `${htmlImportStart}${cleanedContent.content}`;
             componentData.push({
@@ -390,7 +417,7 @@ async function buildCSS() {
   const cssFiles = globSync(config.srcDir + "/**/*.css");
   for (const file of cssFiles) {
     const fileContents = fs2.readFileSync(file, "utf-8");
-    const result = await postcss([tailwindPostcss()]).process(fileContents, { from: file });
+    const result = await postcss([tailwindPostcss(), remove_layers_default()]).process(fileContents, { from: file });
     const newPath = file.replace(config.srcDir, config.distDir);
     fs2.ensureFileSync(newPath);
     fs2.writeFileSync(newPath, result.css);

package/dist/src/util/postcss/remove-layers.d.ts

@@ -0,0 +1,8 @@
+import { PluginCreator } from "postcss";
+declare namespace plugin {
+    interface Options {
+    }
+}
+declare const plugin: PluginCreator<plugin.Options>;
+export default plugin;
+//# sourceMappingURL=remove-layers.d.ts.map

package/dist/src/util/postcss/remove-layers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-layers.d.ts","sourceRoot":"","sources":["../../../../src/util/postcss/remove-layers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,kBAAU,MAAM,CAAC;IACf,UAAiB,OAAO;KAEvB;CACF;AAID,QAAA,MAAM,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,OAAO,CASxC,CAAC;AAGH,eAAe,MAAM,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xpine",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.758.0",
@@ -25,12 +25,15 @@
     "url": "git://github.com/dan-caldwell/xpine.git"
   },
   "scripts": {
-    "build": "tsx ./src/scripts/build-module.ts && npm run build:types",
-    "build:types": "sh ./src/scripts/build-types.sh"
+    "build": "tsx ./src/scripts/run-build-module.ts && npm run build:types",
+    "build:types": "sh ./src/scripts/build-types.sh",
+    "xpine-dev-server": "tsx ./src/scripts/xpine-dev-server.ts"
   },
   "bin": {
     "xpine-build": "dist/src/scripts/xpine-build.js",
-    "xpine-dev": "dist/src/scripts/xpine-dev.js"
+    "xpine-dev": "dist/src/scripts/xpine-dev.js",
+    "xpine-build:debug": "tsx ./src/scripts/xpine-build.ts",
+    "xpine-dev:debug": "tsx ./src/scripts/xpine-dev.ts"
   },
   "types": "dist/index.d.ts",
   "type": "module",