Skip to content

Commit

Permalink
[mono] Fix deps, dedupe, update some pkg builds
Browse files Browse the repository at this point in the history
These are part of a long journey to pnpm.

Important note: the yarn.lock had to be run through yarn-deduplicate.

Also had to update yarn.lock in wab (why?!), and run it through yarn-deduplicate too.

Change-Id: I39c87804fb871d7014f6b421e12da9a0e9f30b1a
GitOrigin-RevId: 494790328ce8fe1539cdfb1b3a97f382eba6a5ad
  • Loading branch information
yang authored and Copybara committed Oct 31, 2023
1 parent 4009a79 commit a24078a
Show file tree
Hide file tree
Showing 36 changed files with 2,954 additions and 812 deletions.
5 changes: 5 additions & 0 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
"prepare": "if-env PREPARE_NO_BUILD=true || yarn build"
},
"devDependencies": {
"@types/node-fetch": "^2.6.7",
"@types/babel__core": "^7.20.3",
"@types/babel__generator": "^7.6.6",
"@types/babel__traverse": "^7.20.3",
"@babel/types": "^7.23.0",
"@babel/core": "^7.12.3",
"@babel/generator": "^7.12.1",
"@babel/parser": "^7.12.3",
Expand Down
3 changes: 3 additions & 0 deletions packages/loader-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
"limit": "10 KB"
}
],
"devDependencies": {
"@types/node": "^20.8.9"
},
"dependencies": {
"@plasmicapp/isomorphic-unfetch": "1.0.3",
"@plasmicapp/loader-fetcher": "1.0.37"
Expand Down
4 changes: 4 additions & 0 deletions packages/loader-fetcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
"dependencies": {
"@plasmicapp/isomorphic-unfetch": "1.0.3"
},
"devDependencies": {
"@types/node": "^20.8.9",
"typescript": "^5.2.2"
},
"publishConfig": {
"access": "public"
},
Expand Down
1 change: 1 addition & 0 deletions packages/loader-gatsby/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
},
"devDependencies": {
"@types/lodash": "^4.14.195",
"@types/react-dom": "^18.2.14",
"gatsby": "^5.11.0"
},
"dependencies": {
Expand Down
2 changes: 2 additions & 0 deletions packages/loader-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"@plasmicapp/data-sources-context": "0.1.17",
"@plasmicapp/host": "1.0.177",
"@plasmicapp/loader-core": "1.0.115",
"@plasmicapp/loader-fetcher": "1.0.37",
"@plasmicapp/loader-splits": "1.0.43",
"@plasmicapp/prepass": "1.0.9",
"@plasmicapp/query": "0.1.74",
Expand All @@ -78,6 +79,7 @@
}
],
"devDependencies": {
"@types/node": "^20.8.9",
"@types/pascalcase": "^1.0.0",
"@types/react": "^18.0.27",
"@types/react-dom": "^18.0.10",
Expand Down
3 changes: 3 additions & 0 deletions packages/prepass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
"lint": "eslint",
"prepare": "if-env PREPARE_NO_BUILD=true || yarn build"
},
"devDependencies": {
"@types/react": "^18.2.33"
},
"dependencies": {
"@plasmicapp/query": "0.1.74",
"@plasmicapp/react-ssr-prepass": "2.0.3"
Expand Down
1 change: 1 addition & 0 deletions plasmicpkgs/airtable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@plasmicapp/host": "1.0.177",
"@size-limit/preset-small-lib": "^4.11.0",
"@types/node": "^14.0.26",
"@types/react": "^18.2.33",
"size-limit": "^4.11.0",
"tsdx": "^0.14.1",
"tslib": "^2.2.0"
Expand Down
10 changes: 8 additions & 2 deletions plasmicpkgs/antd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
],
"scripts": {
"build": "rollup -c rollup.config.mjs && yarn copy_css_files && yarn gentypes",
"gentypes": "yarn tsc --emitDeclarationOnly --declaration src/index.ts --incremental --tsBuildInfoFile ./dist/.tsbuildinfo --skipLibCheck --jsx react --esModuleInterop --strict --outDir ./dist/ && cp ./dist/*.d.ts skinny/ && rm skinny/index.d.ts",
"gentypes": "yarn tsc --emitDeclarationOnly --declaration src/index.ts --incremental --tsBuildInfoFile ./dist/.tsbuildinfo --skipLibCheck --jsx react --lib dom,es2019 --esModuleInterop --strict --outDir ./dist/ && cp ./dist/*.d.ts skinny/ && rm skinny/index.d.ts",
"prepare": "if-env PREPARE_NO_BUILD=true || yarn build",
"copy_css_files": "cp src/*.css dist/",
"size": "size-limit",
Expand All @@ -64,13 +64,19 @@
"@rollup/plugin-json": "^4.0.0",
"@rollup/plugin-node-resolve": "^9.0.0",
"@size-limit/preset-small-lib": "^4.11.0",
"@types/glob": "^7.1.3",
"@types/node": "^14.0.26",
"@types/react": "^18.2.33",
"glob": "^7.1.3",
"rc-menu": "~9.8.0",
"rc-select": "~14.1.17",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup": "^3.10.1",
"rollup-plugin-esbuild": "^5.0.0",
"rollup-plugin-replace-imports": "^1.0.0",
"size-limit": "^4.11.0"
"size-limit": "^4.11.0",
"typescript": "^5.2.2"
},
"peerDependencies": {
"@plasmicapp/host": ">=1.0.0",
Expand Down
8 changes: 7 additions & 1 deletion plasmicpkgs/antd5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
}
],
"scripts": {
"build": "rollup -c rollup.config.mjs && yarn tsc --emitDeclarationOnly --declaration src/index.ts --incremental --tsBuildInfoFile ./dist/.tsbuildinfo --skipLibCheck --jsx react --esModuleInterop --strict --outDir ./dist/ && cp ./dist/*.d.ts skinny/ && rm skinny/index.d.ts",
"build": "rollup -c rollup.config.mjs && yarn tsc --emitDeclarationOnly --declaration src/index.ts --incremental --tsBuildInfoFile ./dist/.tsbuildinfo --skipLibCheck --jsx react --lib dom,esnext --esModuleInterop --strict --outDir ./dist/ && cp ./dist/*.d.ts skinny/ && rm skinny/index.d.ts",
"prepare": "if-env PREPARE_NO_BUILD=true || yarn build",
"clean": "rm -rf dist/ skinny/*.ts skinny/*.map skinny/*.js",
"storybook": "storybook dev -p 6006",
Expand All @@ -56,6 +56,9 @@
},
"dependencies": {
"antd": "^5.7.3",
"classnames": "^2.3.2",
"dayjs": "^1.11.10",
"fast-deep-equal": "^3.1.3",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand All @@ -80,10 +83,13 @@
"@storybook/react-webpack5": "^7.4.0",
"@storybook/test-runner": "^0.13.0",
"@storybook/testing-library": "^0.0.13",
"@types/lodash": "^4.14.200",
"@types/node": "^14.0.26",
"@types/react": "^18.0.27",
"@types/react-dom": "^18.0.10",
"glob": "^8.1.0",
"rc-input-number": "^8.1.0",
"rc-menu": "^9.12.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup": "^3.10.1",
Expand Down
16 changes: 12 additions & 4 deletions plasmicpkgs/chakra-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"scripts": {
"start": "tsdx watch",
"build": "tsdx build",
"build": "rollup -c rollup.config.mjs && yarn tsc --emitDeclarationOnly --declaration src/index.ts --incremental --tsBuildInfoFile ./dist/.tsbuildinfo --skipLibCheck --jsx react --esModuleInterop --strict --outDir ./dist/",
"test": "yarn --cwd=../.. test --passWithNoTests",
"lint": "tsdx lint",
"prepare": "if-env PREPARE_NO_BUILD=true || yarn build",
Expand All @@ -38,13 +38,21 @@
"@plasmicapp/host": "1.0.76",
"@size-limit/preset-small-lib": "^4.11.0",
"@types/node": "^14.0.26",
"@types/react": "^18.2.33",
"@types/react-dom": "^18.2.14",
"@rollup/plugin-commonjs": "^25.0.2",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.1.0",
"rollup": "^3.26.2",
"rollup-plugin-esbuild": "^5.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"size-limit": "^4.11.0",
"tsdx": "^0.14.1"
"tsdx": "^0.14.1",
"tslib": "^2.6.2",
"typescript": "^5.2.2"
},
"dependencies": {
"@chakra-ui/react": "^2.2.8",
"react": ">=16.8.0"
"@chakra-ui/react": "^2.8.1"
}
}
43 changes: 43 additions & 0 deletions plasmicpkgs/chakra-ui/rollup.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import commonjs from "@rollup/plugin-commonjs";
import json from "@rollup/plugin-json";
import resolve from "@rollup/plugin-node-resolve";
import path from "path";
import esbuild from "rollup-plugin-esbuild";

export default [
{
input: ["./src/index.ts"],
external: (id) => {
if (id.startsWith("regenerator-runtime") || id.startsWith("tslib")) {
return false;
}
return !id.startsWith(".") && !path.isAbsolute(id);
},
output: [
{
file: "dist/index.js",
format: "cjs",
sourcemap: true,
exports: "named",
interop: "auto",
},
{
file: "dist/plasmic-chakra-ui.esm.js",
format: "esm",
sourcemap: true,
exports: "named",
interop: "auto",
},
],
plugins: [
resolve(),
commonjs(),
json(),
esbuild({
loaders: {
".json": "json",
},
}),
],
},
];
3 changes: 3 additions & 0 deletions plasmicpkgs/commerce-providers/commercetools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@
},
"dependencies": {
"@commercetools/platform-sdk": "^2.8.0",
"@commercetools/sdk-client-v2": "^2.2.2",
"@commercetools/ts-sdk-apm": "^1.0.2",
"@plasmicpkgs/commerce": "0.0.174",
"@types/react": "^18.0.27",
"js-cookie": "^3.0.5",
"qs": "^6.11.0"
},
"publishConfig": {
Expand Down
4 changes: 3 additions & 1 deletion plasmicpkgs/commerce-providers/saleor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
},
"dependencies": {
"@plasmicpkgs/commerce": "0.0.174",
"debounce": "^1.2.1"
"debounce": "^1.2.1",
"js-cookie": "^3.0.5"
},
"peerDependencies": {
"next": "^12",
Expand All @@ -29,6 +30,7 @@
"@plasmicapp/host": "1.0.177",
"@size-limit/preset-small-lib": "^7.0.8",
"@types/debounce": "^1.2.1",
"@types/js-cookie": "^3.0.5",
"@types/node": "^17.0.8",
"@types/react": "^18.0.27",
"next": "^12.0.8",
Expand Down
4 changes: 3 additions & 1 deletion plasmicpkgs/commerce-providers/shopify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"devDependencies": {
"@plasmicapp/host": "1.0.177",
"@size-limit/preset-small-lib": "^4.11.0",
"@types/debounce": "^1.2.3",
"@types/js-cookie": "^3.0.1",
"@types/node": "^14.0.26",
"react": "^18.2.0",
Expand All @@ -34,6 +35,7 @@
"dependencies": {
"@plasmicpkgs/commerce": "0.0.174",
"@types/react": "^18.0.27",
"debounce": "^1.2.1"
"debounce": "^1.2.1",
"js-cookie": "^3.0.5"
}
}
2 changes: 2 additions & 0 deletions plasmicpkgs/commerce-providers/swell/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"@plasmicapp/host": "1.0.177",
"@size-limit/preset-small-lib": "^4.11.0",
"@types/js-cookie": "^3.0.1",
"@types/debounce": "^1.2.3",
"@types/node": "^14.0.26",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -35,6 +36,7 @@
"@plasmicpkgs/commerce": "0.0.174",
"@types/react": "^18.0.27",
"debounce": "^1.2.1",
"js-cookie": "^3.0.5",
"swell-js": "^3.13.0"
}
}
1 change: 1 addition & 0 deletions plasmicpkgs/framer-motion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@plasmicapp/host": "1.0.177",
"@size-limit/preset-small-lib": "^7.0.0",
"@types/node": "^14.0.26",
"@types/react": "^18.2.33",
"size-limit": "^7.0.0",
"tsdx": "^0.14.1",
"tslib": "^2.2.0"
Expand Down
2 changes: 1 addition & 1 deletion plasmicpkgs/framer-motion/src/AnimatedLetters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default function AnimatedLetters({
<motion.span
key={i}
custom={i}
style={{ display: "inline-block" }}
style={{ display: "inline-block" } as any}
variants={letterVariants}
>
{letter === " " ? "\u00a0" : letter}
Expand Down
1 change: 1 addition & 0 deletions plasmicpkgs/lottie-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@plasmicapp/host": "1.0.177",
"@size-limit/preset-small-lib": "^4.11.0",
"@types/node": "^14.0.26",
"@types/react": "^18.2.33",
"size-limit": "^4.11.0",
"tsdx": "^0.14.1",
"tslib": "^2.2.0"
Expand Down
1 change: 1 addition & 0 deletions plasmicpkgs/plasmic-cms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"@plasmicapp/query": "0.1.74",
"@size-limit/preset-small-lib": "^7.0.8",
"@types/node": "^17.0.14",
"@types/react": "^18.2.33",
"size-limit": "^7.0.8",
"tsdx": "^0.14.1",
"tslib": "^2.3.1"
Expand Down
1 change: 1 addition & 0 deletions plasmicpkgs/plasmic-embed-css/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@plasmicapp/host": "1.0.177",
"@size-limit/preset-small-lib": "^7.0.8",
"@types/node": "^17.0.14",
"@types/react": "^18.2.33",
"size-limit": "^7.0.8",
"tsdx": "^0.14.1",
"tslib": "^2.3.1"
Expand Down
1 change: 1 addition & 0 deletions plasmicpkgs/plasmic-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"@plasmicapp/query": "0.1.74",
"@size-limit/preset-small-lib": "^4.11.0",
"@types/node": "^14.0.26",
"@types/react": "^18.2.33",
"size-limit": "^4.11.0",
"tsdx": "^0.14.1",
"tslib": "^2.2.0"
Expand Down
18 changes: 9 additions & 9 deletions plasmicpkgs/plasmic-rich-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
}
],
"scripts": {
"build": "rollup -c rollup.config.mjs && yarn tsc --emitDeclarationOnly --declaration src/index.tsx --incremental --tsBuildInfoFile ./dist/.tsbuildinfo --skipLibCheck --jsx react --esModuleInterop --strict --outDir ./dist/",
"start": "tsdx watch",
"build": "rollup -c rollup.config.mjs && yarn tsc --emitDeclarationOnly --declaration src/index.tsx --incremental --tsBuildInfoFile ./dist/.tsbuildinfo --skipLibCheck --jsx react --lib dom,esnext --esModuleInterop --strict --outDir ./dist/",
"test": "yarn --cwd=../.. test --passWithNoTests",
"lint": "tsdx lint",
"prepare": "if-env PREPARE_NO_BUILD=true || yarn build",
"size": "size-limit",
"analyze": "size-limit --why"
Expand All @@ -39,15 +37,15 @@
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.1.0",
"@size-limit/preset-small-lib": "^4.11.0",
"@types/luxon": "^3.3.1",
"@types/node": "^14.0.26",
"@types/lodash": "^4.14.200",
"@types/node": "^20.8.9",
"@types/react": "^18.2.33",
"antd": "^5.4.0",
"rollup": "^3.26.2",
"rollup-plugin-esbuild": "^5.0.0",
"size-limit": "^4.11.0",
"tsdx": "^0.14.1",
"tslib": "^2.2.0",
"typescript": "^4"
"typescript": "^5.2.2"
},
"peerDependencies": {
"@ant-design/icons": ">=5.0.0",
Expand All @@ -62,10 +60,12 @@
"access": "public"
},
"dependencies": {
"@ctrl/tinycolor": "^3.6.1",
"@plasmicpkgs/luxon-parser": "^3.4.4",
"classnames": "^2.3.2",
"csv-writer-browser": "^1.0.0",
"dayjs": "^1.11.10",
"fast-stringify": "^2.0.0",
"lodash": "^4.17.21",
"tinycolor2": "^1.6.0"
"lodash": "^4.17.21"
}
}
1 change: 1 addition & 0 deletions plasmicpkgs/plasmic-sanity-io/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"@size-limit/preset-small-lib": "^7.0.8",
"@types/dlv": "^1.1.2",
"@types/node": "^17.0.14",
"@types/react": "^18.2.33",
"size-limit": "^7.0.8",
"tsdx": "^0.14.1",
"tslib": "^2.3.1"
Expand Down
1 change: 1 addition & 0 deletions plasmicpkgs/plasmic-tabs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"tslib": "^2.3.1"
},
"dependencies": {
"@plasmicapp/host": "*",
"constate": "^3.3.2"
}
}
Loading

0 comments on commit a24078a

Please sign in to comment.