diff --git a/docs/homepage.md b/docs/homepage.md index 25f4fcd2..55b1f3f7 100644 --- a/docs/homepage.md +++ b/docs/homepage.md @@ -3,7 +3,7 @@ Logo [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/mlutcss/mlut/test.yml?branch=master)](https://github.com/mlutcss/mlut/actions/workflows/test.yml) -[![](https://img.shields.io/npm/v/mlut.svg)](https://www.npmjs.com/package/mlut) +[![](https://img.shields.io/npm/v/@mlut/core.svg)](https://www.npmjs.com/package/@mlut/core) [![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/mlutcss)](https://x.com/mlutcss) Atomic CSS toolkit with Sass and ergonomics for creating styles of any complexity.
Make CSS exciting again! diff --git a/package-lock.json b/package-lock.json index 5c211835..0628b776 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18882,7 +18882,7 @@ }, "packages/core": { "name": "@mlut/core", - "version": "2.3.0", + "version": "2.3.1", "license": "MIT", "devDependencies": { "@octokit/plugin-retry": "^8.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index 3cfa3b09..920b6ac7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@mlut/core", - "version": "2.3.0", + "version": "2.3.1", "description": "Atomic CSS toolkit with Sass and ergonomics for creating styles of any complexity", "author": "mr150", "type": "module", diff --git a/packages/core/src/jit/JitEngine.ts b/packages/core/src/jit/JitEngine.ts index a4516fee..28d49ac3 100644 --- a/packages/core/src/jit/JitEngine.ts +++ b/packages/core/src/jit/JitEngine.ts @@ -1,19 +1,16 @@ import { path } from '../utils/path.js'; import { logger } from '../utils/index.js'; -import type { AsyncCompiler } from 'sass'; -const isNode = globalThis.process?.env != undefined; +const isNode = globalThis.window?.document === undefined; const isTestEnv = globalThis.process?.env?.NODE_ENV === 'test'; const sass = await import('sass-embedded') .catch(() => import('sass')) - //@ts-expect-error - for run in browser - .catch(() => import('https://jspm.dev/sass')) .catch(() => { throw new Error( 'The Sass package is not installed. You can do this with `npm i -D sass-embedded`' ); - }) as AsyncCompiler; + }); const sassImporters = !isTestEnv && isNode ? [] : await import('./importerFromMemory.js') diff --git a/packages/core/src/jit/SassSourcesLoader.ts b/packages/core/src/jit/SassSourcesLoader.ts index 2cd174b7..aa5cf765 100644 --- a/packages/core/src/jit/SassSourcesLoader.ts +++ b/packages/core/src/jit/SassSourcesLoader.ts @@ -7,14 +7,14 @@ declare global { }; } -//@ts-expect-error - for run in browser -const retryPromise = import('https://esm.sh/@octokit/plugin-retry') - .catch(() => import('@octokit/plugin-retry')) +const retryPromise = import('@octokit/plugin-retry') + //@ts-expect-error - for run in browser + .catch(() => import('https://esm.sh/@octokit/plugin-retry')) .then((r: typeof import('@octokit/plugin-retry')) => r.retry); -//@ts-expect-error - for run in browser -const octokit = await import('https://esm.sh/@octokit/rest') - .catch(() => import('@octokit/rest')) +const octokit = await import('@octokit/rest') + //@ts-expect-error - for run in browser + .catch(() => import('https://esm.sh/@octokit/rest')) .then(async (r: typeof import('@octokit/rest')) => { const retry = await retryPromise; const ctr = r.Octokit.plugin(retry); diff --git a/packages/core/src/utils/path.ts b/packages/core/src/utils/path.ts index 9dac6c4c..d5264f8a 100644 --- a/packages/core/src/utils/path.ts +++ b/packages/core/src/utils/path.ts @@ -1,7 +1,7 @@ import type { PlatformPath } from 'node:path'; -//@ts-expect-error - cdn for run in browser -export const path = await import('https://esm.sh/path-browserify-esm') - .catch(() => import('node:path')) +export const path = await import('path') + //@ts-expect-error - cdn for run in browser + .catch(() => import('https://esm.sh/path-browserify-esm')) //eslint-disable-next-line .then((r) => r.default) as PlatformPath; diff --git a/packages/mlut/README.md b/packages/mlut/README.md index 0d97ce57..655a6494 100644 --- a/packages/mlut/README.md +++ b/packages/mlut/README.md @@ -3,7 +3,7 @@ Logo [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/mlutcss/mlut/test.yml?branch=master)](https://github.com/mlutcss/mlut/actions/workflows/test.yml) -[![](https://img.shields.io/npm/v/mlut.svg)](https://www.npmjs.com/package/mlut) +[![](https://img.shields.io/npm/v/@mlut/core.svg)](https://www.npmjs.com/package/@mlut/core) [![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/mlutcss)](https://x.com/mlutcss) Atomic CSS toolkit with Sass and ergonomics for creating styles of any complexity.
Make CSS exciting again! diff --git a/test/sass/index.js b/test/sass/index.js index e5f5b462..69a8120f 100644 --- a/test/sass/index.js +++ b/test/sass/index.js @@ -13,6 +13,7 @@ sassTrue.runSass( 'packages/core', 'node_modules', ], + silenceDeprecations: [ 'if-function', ], }, { describe, diff --git a/test/web.html b/test/web.html index 13f324b8..881ed024 100644 --- a/test/web.html +++ b/test/web.html @@ -18,7 +18,9 @@

mlut tests