-
-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into dependabot/npm_and_yarn/xmldom/xmldom-0.7.6
- Loading branch information
Showing
301 changed files
with
17,946 additions
and
14,686 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,39 @@ | ||
| // If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml. | ||
| { | ||
| "name": "Existing Docker Compose (Extend)", | ||
| "name": "Existing Docker Compose (Extend)", | ||
|
|
||
| // Update the 'dockerComposeFile' list if you have more compose files or use different names. | ||
| // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make. | ||
| "dockerComposeFile": [ | ||
| "../docker/docker-compose.yml", | ||
| "docker-compose.yml" | ||
| ], | ||
| // Update the 'dockerComposeFile' list if you have more compose files or use different names. | ||
| // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make. | ||
| "dockerComposeFile": ["../docker/docker-compose.yml", "docker-compose.yml"], | ||
|
|
||
| // The 'service' property is the name of the service for the container that VS Code should | ||
| // use. Update this value and .devcontainer/docker-compose.yml to the real service name. | ||
| "service": "test-e2e", | ||
| // The 'service' property is the name of the service for the container that VS Code should | ||
| // use. Update this value and .devcontainer/docker-compose.yml to the real service name. | ||
| "service": "test-e2e", | ||
|
|
||
| // The optional 'workspaceFolder' property is the path VS Code should open by default when | ||
| // connected. This is typically a file mount in .devcontainer/docker-compose.yml | ||
| "workspaceFolder": "/data", | ||
| // The optional 'workspaceFolder' property is the path VS Code should open by default when | ||
| // connected. This is typically a file mount in .devcontainer/docker-compose.yml | ||
| "workspaceFolder": "/data", | ||
|
|
||
| // Set *default* container specific settings.json values on container create. | ||
| "settings": {}, | ||
| // Set *default* container specific settings.json values on container create. | ||
| "settings": {}, | ||
|
|
||
| // Add the IDs of extensions you want installed when the container is created. | ||
| "extensions": [], | ||
| // Add the IDs of extensions you want installed when the container is created. | ||
| "extensions": [], | ||
|
|
||
| // Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
| "forwardPorts": [9229], | ||
| // Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
| "forwardPorts": [9229], | ||
|
|
||
| // Uncomment the next line if you want start specific services in your Docker Compose config. | ||
| // "runServices": [], | ||
| // Uncomment the next line if you want start specific services in your Docker Compose config. | ||
| // "runServices": [], | ||
|
|
||
| // Uncomment the next line if you want to keep your containers running after VS Code shuts down. | ||
| // "shutdownAction": "none", | ||
| // Uncomment the next line if you want to keep your containers running after VS Code shuts down. | ||
| // "shutdownAction": "none", | ||
|
|
||
| "initializeCommand": "cd docker && docker-compose build --build-arg ENVIRONMENT=development app && docker-compose build --build-arg ENVIRONMENT=development app-for-e2e test-e2e && docker-compose up -d app-for-e2e", | ||
| "initializeCommand": "cd docker && docker-compose build --build-arg ENVIRONMENT=development app && docker-compose build --build-arg ENVIRONMENT=development app-for-e2e test-e2e && docker-compose up -d app-for-e2e", | ||
|
|
||
| // Uncomment the next line to run commands after the container is created - for example installing docker. | ||
| "onCreateCommand": "apk add docker", | ||
| // Uncomment the next line to run commands after the container is created - for example installing docker. | ||
| "onCreateCommand": "apk add docker" | ||
|
|
||
| // Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root. | ||
| // "remoteUser": "vscode" | ||
| // Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root. | ||
| // "remoteUser": "vscode" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #!/usr/bin/env sh | ||
| . "$(dirname -- "$0")/_/husky.sh" | ||
|
|
||
| npx lint-staged |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,64 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "webpack", | ||
| "type": "shell", | ||
| "windows": { | ||
| "command": "bash -c 'npm run webpack'" | ||
| }, | ||
| "linux": { | ||
| "command": "npm run webpack" | ||
| }, | ||
| "problemMatcher": "$awesometsc", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "presentation": { | ||
| "reveal": "silent" | ||
| } | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "webpack", | ||
| "type": "shell", | ||
| "windows": { | ||
| "command": "bash -c 'npm run webpack'" | ||
| }, | ||
| { | ||
| "label": "webpack-watch", | ||
| "type": "shell", | ||
| "isBackground": true, | ||
| "windows": { | ||
| "command": "bash -c 'npm run webpack:watch'" | ||
| }, | ||
| "linux": { | ||
| "command": "npm run webpack:watch" | ||
| }, | ||
| "presentation": { | ||
| "reveal": "silent" | ||
| }, | ||
| "problemMatcher": [] | ||
| "linux": { | ||
| "command": "npm run webpack" | ||
| }, | ||
| { | ||
| "label": "npm install", | ||
| "type": "shell", | ||
| "windows": { | ||
| "command": "bash -c 'npm install'" | ||
| }, | ||
| "linux": { | ||
| "command": "npm install" | ||
| }, | ||
| "presentation": { | ||
| "reveal": "silent" | ||
| }, | ||
| "problemMatcher": [] | ||
| "problemMatcher": "$awesometsc", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| { | ||
| "label": "Reset E2E tests", | ||
| "type": "process", | ||
| "command": "docker-compose", | ||
| "args": [ | ||
| "restart", | ||
| "app-for-e2e" | ||
| ], | ||
| "options": { | ||
| "cwd": "docker" | ||
| }, | ||
| "problemMatcher": [] | ||
| "presentation": { | ||
| "reveal": "silent" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "label": "webpack-watch", | ||
| "type": "shell", | ||
| "isBackground": true, | ||
| "windows": { | ||
| "command": "bash -c 'npm run webpack:watch'" | ||
| }, | ||
| "linux": { | ||
| "command": "npm run webpack:watch" | ||
| }, | ||
| "presentation": { | ||
| "reveal": "silent" | ||
| }, | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "npm install", | ||
| "type": "shell", | ||
| "windows": { | ||
| "command": "bash -c 'npm install'" | ||
| }, | ||
| "linux": { | ||
| "command": "npm install" | ||
| }, | ||
| "presentation": { | ||
| "reveal": "silent" | ||
| }, | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "Reset E2E tests", | ||
| "type": "process", | ||
| "command": "docker-compose", | ||
| "args": ["restart", "app-for-e2e"], | ||
| "options": { | ||
| "cwd": "docker" | ||
| }, | ||
| "problemMatcher": [] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,21 @@ | ||
| ## Ways to Contribute | ||
|
|
||
| ## Ways to Contribute ## | ||
| 1. Look for issues in our issue tracker marked with *good first issue* | ||
| 1. Look for issues in our issue tracker marked with _good first issue_ | ||
| 2. If you are a Language Forge user, stay up to date with posts in our software community forum, and answer user's questions to the extent that you are able | ||
| 3. Help localize the Language Forge UI into a language that you are familiar with | ||
|
|
||
| ## Contributing Code | ||
|
|
||
| ### Typical Workflow | ||
|
|
||
| ## Contributing Code ## | ||
| ### Typical Workflow ### | ||
| 1. Create a branch off of `develop` | ||
| 1. Create a PR back into `develop` | ||
| 1. Once approved and merged, test those changes on [qa.languageforge.org](https://qa.languageforge.org) | ||
| 1. Once you are satisfied with the changes, coordinate with the team to deliver those changes to the production environment | ||
| 1. Team leads will determine when the right time to cut a release, i.e., tag and deploy, typically this should be within a day or two | ||
|
|
||
| ### Production Bugfix Workflow ### | ||
| ### Production Bugfix Workflow | ||
|
|
||
| 1. There may be times when it's necessary to create a branch off of `master` (e.g. a hotfix for the production environment) | ||
| 1. Coordinate with the team to deliver those changes to the production environment | ||
| 1. Team leads will determine when the right time to cut a release, i.e., tag and deploy, this would likely be right away under these exceptional circumstances |
Oops, something went wrong.