Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3148a2b
chore: run yarn-deduplicate
jaslong Feb 6, 2025
a4ec65b
feat(data-sources): add server queries server exec function to package
IcaroG Jan 31, 2025
6fa5484
Publish
Feb 6, 2025
b0b5938
upgrade-internal
Feb 6, 2025
2f8a215
refactor(site-invaraints): use common variant key function to identif…
asimkhan73301 Feb 6, 2025
b3422f2
change zoom to fit name in context menu
jaslong Feb 6, 2025
a9068a9
fix: do not sort observable array
jaslong Feb 7, 2025
336b388
fix(DataProvider): don't create new context value on every render
jtomaszewski Feb 5, 2025
c1fc394
refactor: small changs to DataProvider
IcaroG Feb 6, 2025
63c32c5
Publish
Feb 7, 2025
779a9cd
upgrade-internal
Feb 7, 2025
2ef4cf1
refactor: refactored zoom-to-fit logic to accept a DOM element
abbas-nazar Feb 7, 2025
03bda3a
feat: add comment from tpl tree on canvas
abbas-nazar Feb 7, 2025
0503d9d
chore: update yarn.lock
jaslong Feb 7, 2025
a8b45d0
Turn off componentThumbnails for admins
jaslong Feb 8, 2025
0d11449
first commit - implemented confirm feature when deleting entry
hyunnbunt Feb 1, 2025
1130d2d
Used entryDisplayName for confirmation
hyunnbunt Feb 2, 2025
35fda7b
Implemented confirmation feature for deleting model
hyunnbunt Feb 2, 2025
aedfc68
fix(components): fix extract component crashing studio when trying to…
IcaroG Feb 6, 2025
70ba754
fix(variants): ensure component has unique interaction variant in the…
asimkhan73301 Feb 7, 2025
4c1a932
feat(create-plasmic-app): change react codegen from create-react-app …
asimkhan73301 Feb 10, 2025
f9f6b01
Publish
Feb 12, 2025
6122bb5
fix(fake-nodes): Use correct env for fake nodes
FMota0 Feb 11, 2025
2e5eb0a
test(rac): component testing with storybook
sarahsga Feb 11, 2025
cf020f7
fix(rac): Undo non-test changes
sarahsga Feb 11, 2025
d3f99d2
Publish
Feb 12, 2025
8ca4168
upgrade-internal
Feb 12, 2025
866c88b
chore(create-plasmic-app): update the CRA label to Vite
asimkhan73301 Feb 13, 2025
9eb3997
fix: prevent __proto__ assignment via implicit string
IcaroG Feb 12, 2025
b804809
fix(branching): Prefill version after branching merge
FMota0 Feb 12, 2025
434a8ce
Publish
Feb 13, 2025
7be4c7e
upgrade-internal
Feb 13, 2025
909b3fe
feat(host): Include jsxRuntime and jsxDevRuntime in host
FMota0 Feb 13, 2025
ae67e7a
Publish
Feb 13, 2025
a6974ec
upgrade-internal
Feb 13, 2025
2eb7812
hoist jest and storybook packages
jaslong Feb 12, 2025
6ac18cf
fix create-plasmic-app package
jaslong Feb 12, 2025
b52ae89
fix most react-web storybook tests
jaslong Feb 12, 2025
458d670
fix and skip antd5 tests
jaslong Feb 13, 2025
e2619fd
update react-aria .storybook/main.js to .ts
jaslong Feb 13, 2025
8a4819e
Publish
Feb 14, 2025
0ba0606
upgrade-internal
Feb 14, 2025
39b3afc
chore: disable truncation for better error messages while developing
IcaroG Feb 11, 2025
e185253
feat(model): add ColorPropType to param types
IcaroG Feb 11, 2025
30f8daf
fix(parser): fix trailing comma on objects when parsing expression
IcaroG Feb 11, 2025
386ee3e
feat(components): add Color prop type to Plasmic components
IcaroG Feb 11, 2025
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
18 changes: 16 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@
"upgrade-internal": "bash scripts/upgrade-internal.bash"
},
"resolutions": {
"eslint": "^8.55.0"
"eslint": "^8.55.0",
"jest": "29.7.0"
},
"packageManager": "yarn@1.22.21",
"devDependencies": {
"@microsoft/api-extractor": "7.38.2",
"@testing-library/react": "16.2.0",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"esbuild": "0.17.18",
Expand All @@ -51,12 +53,24 @@
"eslint-plugin-react": "^7.33.2",
"if-env": "^1.0.4",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"lerna": "^7.4.2",
"nx": "^16",
"prettier": "2.8.8",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "5.2.2"
"typescript": "5.2.2",
"storybook": "8.5.5",
"storybook-addon-mock": "5.0.0",
"@storybook/addon-essentials": "8.5.5",
"@storybook/addon-interactions": "8.5.5",
"@storybook/addon-links": "8.5.5",
"@storybook/addon-webpack5-compiler-swc": "2.1.0",
"@storybook/react": "8.5.5",
"@storybook/react-webpack5": "8.5.5",
"@storybook/test": "8.5.5",
"@storybook/test-runner": "0.21.0",
"@storybook/testing-library": "0.2.2"
},
"workspaces": [
"packages/auth-api",
Expand Down
15 changes: 0 additions & 15 deletions packages/create-plasmic-app/.eslintrc.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import js from '@eslint/js'
import globals from 'globals'
import react from 'eslint-plugin-react'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'

export default [
{ ignores: ['dist'] },
{
files: ['**/*.{js,jsx}'],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
parserOptions: {
ecmaVersion: 'latest',
ecmaFeatures: { jsx: true },
sourceType: 'module',
},
},
settings: { react: { version: '18.3' } },
plugins: {
react,
'react-hooks': reactHooks,
'react-refresh': reactRefresh,
},
rules: {
...js.configs.recommended.rules,
...react.configs.recommended.rules,
...react.configs['jsx-runtime'].rules,
...reactHooks.configs.recommended.rules,
'react/jsx-no-target-blank': 'off',
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
},
]
54 changes: 22 additions & 32 deletions packages/create-plasmic-app/cpa-out/react-codegen-js/package.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,30 @@
{
"name": "react-codegen-js",
"version": "0.1.0",
"private": true,
"dependencies": {
"@plasmicapp/cli": "^0.1.231",
"@plasmicapp/react-web": "^0.2.174",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^13.0.0",
"@testing-library/user-event": "^13.2.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.0"
},
"version": "0.0.0",
"type": "module",
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"dev": "vite",
"build": "vite build",
"lint": "eslint .",
"preview": "vite preview"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
"dependencies": {
"@plasmicapp/cli": "^0.1.335",
"@plasmicapp/react-web": "^0.2.366",
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
"devDependencies": {
"@eslint/js": "^9.19.0",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@vitejs/plugin-react": "^4.3.4",
"eslint": "^9.19.0",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.18",
"globals": "^15.14.0",
"vite": "^6.1.0"
}
}
26 changes: 16 additions & 10 deletions packages/create-plasmic-app/cpa-out/react-codegen-js/plasmic.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"defaultStyleCssFilePath": "plasmic/plasmic__default_style.css"
},
"images": {
"scheme": "files",
"publicDir": "../../public",
"scheme": "inlined",
"publicDir": "../public",
"publicUrlPrefix": "/static/"
},
"tokens": {
Expand All @@ -26,7 +26,7 @@
"projectApiToken": "7BRFratDxPLMGZHnd2grV5QP6mlHcZ1AK3BJSIeh7xzUlHgWh25XpgXvUaKAqHXFMXQQuzpADqboibF6nqNWQ",
"projectName": "create-plasmic-app",
"version": "latest",
"cssFilePath": "plasmic/create_plasmic_app/plasmic_create_plasmic_app.module.css",
"cssFilePath": "plasmic/create_plasmic_app/plasmic.module.css",
"components": [
{
"id": "6uuAAE1jiCew",
Expand All @@ -39,7 +39,8 @@
},
"cssFilePath": "plasmic/create_plasmic_app/PlasmicHomepage.module.css",
"scheme": "blackbox",
"componentType": "page"
"componentType": "page",
"path": "/"
},
{
"id": "AO44A-w7hh",
Expand All @@ -52,7 +53,8 @@
},
"cssFilePath": "plasmic/create_plasmic_app/PlasmicDynamicPage.module.css",
"scheme": "blackbox",
"componentType": "page"
"componentType": "page",
"path": "/dynamic/[slug]"
},
{
"id": "TQcvW_pSKi3",
Expand Down Expand Up @@ -85,8 +87,8 @@
"icons": [
{
"id": "gj-_D7n31Ho",
"name": "ChecksvgIcon",
"moduleFilePath": "plasmic/create_plasmic_app/icons/PlasmicIcon__Checksvg.jsx"
"name": "CheckSvgIcon",
"moduleFilePath": "plasmic/create_plasmic_app/icons/PlasmicIcon__CheckSvg.jsx"
},
{
"id": "6PNxx3YMyDQ",
Expand All @@ -97,18 +99,22 @@
"images": [],
"indirect": false,
"globalContextsFilePath": "",
"splitsProviderFilePath": "",
"codeComponents": [
{
"id": "P6aGdYWZ2R",
"name": "PlasmicHead",
"displayName": "hostless-plasmic-head",
"componentImportPath": "@plasmicapp/react-web"
},
{
"id": "8G2A-uTjGa",
"name": "Fetcher",
"displayName": "plasmic-data-source-fetcher",
"componentImportPath": "@plasmicapp/react-web/lib/data-sources"
}
]
],
"customFunctions": []
}
],
"globalVariants": {
Expand All @@ -122,6 +128,6 @@
]
},
"wrapPagesWithGlobalContexts": true,
"cliVersion": "0.1.231",
"$schema": "https://unpkg.com/@plasmicapp/cli@0.1.231/dist/plasmic.schema.json"
"cliVersion": "0.1.335",
"$schema": "https://unpkg.com/@plasmicapp/cli@0.1.335/dist/plasmic.schema.json"
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

import Homepage from './components/Homepage';


function App() {
return (<Homepage />);
}

export default App;

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@ function Button_(props, ref) {

const Button = React.forwardRef(Button_);

export default Object.assign(Button, {
__plumeType: "button"
});
export default Object.assign(Button, { __plumeType: "button" });
Loading