Skip to content

Commit

Permalink
fix: update deps, add jsx options
Browse files Browse the repository at this point in the history
  • Loading branch information
izatop committed Jun 30, 2023
1 parent 7ff7250 commit dae1e81
Show file tree
Hide file tree
Showing 192 changed files with 743 additions and 1,395 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/del-npm-6.1.1-9285f60bfd-563288b73b.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/nopt-npm-7.1.0-8189bf0f5a-77185170d4.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/nx-npm-15.9.2-122222b894-5154d8a764.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/q-npm-1.5.1-a28b3cfeaf-147baa93c8.zip
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/read-npm-1.0.7-950ec74ca8-2777c254e5.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/uuid-npm-8.3.2-eca0baba53-5575a8a75c.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useWorkspaces": true,
"command": {
"version": {
"allowBranch": "master",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
},
"devDependencies": {
"@types/jest": "^29.5.2",
"@typescript-eslint/eslint-plugin": "^5.60.0",
"@typescript-eslint/parser": "^5.60.0",
"@typescript-eslint/eslint-plugin": "^5.60.1",
"@typescript-eslint/parser": "^5.60.1",
"coveralls": "^3.1.1",
"eslint": "^8.43.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-unused-imports": "^2.0.0",
"jest": "^29.5.0",
"jest-serializer-path": "^0.1.15",
"lerna": "^6.6.2",
"lerna": "^7.1.1",
"react": "^18.2.0",
"rimraf": "^5.0.1",
"ts-jest": "^29.1.0",
"typescript": "^5.1.3"
"ts-jest": "^29.1.1",
"typescript": "^5.1.6"
},
"license": "MIT",
"packageManager": "[email protected]"
Expand Down
8 changes: 4 additions & 4 deletions packages/bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"dependencies": {
"@types/glob": "^8.1.0",
"dotenv": "^16.3.1",
"esbuild": "^0.18.6",
"glob": "^10.3.0",
"esbuild": "^0.18.10",
"glob": "^10.3.1",
"path-to-regexp": "^6.2.1",
"watcher": "^2.2.2"
},
"devDependencies": {
"@types/node": "^20.3.1",
"typescript-json-schema": "^0.57.0"
"@types/node": "^20.3.2",
"typescript-json-schema": "^0.58.1"
},
"publishConfig": {
"access": "public"
Expand Down
36 changes: 33 additions & 3 deletions packages/bundle/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@
},
"type": "array"
},
"jsx": {
"$ref": "#/definitions/IJSXOptions"
},
"loader": {
"additionalProperties": {
"$ref": "#/definitions/Loader"
Expand Down Expand Up @@ -162,6 +165,34 @@
},
"type": "object"
},
"IJSXOptions": {
"properties": {
"dev": {
"type": "boolean"
},
"factory": {
"type": "string"
},
"fragment": {
"type": "string"
},
"importSource": {
"type": "string"
},
"jsx": {
"enum": [
"automatic",
"preserve",
"transform"
],
"type": "string"
},
"sideEffects": {
"type": "boolean"
}
},
"type": "object"
},
"IPWAApplicationConfig": {
"properties": {
"bundle": {
Expand All @@ -187,6 +218,7 @@
"css",
"dataurl",
"default",
"empty",
"file",
"js",
"json",
Expand Down Expand Up @@ -217,9 +249,7 @@
},
"attach": {
"items": {
"enum": [
"stylesheet"
],
"const": "stylesheet",
"type": "string"
},
"type": "array"
Expand Down
7 changes: 7 additions & 0 deletions packages/bundle/src/build/BundleScript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export class BundleScript {
variables = {},
environment = [],
envFiles = [],
jsx = {},
entry: {paths: entryPoints},
...options
} = this.#config;
Expand Down Expand Up @@ -133,6 +134,12 @@ export class BundleScript {
plugins,
sourcemap,
entryPoints,
jsx: jsx.jsx,
jsxDev: jsx.dev,
jsxFactory: jsx.factory,
jsxFragment: jsx.fragment,
jsxImportSource: jsx.importSource,
jsxSideEffects: jsx.sideEffects,
entryNames: paths.entry,
chunkNames: paths.chunk,
assetNames: paths.asset,
Expand Down
11 changes: 11 additions & 0 deletions packages/bundle/src/build/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ export interface IPWAApplicationConfig {
manifest: PWAManifest;
}

export interface IJSXOptions {
jsx?: "transform" | "preserve" | "automatic";
dev?: boolean;
factory?: string;
fragment?: string;
importSource?: string;
sideEffects?: boolean;
}

export interface IBundleConfig {
id?: string | number;
bundle?: boolean;
Expand Down Expand Up @@ -38,6 +47,8 @@ export interface IBundleConfig {
chunk?: string;
entry?: string;
};

jsx?: IJSXOptions;
}

export interface IBundleScriptConfig extends IBundleConfig {
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@graphql-tools/graphql-file-loader": "^8.0.0",
"@graphql-tools/load": "^8.0.0",
"@reform/bundle": "^0.13.2",
"@types/node": "^20.3.1",
"graphql": "^16.7.0",
"@types/node": "^20.3.2",
"graphql": "^16.7.1",
"graphql-tag": "^2.12.6"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/html/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
},
"dependencies": {
"@reform/bundle": "^0.13.2",
"@types/node": "^20.3.1",
"@types/node": "^20.3.2",
"@types/parse5": "^7.0.0",
"esbuild": "^0.18.6",
"esbuild": "^0.18.10",
"parse5": "^7.1.2"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@reform/bundle": "^0.13.2",
"@types/node": "^20.3.1",
"@types/node": "^20.3.2",
"@types/node-sass": "^4.11.3",
"node-sass": "^9.0.0"
},
Expand Down
3 changes: 3 additions & 0 deletions packages/test/bundle.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"target": [
"es2020"
],
"jsx": {
"jsx": "automatic"
},
"environment": [
"TEST",
"UNDEFINED_VAR"
Expand Down
6 changes: 3 additions & 3 deletions packages/test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"devDependencies": {
"@fortawesome/fontawesome-free": "^6.4.0",
"@reform/bundle": "^0.13.2",
"esbuild": "^0.18.6",
"graphql": "^16.7.0"
"esbuild": "^0.18.10",
"graphql": "^16.7.1"
},
"author": {
"name": "Artur Bier",
Expand All @@ -20,7 +20,7 @@
"private": true,
"license": "MIT",
"dependencies": {
"@types/react": "^18.2.13",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"react": "^18.2.0",
"react-dom": "^18.2.0"
Expand Down
1 change: 0 additions & 1 deletion packages/test/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import "./index.scss";
import * as React from "react";
import {render} from "react-dom";
import {Hello} from "./page/Hello";

Expand Down
1 change: 0 additions & 1 deletion packages/test/src/page/Card.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import "./Card.scss";

export const Card: React.FC = () => {
Expand Down
1 change: 0 additions & 1 deletion packages/test/src/page/Hello.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from "react";
import {HelloQuery} from "../query";
import icon from "../icons/icon.png";
import svg from "../icons/icon.svg";
Expand Down
1 change: 1 addition & 0 deletions packages/test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"compilerOptions": {
"outDir": "dist",
"rootDir": "src",
"jsx": "react-jsx",
"lib": [
"ES2022",
"DOM"
Expand Down
Loading

0 comments on commit dae1e81

Please sign in to comment.