Skip to content

Commit

Permalink
merge stg to prod (#21)
Browse files Browse the repository at this point in the history
* chore: add dev content

* chore: update readme

* Build on PR and push (#4)

* Build on PR and push

* Update and rename node.js.yml to build-strapi.yml

* Switch to npm

* Switch to npm

* Add newsletters slug in common content (#8)

* chore(subplat): Merge dev -> stg (#9)

* chore: add dev content

* chore: update readme

* Build on PR and push (#4)

* Build on PR and push

* Update and rename node.js.yml to build-strapi.yml

* Switch to npm

* Switch to npm

* Add newsletters slug in common content (#8)

---------

Co-authored-by: julianpoyourow <[email protected]>

* fix(commonContent): newsletterLabelCodeText to str (#10)

Because:

- newsletterLabelCodeText should be a string supporting one of the
  following values. 'mozilla', 'snp', 'hubs', 'mdnplus'

This commit:

- Updates newsletterLabelCodeText to string and removes localization
- Removes localization from newsletterSlug
- Adds localization to successActionButtonUrl

Closes #FXA-10428

* chore: update to strapi v4.25.12 (#12)

* chore: merge dev into stg (#16)

* chore: add dev content

* chore: update readme

* Build on PR and push (#4)

* Build on PR and push

* Update and rename node.js.yml to build-strapi.yml

* Switch to npm

* Switch to npm

* Add newsletters slug in common content (#8)

* fix(commonContent): newsletterLabelCodeText to str (#10)

Because:

- newsletterLabelCodeText should be a string supporting one of the
  following values. 'mozilla', 'snp', 'hubs', 'mdnplus'

This commit:

- Updates newsletterLabelCodeText to string and removes localization
- Removes localization from newsletterSlug
- Adds localization to successActionButtonUrl

Closes #FXA-10428

* chore: update to strapi v4.25.12 (#12)

---------

Co-authored-by: Lisa Chan <[email protected]>
Co-authored-by: Reino Muhl <[email protected]>

* chore: bump to strapi v5 (#17)

* chore: update to strapi v5.0.1

* chore: update to strapi v5.0.3

* merge dev to stg (#20)

* feat: enable graphql introspection and playground (#18)

* chore: update to strapi v5.1.0 (#19)

* chore: update to strapi v5.1.0

* chore: update to strapi graphql v5.1.0

---------

Co-authored-by: Lisa Chan <[email protected]>
Co-authored-by: Reino Muhl <[email protected]>
  • Loading branch information
3 people authored Oct 30, 2024
1 parent 432bda1 commit af6f503
Show file tree
Hide file tree
Showing 9 changed files with 21,707 additions and 11,542 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/build-strapi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Build Strapi

on:
push:
branches: [ "dev", "stg", "prod" ]
pull_request:
branches: [ "dev", "stg", "prod" ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: 'npm'
- run: npm ci
- run: npm run build
56 changes: 18 additions & 38 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,57 +1,37 @@
# 🚀 Getting started with Strapi
# FxA Strapi

Strapi comes with a full featured [Command Line Interface](https://docs.strapi.io/dev-docs/cli) (CLI) which lets you scaffold and manage your project in seconds.
This repo hosts the Strapi config and content schema for supporting the main FxA monorepo.

### `develop`
Strapi is currently used to host supporting product information for the subscription platform part of FxA.

Start your Strapi application with autoReload enabled. [Learn more](https://docs.strapi.io/dev-docs/cli#strapi-develop)
## Branches

```
npm run develop
# or
yarn develop
```
This repo is setup such that there are 3 main branches -- dev, stg, and prod. These each correlate to their associated environment and are deployed on push, rather than on tag.

### `start`
## Content

Start your Strapi application with autoReload disabled. [Learn more](https://docs.strapi.io/dev-docs/cli#strapi-start)
Content is stored within our cloud environment. At this time, we do not have a dump publicly available however that may change.

```
npm run start
# or
yarn start
```

### `build`
## Commands

Build your admin panel. [Learn more](https://docs.strapi.io/dev-docs/cli#strapi-build)
You can use the Strapi [Command Line Interface](https://docs.strapi.io/dev-docs/cli) if desired, though not necessary.

```
npm run build
# or
yarn build
```
### Developing

## ⚙️ Deployment
You can start the application with livereload via `npm run develop`.

Strapi gives you many possible deployment options for your project including [Strapi Cloud](https://cloud.strapi.io). Browse the [deployment section of the documentation](https://docs.strapi.io/dev-docs/deployment) to find the best solution for your use case.
[Strapi CLI develop](https://docs.strapi.io/dev-docs/cli#strapi-develop)

## 📚 Learn more
### Starting

- [Resource center](https://strapi.io/resource-center) - Strapi resource center.
- [Strapi documentation](https://docs.strapi.io) - Official Strapi documentation.
- [Strapi tutorials](https://strapi.io/tutorials) - List of tutorials made by the core team and the community.
- [Strapi blog](https://strapi.io/blog) - Official Strapi blog containing articles made by the Strapi team and the community.
- [Changelog](https://strapi.io/changelog) - Find out about the Strapi product updates, new features and general improvements.
You can start the application without livereload via `npm run start`.

Feel free to check out the [Strapi GitHub repository](https://github.com/strapi/strapi). Your feedback and contributions are welcome!
[Strapi CLI start](https://docs.strapi.io/dev-docs/cli#strapi-start)

## ✨ Community
### Building

- [Discord](https://discord.strapi.io) - Come chat with the Strapi community including the core team.
- [Forum](https://forum.strapi.io/) - Place to discuss, ask questions and find answers, show your Strapi project and get feedback or just talk with other Community members.
- [Awesome Strapi](https://github.com/strapi/awesome-strapi) - A curated list of awesome things related to Strapi.
You can build the application via `npm run build`

---
[Strapi CLI build](https://docs.strapi.io/dev-docs/cli#strapi-build)

<sub>🤫 Psst! [Strapi is hiring](https://strapi.io/careers).</sub>
11 changes: 10 additions & 1 deletion config/plugins.js
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
module.exports = () => ({});
module.exports = () => ({
graphql: {
config: {
playgroundAlways: true,
apolloServer: {
introspection: true
}
}
}
});
Loading

0 comments on commit af6f503

Please sign in to comment.