Skip to content

Commit ecb24f5

Browse files
authored
Merge pull request #9 from CatalysmsServerManager/development
2 parents c85c508 + 362c2c5 commit ecb24f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+25309
-3575
lines changed

.github/workflows/ci.yml

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,48 @@ on: [push]
33
jobs:
44
build-and-deploy:
55
runs-on: ubuntu-latest
6+
strategy:
7+
matrix:
8+
node-version: [16.x]
69
steps:
710
- name: Checkout 🛎️
811
uses: actions/checkout@v2.3.1
912

13+
- name: Prepare
14+
id: prep
15+
run: |
16+
VERSION=noop
17+
if [ "${{ github.event_name }}" = "schedule" ]; then
18+
VERSION=nightly
19+
elif [[ $GITHUB_REF == refs/tags/* ]]; then
20+
VERSION=${GITHUB_REF#refs/tags/}
21+
elif [[ $GITHUB_REF == refs/heads/* ]]; then
22+
VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
23+
if [ "${{ github.event.repository.default_branch }}" = "$VERSION" ]; then
24+
VERSION=latest
25+
fi
26+
elif [[ $GITHUB_REF == refs/pull/* ]]; then
27+
VERSION=pr-${{ github.event.number }}
28+
fi
29+
echo ::set-output name=version::${VERSION}
30+
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H-%M-%SZ')
31+
32+
- name: Use Node.js ${{ matrix.node-version }}
33+
uses: actions/setup-node@v1
34+
with:
35+
node-version: ${{ matrix.node-version }}
36+
1037
- name: Install and Build 🔧
1138
run: |
1239
npm ci
1340
npm run build
1441
15-
- name: Deploy 🚀
16-
uses: JamesIves/github-pages-deploy-action@4.0.0
17-
if: github.ref == 'refs/heads/master'
42+
- uses: montudor/action-zip@v1
43+
with:
44+
args: zip -qq -r build.zip build
45+
46+
- name: Release
47+
uses: softprops/action-gh-release@v1
1848
with:
19-
branch: gh-pages # The branch the action should deploy to.
20-
folder: build # The folder the action should deploy.
49+
files: build.zip
50+
tag_name: ${{ steps.prep.outputs.version }}-${{ steps.prep.outputs.created }}

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313

1414
# misc
1515
.DS_Store
16-
.env.local
17-
.env.development.local
18-
.env.test.local
19-
.env.production.local
16+
.env
2017

2118
npm-debug.log*
2219
yarn-debug.log*

.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
}

README.md

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ This project was bootstrapped with [Create React App](https://github.com/faceboo
66

77
In the project directory, you can run:
88

9-
### `npm start`
9+
### `yarn start`
1010

1111
Runs the app in the development mode.\
1212
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
1313

1414
The page will reload if you make edits.\
1515
You will also see any lint errors in the console.
1616

17-
### `npm test`
17+
### `yarn test`
1818

1919
Launches the test runner in the interactive watch mode.\
2020
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
2121

22-
### `npm run build`
22+
### `yarn build`
2323

2424
Builds the app for production to the `build` folder.\
2525
It correctly bundles React in production mode and optimizes the build for the best performance.
@@ -29,7 +29,7 @@ Your app is ready to be deployed!
2929

3030
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
3131

32-
### `npm run eject`
32+
### `yarn eject`
3333

3434
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
3535

@@ -44,27 +44,3 @@ You don’t have to ever use `eject`. The curated feature set is suitable for sm
4444
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
4545

4646
To learn React, check out the [React documentation](https://reactjs.org/).
47-
48-
### Code Splitting
49-
50-
This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
51-
52-
### Analyzing the Bundle Size
53-
54-
This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
55-
56-
### Making a Progressive Web App
57-
58-
This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
59-
60-
### Advanced Configuration
61-
62-
This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
63-
64-
### Deployment
65-
66-
This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
67-
68-
### `npm run build` fails to minify
69-
70-
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)

craco.config.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
2+
13
module.exports = {
2-
style: {
3-
postcss: {
4-
plugins: [
5-
require('tailwindcss'),
6-
require('autoprefixer'),
7-
],
8-
},
9-
},
10-
}
4+
webpack: {
5+
plugins: [
6+
new MonacoWebpackPlugin()
7+
]
8+
}
9+
};

0 commit comments

Comments
 (0)