Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps-dev): bump laravel-vite-plugin from 0.7.3 to 0.7.8 #1883

Merged
merged 3 commits into from
Aug 2, 2023
Merged

chore(deps-dev): bump laravel-vite-plugin from 0.7.3 to 0.7.8 #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c13db0c
chore(deps-dev): bump laravel-vite-plugin from 0.7.3 to 0.7.8
dependabot[bot] Aug 1, 2023
1b23fd3
build: convert build files to esm
jobara Aug 1, 2023
935080b
ci: indicate that lighthouserc uses common js
jobara Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions css-props-generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const fs = require("fs");
const prettier = require("prettier");
const config = require("./tailwind.config.js");
import { writeFileSync } from "node:fs";
import * as prettier from "prettier";
import {default as config} from "./tailwind.config.js";

/*
Converts the tailwind config elements into custom props.
*/
const generateCSSProps = () => {
export const generateCSSProps = () => {
let result = "";

const groups = [
Expand Down Expand Up @@ -72,8 +72,7 @@ const generateCSSProps = () => {
result = prettier.format(result, {parser: "scss", tabWidth: 4});

// Push this file into the CSS dir, ready to go
fs.writeFileSync("./resources/css/_tokens.css", result);
writeFileSync("./resources/css/_tokens.css", result);
};

generateCSSProps();
module.exports = generateCSSProps;
0 lighthouserc.js → lighthouserc.cjs
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "@accessibility-exchange/platform",
"private": true,
"type": "module",
"scripts": {
"build": "npm run props && vite build",
"dev": "vite",
Expand Down Expand Up @@ -37,7 +38,7 @@
"eslint-config-fluid": "^2.1.1",
"eslint-config-prettier": "^8.8.0",
"husky": "^8.0.3",
"laravel-vite-plugin": "^0.7.3",
"laravel-vite-plugin": "^0.7.8",
"lint-staged": "^13.2.3",
"modern-css-reset": "^1.4.0",
"npm-run-all": "^4.1.5",
Expand Down
4 changes: 2 additions & 2 deletions postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = {
export default {
plugins: {
"postcss-import-ext-glob": {},
"postcss-import": {},
"postcss-logical": {dir: "ltr"},
tailwindcss: {},
autoprefixer: {}
}
};
}
2 changes: 1 addition & 1 deletion resources/css/_tokens.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* VARIABLES GENERATED WITH TAILWIND CONFIG ON 7/25/2023.
/* VARIABLES GENERATED WITH TAILWIND CONFIG ON 8/1/2023.
Tokens location: ./tailwind.config.js */
:root {
--space-0: 0;
Expand Down
42 changes: 20 additions & 22 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// eslint-disable-next-line no-unused-vars
const { Config } = require("tailwindcss");
import typography from '@tailwindcss/typography';

/**
* @type {Config} config
**/
module.exports = {
content: ["./resources/**/*.blade.php", "./resources/**/*.js", "./vendor/filament/**/*.blade.php"],
export default {
content: [
"./resources/**/*.blade.php",
"./resources/**/*.js",
"./vendor/filament/**/*.blade.php"
],
darkMode: 'class',
theme: {
extend: {
Expand Down Expand Up @@ -96,17 +96,17 @@ module.exports = {
"fluid-xl": "clamp(1.25rem, 1.7857vw + 0.3929rem, 2rem)",
"fluid-2xl": "clamp(1.75rem, 2.9762vw + 0.3214rem, 3rem)",
"fluid-3xl": "clamp(2.5rem, 4.7619vw + 0.2143rem, 4.5rem)",
xs: ["0.75rem", { lineHeight: "1.5" }],
sm: ["0.875rem", { lineHeight: "1.5" }],
base: ["1rem", { lineHeight: "1.5" }],
lg: ["1.1rem", { lineHeight: "1.5" }],
xl: ["1.25rem", { lineHeight: "1.5" }],
"2xl": ["1.5rem", { lineHeight: "1.4" }],
"3xl": ["2rem", { lineHeight: "1.4" }],
"4xl": ["2.5rem", { lineHeight: "1.4" }],
"5xl": ["3rem", { lineHeight: "1" }],
"6xl": ["3.75rem", { lineHeight: "1" }],
"7xl": ["4.5rem", { lineHeight: "1" }]
xs: ["0.75rem", {lineHeight: "1.5"}],
sm: ["0.875rem", {lineHeight: "1.5"}],
base: ["1rem", {lineHeight: "1.5"}],
lg: ["1.1rem", {lineHeight: "1.5"}],
xl: ["1.25rem", {lineHeight: "1.5"}],
"2xl": ["1.5rem", {lineHeight: "1.4"}],
"3xl": ["2rem", {lineHeight: "1.4"}],
"4xl": ["2.5rem", {lineHeight: "1.4"}],
"5xl": ["3rem", {lineHeight: "1"}],
"6xl": ["3.75rem", {lineHeight: "1"}],
"7xl": ["4.5rem", {lineHeight: "1"}]
},
fontWeight: {
thin: "100",
Expand Down Expand Up @@ -211,7 +211,5 @@ module.exports = {
corePlugins: {
preflight: false,
},
plugins: [
require('@tailwindcss/typography')
]
};
plugins: [typography]
}