Skip to content

Commit

Permalink
Merge pull request #1 from madlabsinc/develop
Browse files Browse the repository at this point in the history
Create a new pull request by comparing changes across two branches
  • Loading branch information
GulajavaMinistudio authored Sep 26, 2023
2 parents 3ee47fb + 5efd968 commit 166f2de
Show file tree
Hide file tree
Showing 116 changed files with 37,702 additions and 72,919 deletions.
7 changes: 0 additions & 7 deletions .babelrc

This file was deleted.

2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
src/templates/starter-templates
src/templates
23 changes: 9 additions & 14 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
module.exports = {
extends: [
'eslint:recommended',
'prettier',
'plugin:prettier/recommended'
],
extends: ['eslint:recommended', 'prettier', 'plugin:prettier/recommended'],
plugins: ['prettier'], // activating esling-plugin-prettier (--fix stuff)
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
env: {
'browser': true,
'es6': true,
'node': true,
'jest': true
browser: true,
es6: true,
node: true,
jest: true,
},
parserOptions: {
sourceType: 'module',
allowImportExportEverywhere: false,
ecmaFeatures: {
globalReturn: false,
},
babelOptions: {
configFile: '.babelrc',
},
},
rules: {
'no-console': 0,
'prettier/prettier': [ // customizing prettier rules (unfortunately not many of them are customizable)
'prettier/prettier': [
// customizing prettier rules (unfortunately not many of them are customizable)
'error',
{
endOfLine: 'auto',
singleQuote: true,
trailingComma: 'all',
},
Expand Down
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
open_collective: mevn-cli
open_collective: mevn-cli
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
title: ""
labels: bug
assignees: ''

assignees: ""
---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**

<!--Steps to reproduce the behavior:-->

**Expected behavior**
Expand Down
13 changes: 8 additions & 5 deletions .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

## Do you want to request a feature or report a bug?

## What is the current behavior?

If the current behavior is a bug, please provide the steps to reproduce.

## What is the expected behavior?

If this is a feature request, what is motivation or use case for changing the behavior?

## Local Environment Information

Please paste the results of `mevn info` here.

## Screenshots

If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.
Add any other context about the problem here.
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: 'feat:'
title: "feat:"
labels: feature-request
assignees: ''

assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. -->

**What kind of change does this PR introduce?**

<!-- E.g. a bugfix, feature, refactoring, build related change, etc… -->

**Did you add tests for your changes?**
Expand All @@ -13,6 +14,7 @@
<!-- Try to link to an open issue for more information. -->

**Does this PR introduce a breaking change?**

<!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->

**Other information**
2 changes: 1 addition & 1 deletion .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ newPRWelcomeComment: >
firstPRMergeComment: >
![congrats](https://media1.giphy.com/media/xT0xezQGU5xCDJuCPe/giphy.gif)
Congrats on your very first contribution :clap: Looking forward to having more from your side
Congrats on your very first contribution :clap: Looking forward to having more from your side
28 changes: 28 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: CI
on:
push:
pull_request:
branches:
- master
- develop
workflow_dispatch:
jobs:
job:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
node: [12, 14]
steps:
- uses: actions/checkout@v2
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
cache: 'npm'
- name: Install packages
run: npm ci
- name: Build binaries
run: npm run build
- name: Run tests
run: npm run test
41 changes: 3 additions & 38 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,15 @@
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Babel compiled directory
lib
Expand All @@ -54,23 +30,12 @@ typings/
# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# parcel-bundler cache (https://parceljs.org/)
.cache

# next.js build output
.next

# nuxt.js build output
.nuxt

# vuepress build output
docs/.vuepress/dist

# Serverless directories
.serverless
# Test Artifacts
dest-path
test-dir
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ Before contributing a change to this repository, please first discuss the change
2. Fork and clone our repository.
3. Make your life-changing changes.
4. Run `npm run build` which generates a `lib` directory with the transpiled `es5` code.
5. Fire in `npm link` to test everything works fine.
6. Commit and push your changes.
7. Make a detailed pull request.
5. Type in `npm link` to test everything works fine. (Now you've access to the `mevn` root-command.)
6. Run tests locally before commiting with `npm test`. (If you're having issues running tests locally, then you can commit and use GitHub actions ci in your own fork. All tests should pass.)
7. Commit and push your changes.
8. Make a detailed pull request.

> `npm link` creates a symlink in the global folder making the `mevn` command globally available within your local development environment
Expand Down
19 changes: 11 additions & 8 deletions __e2e__/cli.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@
import { run } from '../jest/helpers';

describe('Default behavior', () => {
it('warns the user on passing in an unknown option', () => {
const { stderr } = run(['--invalid'], { reject: false });
expect(stderr).toContain(`error: unknown option`);
it('warns the user if an unknown option is passed in', () => {
const { exitCode, stderr } = run(['--invalid'], { reject: false });
expect(exitCode).toBe(1);
expect(stderr).toBe(`error: unknown option '--invalid'`);
});

it('warns the user if an unknown command is passed', () => {
const { stdout } = run(['junkcmd']);
expect(stdout).toContain('Unknown command');
it('warns the user if an unknown command is passed in', () => {
const { exitCode, stderr } = run(['create'], { reject: false });
expect(exitCode).toBe(1);
expect(stderr.trim()).toBe('Unknown command create.');
});

it('suggests the closest match for an unknown command', () => {
const { stdout } = run(['ini']);
expect(stdout).toContain('Did you mean');
const { exitCode, stderr } = run(['ini'], { reject: false });
expect(exitCode).toBe(1);
expect(stderr).toContain('Did you mean init?');
});
});
Loading

0 comments on commit 166f2de

Please sign in to comment.