Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5ca0b47
chore: update batch #1 dependencies
brunozoric May 27, 2026
888a4c7
chore: update batch #2 dependencies
brunozoric May 27, 2026
3c56eee
chore: update @badrap/bar-of-progress to v0.3.0
brunozoric May 27, 2026
ca12dd6
chore: update batch #3 dependencies
brunozoric May 27, 2026
fb3416c
chore: update batch #4 dependencies
brunozoric May 27, 2026
ddaacf8
chore: update @docsearch/react to v4
brunozoric May 27, 2026
482823a
chore: update yargs to v18
brunozoric May 27, 2026
694b23d
chore: update load-json-file to v7 and write-json-file to v7
brunozoric May 27, 2026
727de60
chore: remove unused load-json-file and write-json-file
brunozoric May 27, 2026
8eeb850
chore: update @headlessui/react to v2, @heroicons/react to v2, and @r…
brunozoric May 27, 2026
a975219
chore: remove @types/react resolution override
brunozoric May 27, 2026
3a6b1f7
fix: migrate Dialog.Overlay to DialogBackdrop for @headlessui/react v2
brunozoric May 27, 2026
ea8c5c8
chore: update @next/bundle-analyzer to v16
brunozoric May 27, 2026
2ffda4f
chore: update @silvenon/remark-smartypants to v2
brunozoric May 27, 2026
26621dc
chore: update @svgr/webpack to v8
brunozoric May 27, 2026
e6dc1ba
chore: update @types/fs-extra to v11
brunozoric May 27, 2026
32bcdd9
chore: update babel-plugin-module-resolver to v5
brunozoric May 27, 2026
b458917
chore: update chokidar to v5
brunozoric May 27, 2026
8910c84
chore: update clean-css to v5
brunozoric May 27, 2026
c0e951f
chore: update clsx to v2
brunozoric May 27, 2026
0a3cf70
chore: update concurrently to v9
brunozoric May 27, 2026
3e3a9ac
chore: update fs-extra to v11
brunozoric May 27, 2026
239038e
fix: update SVGO config format for @svgr/webpack v8
brunozoric May 27, 2026
224d20f
chore: update minimatch to v10
brunozoric May 27, 2026
179bc2b
chore: update node-gyp to v12
brunozoric May 27, 2026
630f962
chore: update oxfmt to v0.51
brunozoric May 27, 2026
fd225b6
chore: update portless to v0.13
brunozoric May 27, 2026
a61cbab
chore: update postcss-focus-visible to v11
brunozoric May 27, 2026
ec987c1
chore: remove unused node-gyp dependency
brunozoric May 27, 2026
740be12
chore: update postcss-import to v16
brunozoric May 27, 2026
1a0e4b1
chore: replace prettier and eslint with oxfmt and oxlint
brunozoric May 27, 2026
6f936df
chore: update rimraf to v6
brunozoric May 27, 2026
22c01b5
chore: update ts-morph to v28
brunozoric May 27, 2026
e932b67
chore: add typecheck script and upgrade TypeScript to v5
brunozoric May 27, 2026
317f24d
fix: rewrite LayoutProcessor test to use proper MdxFile
brunozoric May 27, 2026
c0b8168
chore: pin @babel packages to v7.29.7 and typescript to v5.9.3
brunozoric May 27, 2026
0d5588a
chore: update debounce to v2.2.0
brunozoric May 27, 2026
4901c65
chore: update deps
brunozoric May 27, 2026
3f1e86d
chore: add root test script and fix LayoutProcessor test
brunozoric May 27, 2026
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
10 changes: 0 additions & 10 deletions .eslintrc.js

This file was deleted.

19 changes: 3 additions & 16 deletions .oxfmtrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,12 @@
"rangeEnd": null,
"sortPackageJson": false,
"ignorePatterns": [
".nx/",
".webiny/",
".verdaccio/",
"docs/",
"src/pages/docs/**",
"**/build/",
"**/dist/",
"**/.out/",
"**/.pulumi/",
".webiny/**",
"packages/admin-ui/scripts/importFromFigma/exports/Alias tokens.json",
"packages/project-aws/_templates/appTemplates/",
"lerna.json",
"coverage/**",
"packages/cli/files/**/*.json",
"packages/create-webiny-project/utils/binaries/**",
".github/workflows/**/*.yml",
"./nextjs/",
"packages/admin-ui/storybook-static/**",
"**/*.hbs"
"**/.next/",
"coverage/**"
],
"overrides": [
{
Expand Down
1 change: 0 additions & 1 deletion .prettierignore

This file was deleted.

14 changes: 0 additions & 14 deletions .prettierrc.js

This file was deleted.

785 changes: 0 additions & 785 deletions .yarn/releases/yarn-3.2.0.cjs

This file was deleted.

940 changes: 940 additions & 0 deletions .yarn/releases/yarn-4.15.0.cjs

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
approvedGitRepositories: []

compressionLevel: mixed

enableScripts: false

enableGlobalCache: true

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.0.cjs
npmMinimalAgeGate: 2d
npmPreapprovedPackages:
- "@webiny/react-composition"
- "@webiny/react-properties"
- "@webiny/utils"
- "@webiny/wts-client"

yarnPath: .yarn/releases/yarn-4.15.0.cjs
2 changes: 1 addition & 1 deletion bundle/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports.createWebpackConfig = (config, options) => {
use: [
{
loader: "@svgr/webpack",
options: { svgoConfig: { plugins: { removeViewBox: false } } }
options: { svgoConfig: { plugins: [{ name: "removeViewBox", active: false }] } }
},
{
loader: "file-loader",
Expand Down
4 changes: 2 additions & 2 deletions generateDocs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ process.env.NODE_PATH = process.cwd();
const tsNode = require("ts-node");
const { resolve } = require("path");
const yargs = require("yargs");
const rimraf = require("rimraf");

tsNode.register({
dir: resolve(__dirname, "./generator")
Expand All @@ -12,7 +13,7 @@ const { App, AppConfig } = require("@webiny/docs-generator");
const { default: docsConfig } = require("./docs.config");

(async () => {
const { watch, watchOnly, version } = yargs
const { watch, watchOnly, version } = yargs()
.version(false)
.option("v", {
alias: "version",
Expand Down Expand Up @@ -49,7 +50,6 @@ const { default: docsConfig } = require("./docs.config");

try {
if (docsConfig.cleanOutputDir) {
const rimraf = require("rimraf");
console.log("Cleaning output directory...");
docsConfig.cleanOutputDir.forEach(dir => rimraf.sync(dir));
}
Expand Down
35 changes: 16 additions & 19 deletions generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,29 @@
"test": "jest --config=jest.config.js src/**/*.test.ts"
},
"dependencies": {
"@babel/parser": "^7.23.3",
"chalk": "^4.1.0",
"debounce": "^1.2.0",
"@babel/parser": "^7.29.7",
"chalk": "^4.1.2",
"debounce": "2.2.0",
"escape-html": "^1.0.3",
"execa": "^5.1.1",
"fs-extra": "^9.1.0",
"fs-extra": "^11.3.5",
"globby": "^11.1.0",
"jsdom": "^20.0.0",
"load-json-file": "^6.2.0",
"jsdom": "^29.1.1",
"md5": "^2.3.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"unist-util-visit": "^2.0.3",
"write-json-file": "^4.3.0",
"yargs": "^17.3.1"
"yargs": "^17.7.2"
},
"devDependencies": {
"@types/debounce": "^1.2.3",
"@types/escape-html": "^1.0.4",
"@types/fs-extra": "^9.0.13",
"@types/jest": "^29.5.4",
"@types/md5": "^2.3.4",
"@types/yargs": "^17.0.8",
"jest": "^29.6.4",
"ts-jest": "^29.1.1",
"ts-node": "^10.5.0",
"typescript": "^4.7.4"
"@types/fs-extra": "^11.0.4",
"@types/jest": "^30.0.0",
"@types/md5": "^2.3.6",
"@types/yargs": "^17.0.35",
"jest": "^30.4.2",
"ts-jest": "^29.4.11",
"ts-node": "^10.9.2",
"typescript": "^5.9.3"
}
}
2 changes: 1 addition & 1 deletion generator/src/app/AppConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class AppConfig {
}

getLinkValidator() {
return this.props.linkValidator || new LinkValidator(() => true);
return this.props.linkValidator || new LinkValidator([], () => true);
}

getMdxRemarkPlugins() {
Expand Down
4 changes: 2 additions & 2 deletions generator/src/app/MdxCompiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import React from 'react'
import { mdx } from '@mdx-js/react'
`;

type RemarkPlugin = () => (tree: Node, file: VFileOptions) => void;
type RemarkPlugin = (...args: any[]) => any;

export class MdxCompiler {
private compiler: any;
Expand All @@ -35,7 +35,7 @@ export class MdxCompiler {
];
}

async compile(file: VFileOptions) {
async compile(file: any) {
const compiler = this.getCompiler();

const { contents } = await compiler.process(file);
Expand Down
29 changes: 21 additions & 8 deletions generator/src/app/processors/LayoutProcessor.test.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,31 @@
import { LayoutProcessor } from "./LayoutProcessor";
import { MdxFile } from "../MdxFile";
import type { Stats } from "fs";

class TestMdxFile extends MdxFile {
protected type = "test";
}

function createMdxFile(contents: string): TestMdxFile {
return new TestMdxFile({
absolutePath: "/test/file.mdx",
rawBody: `---\ntitle: Test\ndescription: Test\n---\n${contents}`,
stats: {} as Stats
});
}

describe("LayoutProcessor", () => {
test("should add layout import statements", () => {
const input = "@/test/import";

const testOutput = [
"",
`// Add page layout to use with React.`,
`import { Layout as _Layout } from "${input}"`,
`export const Layout = _Layout;`
].join("\n");

const processor = new LayoutProcessor(input);
const result = processor.processMdx(createMdxFile(""));

expect(processor.process("")).toEqual(testOutput);
expect(result.getContents()).toContain(
`import { Layout as _Layout } from "${input}"`
);
expect(result.getContents()).toContain(
`export const Layout = _Layout;`
);
});
});
4 changes: 3 additions & 1 deletion generator/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"extends": "../tsconfig/tsconfig.json",
"include": ["./src"],
"exclude": ["node_modules", "../node_modules/zod"],
"compilerOptions": {
"rootDirs": ["."],
"baseUrl": ".",
"jsx": "react-jsx"
"jsx": "react-jsx",
"skipLibCheck": true
}
}
Loading