frosty 0.0.68 → 0.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frosty",
-  "version": "0.0.68",
+  "version": "0.0.69",
   "main": "dist/index",
   "module": "dist/index",
   "types": "dist/index",

package/packages/frosty-cli/package.json

@@ -15,8 +15,13 @@
     "@o2ter/server-js": "^0.0.20",
     "babel-jest": "^29.7.0",
     "babel-loader": "^10.0.0",
+    "css-loader": "^7.1.2",
     "dotenv-webpack": "^8.1.1",
+    "file-loader": "^6.2.0",
     "mini-css-extract-plugin": "^2.9.3",
+    "postcss-loader": "^8.1.1",
+    "sass": "^1.90.0",
+    "sass-loader": "^16.0.5",
     "terser-webpack-plugin": "^5.3.14",
     "webpack": "^5.98.0",
     "webpack-cli": "^6.0.1"

package/packages/frosty-cli/scripts/bin/run.sh

@@ -116,9 +116,9 @@ if [ "$NO_BUILD" != "true" ]; then
   [ -n "$SRCROOT" ] && BUILD_OPTS="$BUILD_OPTS --env SRCROOT="$SRCROOT""
   [ -n "$PORT" ] && BUILD_OPTS="$BUILD_OPTS --env PORT="$PORT""
   if [ "$WATCH_MODE" = "true" ]; then
-    eval npx webpack $BUILD_OPTS --watch &
+    npx webpack $BUILD_OPTS --watch &
   else
-    eval npx webpack $BUILD_OPTS
+    npx webpack $BUILD_OPTS
   fi
 fi
 

package/packages/frosty-cli/webpack.mjs

@@ -33,6 +33,8 @@ import Dotenv from 'dotenv-webpack';
 import TerserPlugin from 'terser-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 
+const { dirname: __dirname } = import.meta;
+
 export default async (env, argv) => {
 
   const {
@@ -54,25 +56,25 @@ export default async (env, argv) => {
 
   const {
     SRCROOT = config.src,
-    OUTPUT_DIR = config.output || path.resolve(import.meta.dirname, 'dist'),
+    OUTPUT_DIR = config.output || path.resolve(__dirname, 'dist'),
   } = env;
 
   const frostyDeps = await (async () => {
     try {
       const resolved = import.meta.resolve('frosty');
       return {
-        frosty: resolved.endsWith('/dist/index.js') ? resolved.replace('/index.js', '') : resolved,
+        frosty: path.dirname(resolved.replace('file://', '')),
       };
     } catch {
-      const { rollupConfig: { input } } = await import(path.resolve(import.meta.dirname, '../../rollup.config.mjs'));
+      const { rollupConfig: { input } } = await import(path.resolve(__dirname, '../../rollup.config.mjs'));
       const resolved = {};
       for (const [k, v] of _.entries(input)) {
         if (k === 'index') continue;
-        resolved[`frosty/${k}`] = path.resolve(import.meta.dirname, '../..', v);
+        resolved[`frosty/${k}`] = path.resolve(__dirname, '../..', v);
       }
       return {
         ...resolved,
-        frosty: path.resolve(import.meta.dirname, '../../src/index'),
+        frosty: path.resolve(__dirname, '../../src/index'),
       };
     }
   })();
@@ -116,9 +118,9 @@ export default async (env, argv) => {
     test: /\.(css|sass|scss)$/,
     use: [
       !server && MiniCssExtractPlugin.loader,
-      'css-loader',
+      path.resolve(__dirname, 'node_modules/css-loader'),
       {
-        loader: 'postcss-loader',
+        loader: path.resolve(__dirname, 'node_modules/postcss-loader'),
         options: {
           postcssOptions: {
             plugins: [
@@ -127,14 +129,14 @@ export default async (env, argv) => {
           }
         }
       },
-      'sass-loader',
+      path.resolve(__dirname, 'node_modules/sass-loader'),
     ].filter(Boolean),
   });
 
   const imageLoaderConfiguration = ({ server }) => ({
     test: /\.(gif|jpe?g|a?png|svg)$/i,
     use: {
-      loader: 'file-loader',
+      loader: path.resolve(__dirname, 'node_modules/file-loader'),
       options: {
         name: '[name].[contenthash].[ext]',
         publicPath: '/images',
@@ -147,7 +149,7 @@ export default async (env, argv) => {
   const fontLoaderConfiguration = ({ server }) => ({
     test: /\.ttf$/i,
     use: {
-      loader: 'file-loader',
+      loader: path.resolve(__dirname, 'node_modules/file-loader'),
       options: {
         name: '[name].[contenthash].[ext]',
         publicPath: '/fonts',
@@ -205,7 +207,7 @@ export default async (env, argv) => {
     ...config.options?.plugins ?? [],
   ];
 
-  const server = config.serverEntry ? path.resolve(process.cwd(), config.serverEntry) : path.resolve(import.meta.dirname, './src/server/default.js');
+  const server = config.serverEntry ? path.resolve(process.cwd(), config.serverEntry) : path.resolve(__dirname, './src/server/default.js');
 
   const random = crypto.randomUUID();
   const tempDir = fs.mkdtempSync(`${os.tmpdir()}${path.sep}`);
@@ -230,7 +232,7 @@ export default async (env, argv) => {
       entry: {
         [`${name}_bundle`]: [
           'core-js/stable',
-          path.resolve(import.meta.dirname, './src/client/index.js'),
+          path.resolve(__dirname, './src/client/index.js'),
         ],
       },
       output: {
@@ -276,7 +278,7 @@ export default async (env, argv) => {
       entry: {
         server: [
           'core-js/stable',
-          path.resolve(import.meta.dirname, './src/server/index.js'),
+          path.resolve(__dirname, './src/server/index.js'),
         ],
       },
       output: {