Skip to content

Commit

Permalink
fix unhandled conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmason2-godaddy
mmason2-godaddy committed Jun 7, 2024
1 parent 4879621 commit a731cbd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 60 deletions.
52 changes: 0 additions & 52 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,37 +156,6 @@ Available plugins

| Name | Version | Description |
| ------------------------------- | ------- | -------------------------------------------------------------------------- |
<<<<<<< HEAD
| [@gasket/plugin-analyze] | 6.46.7 | Gasket Analyzer Plugin |
| [@gasket/plugin-command] | 6.46.2 | Plugin to enable other plugins to inject new gasket commands |
| [@gasket/plugin-config] | 6.46.2 | Supports application-specific (non-Gasket) configuration |
| [@gasket/plugin-cypress] | 6.46.7 | Integrates Cypress based testing into your Gasket application |
| [@gasket/plugin-docs] | 6.46.4 | Centralize doc files from plugins and modules |
| [@gasket/plugin-docs-graphs] | 6.45.0 | Generate mermaid graphs of an applications gasket lifecycles |
| [@gasket/plugin-docsify] | 6.46.2 | View collated docs with Docsify |
| [@gasket/plugin-docusaurus] | 6.46.2 | Gasket plugin for docusaurus |
| [@gasket/plugin-elastic-apm] | 6.46.5 | Adds Elastic APM instrumentation to your application |
| [@gasket/plugin-express] | 6.46.7 | Adds express support to your application |
| [@gasket/plugin-fastify] | 6.46.2 | Adds fastify support to your application |
| [@gasket/plugin-git] | 6.46.2 | Adds git support to your application |
| [@gasket/plugin-happyfeet] | 6.46.7 | A gasket plugin to enable happyfeet healthchecks |
| [@gasket/plugin-https] | 6.46.7 | Create http/s servers with graceful termination |
| [@gasket/plugin-intl] | 6.46.7 | NodeJS script to build localization files. |
| [@gasket/plugin-jest] | 6.46.7 | Integrated jest into your application. |
| [@gasket/plugin-lint] | 6.46.2 | Adds GoDaddy standard linting to your application |
| [@gasket/plugin-log] | 6.46.2 | Gasket log plugin |
| [@gasket/plugin-manifest] | 6.46.2 | The web app manifest for progressive Gasket applications |
| [@gasket/plugin-metadata] | 6.46.4 | Adds metadata to gasket lifecycles |
| [@gasket/plugin-mocha] | 6.46.7 | Integrates mocha based testing in to your Gasket application |
| [@gasket/plugin-morgan] | 6.46.7 | Adds morgan request logger to your app |
| [@gasket/plugin-nextjs] | 6.46.7 | Adds Next support to your application |
| [@gasket/plugin-redux] | 6.46.2 | Gasket Redux Setup |
| [@gasket/plugin-service-worker] | 6.46.2 | Gasket Service Worker Plugin |
| [@gasket/plugin-start] | 6.46.7 | Adds commands for building and starting Gasket apps |
| [@gasket/plugin-swagger] | 6.46.7 | Generate and serve swagger docs |
| [@gasket/plugin-webpack] | 6.46.2 | Adds webpack support to your application |
| [@gasket/plugin-workbox] | 6.46.2 | Gasket Workbox Plugin |
=======
| [@gasket/plugin-analyze] | 6.46.8 | Gasket Analyzer Plugin |
| [@gasket/plugin-command] | 6.47.1 | Plugin to enable other plugins to inject new gasket commands |
| [@gasket/plugin-config] | 6.47.0 | Supports application-specific (non-Gasket) configuration |
Expand Down Expand Up @@ -218,32 +187,12 @@ Available plugins
| [@gasket/plugin-swagger] | 6.46.8 | Generate and serve swagger docs |
| [@gasket/plugin-webpack] | 6.46.8 | Adds webpack support to your application |
| [@gasket/plugin-workbox] | 6.46.8 | Gasket Workbox Plugin |
>>>>>>> 6d4c70e3 (disable prepack doc scripts)
| plugins/site-docs-plugin.js | | |

## Modules

Supporting modules

<<<<<<< HEAD
| Name | Version | Description |
| ----------------------------------------------------------- | ------- | ------------------------------------------------------------------------------------ |
| [@gasket/assets] | 6.45.2 | Gasket assets |
| [@gasket/cli] | 6.46.7 | CLI for rapid application development with gasket |
| [@gasket/data] | 6.46.7 | Helper package for accessing embedded Gasket Data in the browser |
| [@gasket/engine] | 6.46.2 | Plugin engine for gasket |
| [@gasket/fetch] | 6.45.2 | Gasket Fetch API |
| [@gasket/helper-intl] | 6.46.4 | Internal helpers used by loaders to resolve locale file paths |
| [@gasket/log] | 6.46.0 | Gasket client and server logger |
| [@gasket/nextjs] | 6.46.7 | Gasket integrations for Next.js apps |
| [@gasket/react-intl] | 6.46.7 | React component library to enable localization for gasket apps. |
| [@gasket/redux] | 6.46.0 | Gasket Redux Configuration |
| [@gasket/typescript-tests] | 6.46.7 | Not a published package; hosts unit tests to verify TypeScript support |
| [@gasket/utils] | 6.46.2 | Reusable utilities for Gasket internals |
| /Users/agerard/dev/ghec/godaddy/gasket/packages/gasket-core | | |
| /Users/agerard/dev/ghec/godaddy/gasket/packages/iso-test | | |
| [create-gasket-app] | 6.46.7 | starter pack for creating a gasket app |
=======
| Name | Version | Description |
| -------------------------- | ------- | ------------------------------------------------------------------------------------ |
| [@gasket/assets] | 6.46.8 | Gasket assets |
Expand All @@ -260,7 +209,6 @@ Supporting modules
| [@gasket/typescript-tests] | 6.47.0 | Not a published package; hosts unit tests to verify TypeScript support |
| [@gasket/utils] | 6.47.1 | Reusable utilities for Gasket internals |
| [create-gasket-app] | 6.47.0 | starter pack for creating a gasket app |
>>>>>>> 6d4c70e3 (disable prepack doc scripts)

## Configurations

Expand Down
9 changes: 1 addition & 8 deletions docs/generated-docs/lifecycle-graphs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,11 @@ start -- exec --> servers;
express -- exec --> serviceWorkerCacheKey;
preboot -- exec --> start;
start -- execWaterfall --> terminus;
<<<<<<< HEAD
initWebpack -- execSync --> webpack["webpack (deprecated)"];
initWebpack -- execSync --> webpackChain["webpackChain (deprecated)"];
initWebpack -- execWaterfallSync --> webpackConfig;
createLogger -- exec --> winstonTransports;
=======
initWebpack -- execApplySync --> webpack["webpack (deprecated)"];
initWebpack -- execApplySync --> webpackChain["webpackChain (deprecated)"];
initWebpack -- execApplySync --> webpackConfig;
>>>>>>> 6d4c70e3 (disable prepack doc scripts)
composeServiceWorker -- exec --> workbox;
style docs-cmd fill: red;
style *-cmd fill: red;
style build-cmd fill: red;
```
```

0 comments on commit a731cbd

Please sign in to comment.