Skip to content

Commit

Permalink
Merge branch 'main' into try/9478-eye-dropper
Browse files Browse the repository at this point in the history
  • Loading branch information
timarney committed Jun 21, 2022
2 parents ac92469 + 32a1da4 commit 1d98c46
Show file tree
Hide file tree
Showing 9 changed files with 590 additions and 232 deletions.
51 changes: 49 additions & 2 deletions .phpstorm.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,54 @@
// eslint-disable-next-line no-undef -- Special global in IntelliJ.
System.config({
paths: {
'@googleforcreators/*': './packages/*/src',
'@web-stories-wp/*': './packages/*/src',
// Published Packages
'@googleforcreators/animation': './packages/animation/src',
'@googleforcreators/dashboard': './packages/dashboard/src',
'@googleforcreators/date': './packages/date/src',
'@googleforcreators/design-system': './packages/design-system/src',
'@googleforcreators/dom': './packages/dom/src',
'@googleforcreators/element-library': './packages/element-library/src',
'@googleforcreators/elements': './packages/elements/src',
'@googleforcreators/fonts': './packages/fonts/src',
'@googleforcreators/i18n': './packages/i18n/src',
'@googleforcreators/masks': './packages/masks/src',
'@googleforcreators/media': './packages/media/src',
'@googleforcreators/migration': './packages/migration/src',
'@googleforcreators/moveable': './packages/moveable/src',
'@googleforcreators/output': './packages/output/src',
'@googleforcreators/patterns': './packages/patterns/src',
'@googleforcreators/react': './packages/react/src',
'@googleforcreators/rich-text': './packages/rich-text/src',
'@googleforcreators/stickers': './packages/stickers/src',
'@googleforcreators/story-editor': './packages/story-editor/src',
'@googleforcreators/templates': './packages/templates/src',
'@googleforcreators/text-sets': './packages/text-sets/src',
'@googleforcreators/tracking': './packages/tracking/src',
'@googleforcreators/transform': './packages/transform/src',
'@googleforcreators/units': './packages/units/src',
'@googleforcreators/url': './packages/url/src',

// Private Packages
'@web-stories-wp/e2e-tests': './packages/e2e-tests/src',
'@web-stories-wp/activation-notice': './packages/activation-notice/src',
'@web-stories-wp/commander': './packages/commander/src',
'@web-stories-wp/e2e-test-utils': './packages/e2e-test-utils/src',
'@web-stories-wp/eslint-import-resolver': './packages/eslint-import-resolver/src',
'@web-stories-wp/glider': './packages/glider/src',
'@web-stories-wp/imgareaselect': './packages/imgareaselect/src',
'@web-stories-wp/jest-amp': './packages/jest-amp/src',
'@web-stories-wp/jest-puppeteer-amp': './packages/jest-puppeteer-amp/src',
'@web-stories-wp/jest-resolver': './packages/jest-resolver/src',
'@web-stories-wp/karma-failed-tests-reporter': './packages/karma-failed-tests-reporter/src',
'@web-stories-wp/karma-puppeteer-client': './packages/karma-puppeteer-client/src',
'@web-stories-wp/karma-puppeteer-launcher': './packages/karma-puppeteer-launcher/src',
'@web-stories-wp/stories-block': './packages/stories-block/src',
'@web-stories-wp/stories-carousel': './packages/stories-carousel/src',
'@web-stories-wp/stories-lightbox': './packages/stories-lightbox/src',
'@web-stories-wp/tinymce-button': './packages/tinymce-button/src',
'@web-stories-wp/widget': './packages/widget/src',
'@web-stories-wp/wp-dashboard': './packages/wp-dashboard/src',
'@web-stories-wp/wp-story-editor': './packages/wp-story-editor/src',
'@web-stories-wp/wp-utils': './packages/wp-utils/src',
},
});
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"phpstan/extension-installer": "^1.1",
"roave/security-advisories": "dev-latest",
"sirbrillig/phpcs-variable-analysis": "^2.8",
"slevomat/coding-standard": "^7.0.18",
"slevomat/coding-standard": "^8.0.0",
"sniccowp/php-scoper-wordpress-excludes": "^6.0",
"szepeviktor/phpstan-wordpress": "^1.0",
"wp-coding-standards/wpcs": "^2.3",
Expand Down
59 changes: 30 additions & 29 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1d98c46

Please sign in to comment.