Skip to content

Commit

Permalink
Merge pull request #18 from moderntribe/chore/improve-dx
Browse files Browse the repository at this point in the history
Chore: PNPM to NPM; Project updated for framework DX updates
  • Loading branch information
bswatson authored Dec 6, 2022
2 parents c7b1371 + ec5d624 commit 7d3af2d
Show file tree
Hide file tree
Showing 8 changed files with 635 additions and 10,119 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@
"@wordpress/i18n-text-domain": [ "error", {
"allowedTextDomain": [ "wme-sitebuilder" ]
} ]
}
},
"parserOptions": {
"requireConfigFile": false
}
}
7 changes: 6 additions & 1 deletion assets/js/sitebuilder.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
/**
* Scripting for the SiteBuilder React App
*/
import '@moderntribe/sitebuilder';
import SiteBuilder from '@moderntribe/sitebuilder';

wp.element.render(
wp.element.createElement(SiteBuilder),
document.getElementById('sitebuilder-react'),
);
7 changes: 6 additions & 1 deletion assets/js/store-details.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
/**
* Scripting for the StoreBuilder React App
*/
import '@moderntribe/storebuilder';
import StoreBuilder from '@moderntribe/storebuilder';

wp.element.render(
wp.element.createElement(StoreBuilder),
document.getElementById('sitebuilder-store-details-react'),
);
1,253 changes: 581 additions & 672 deletions package-lock.json

Large diffs are not rendered by default.

36 changes: 17 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,50 +13,48 @@
"url": "https://github.com/moderntribe/wme-sitebuilder/issues/"
},
"scripts": {
"dev": "pnpm run development",
"dev": "npm run development",
"development": "mix",
"hot": "mix watch --hot",
"lint": "pnpm run lint:css && pnpm run lint:md && pnpm run lint:js",
"lint:fix": "pnpm run lint:css:fix && pnpm run lint:md:fix && pnpm run lint:js:fix",
"lint": "npm run lint:css && npm run lint:md && npm run lint:js",
"lint:fix": "npm run lint:css:fix && npm run lint:md:fix && npm run lint:js:fix",
"lint:css": "npx stylelint 'assets/{scss,css}/**/*.{scss,css}'",
"lint:css:fix": "npx stylelint --fix 'assets/{scss,css}/**/*.{scss,css}'",
"lint:md": "npx markdownlint-cli2 '**/*.md' '#node_modules' '#wme-sitebuilder/vendor' '#dist'",
"lint:md:fix": "npx markdownlint-cli2 --fix '**/*.md' '#node_modules' '#wme-sitebuilder/vendor'",
"lint:js": "npx eslint assets/js --ext .js,.jsx -c .eslintrc.json",
"lint:js:fix": "npx eslint assets/js --ext .js,.jsx -c .eslintrc.json --fix",
"preinstall": "npx only-allow pnpm",
"prod": "pnpm run production",
"preinstall": "npx only-allow npm",
"prod": "npm run production",
"production": "mix --production",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000"
},
"dependencies": {
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@moderntribe/sitebuilder": "^1.6.0-alpha.11",
"@moderntribe/storebuilder": "^1.4.2",
"@mui/icons-material": "^5.10.9",
"@mui/lab": "^5.0.0-alpha.103",
"@mui/material": "^5.10.9",
"@mui/lab": "^5.0.0-alpha.107",
"@mui/material": "^5.10.13",
"@mui/utils": "^5.10.9",
"@wordpress/html-entities": "^3.19.0",
"@wordpress/html-entities": "^3.21.0",
"prettier": "^2.7.1",
"react": "^18.2.0",
"react-dom": "18.2.0",
"react-router-dom": "^6.4.2"
"react-router-dom": "^6.4.3"
},
"devDependencies": {
"@babel/core": "^7.19.3",
"@babel/core": "^7.20.5",
"@babel/preset-react": "^7.18.6",
"@wordpress/element": "^4.17.0",
"@wordpress/element": "^4.20.0",
"@wordpress/eslint-plugin": "^12.9.0",
"@wordpress/i18n": "^4.19.0",
"@wordpress/i18n": "^4.21.0",
"@wordpress/stylelint-config": "^19.1.0",
"browser-sync": "^2.27.10",
"browser-sync-webpack-plugin": "^2.3.0",
"eslint": "^8.25.0",
"eslint": "^8.27.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-vue": "^9.6.0",
"eslint-plugin-vue": "^9.7.0",
"eslint-webpack-plugin": "^3.2.0",
"laravel-mix": "^6.0.49",
"laravel-mix-eslint": "^0.2.0",
Expand All @@ -72,7 +70,7 @@
"stylelint-a11y": "^1.2.3",
"stylelint-config-recess-order": "^2.6.0",
"stylelint-config-standard": "^22.0.0",
"stylelint-declaration-block-no-ignored-properties": "^2.5.0",
"stylelint-declaration-block-no-ignored-properties": "^2.6.0",
"stylelint-order": "^4.1.0",
"underscore": "^1.13.6",
"webpack": "^5.74.0",
Expand Down
Loading

0 comments on commit 7d3af2d

Please sign in to comment.