Skip to content

Commit

Permalink
Merge pull request #253 from webstudio-is/fix-esm-loader
Browse files Browse the repository at this point in the history
Fix esm loader
  • Loading branch information
andrasbacsai authored Sep 2, 2022
2 parents fc5066c + 30c66c3 commit af049f0
Show file tree
Hide file tree
Showing 4 changed files with 182 additions and 179 deletions.
1 change: 0 additions & 1 deletion apps/designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
"dotenv": "^16.0.0",
"esbuild-jest": "^0.5.0",
"esbuild-node-externals": "^1.4.1",
"esbuild-node-loader": "^0.8.0",
"jest": "^27.5.1",
"prettier": "^2.6.2",
"react-test-renderer": "^17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-sdk/bin/generate-arg-types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from "path";
import docgen from "react-docgen-typescript";
import { withCustomConfig } from "react-docgen-typescript";
import fg from "fast-glob";
import fs from "fs-extra";
import { propsToArgTypes } from "../src/arg-types/utils";
Expand Down Expand Up @@ -31,7 +31,7 @@ if (componentFiles.length === 0) {
}

// Create a parser with using your typescript config
const tsConfigParser = docgen.withCustomConfig(tsConfigPath, options);
const tsConfigParser = withCustomConfig(tsConfigPath, options);

// For each component file generate argTypes based on the propTypes
componentFiles.forEach((filePath) => {
Expand Down
13 changes: 7 additions & 6 deletions packages/react-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"scripts": {
"dev": "tsup src/index.ts --format esm,cjs --watch --out-dir=lib",
"build": "yarn build:mdn-data && yarn build:args && yarn build:lib",
"build:mdn-data": "node --experimental-loader esbuild-node-loader ./bin/mdn-data.ts ./src/css",
"build:args": "node --experimental-loader esbuild-node-loader ./bin/generate-arg-types.ts './src/components/*.tsx !./src/**/*.stories.tsx !./src/**/*.ws.tsx'",
"build:mdn-data": "tsx ./bin/mdn-data.ts ./src/css",
"build:args": "tsx ./bin/generate-arg-types.ts './src/components/*.tsx !./src/**/*.stories.tsx !./src/**/*.ws.tsx'",
"typecheck": "tsc --noEmit",
"build:lib": "rm -fr lib && tsc",
"test": "jest",
Expand All @@ -20,6 +20,7 @@
},
"devDependencies": {
"@babel/core": "^7.17.12",
"@esbuild-kit/esm-loader": "^2.4.2",
"@remix-run/react": "^1.2.3",
"@remix-run/server-runtime": "^1.2.3",
"@storybook/addon-actions": "^6.5.6",
Expand All @@ -33,19 +34,19 @@
"@types/css-tree": "^1.0.7",
"@types/fs-extra": "^9.0.13",
"@types/node": "^17.0.21",
"@webstudio-is/jest-config": "*",
"@webstudio-is/prisma-client": "*",
"babel-loader": "^8.2.5",
"camelcase": "^6.3.0",
"css-tree": "^2.1.0",
"esbuild": "^0.14.25",
"esbuild-node-externals": "^1.4.1",
"esbuild-node-loader": "^0.8.0",
"@webstudio-is/jest-config": "*",
"mdn-data": "2.0.23",
"react": "^17.0.2",
"react-docgen-typescript": "^2.2.2",
"react-dom": "^17.0.2",
"@webstudio-is/prisma-client": "*",
"tsup": "^6.1.3",
"tsx": "^3.9.0",
"typescript": "^4.6.2"
},
"peerDependencies": {
Expand All @@ -58,10 +59,10 @@
"dependencies": {
"@stitches/core": "^1.2.7",
"@webstudio-is/icons": "*",
"@webstudio-is/jest-config": "*",
"immer": "^9.0.12",
"mitt": "^3.0.0",
"react-nano-state": "^0.4.0",
"@webstudio-is/jest-config": "*",
"zod": "^3.17.3"
},
"main": "lib/index.js",
Expand Down
Loading

0 comments on commit af049f0

Please sign in to comment.