Skip to content

Commit 50d0a11

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents e207129 + 2b3899a commit 50d0a11

Some content is hidden

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

56 files changed

+1371
-810
lines changed

.github/workflows/lint.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: lint & typescript check
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
lint:
7+
runs-on: ubuntu-latest
8+
defaults:
9+
run:
10+
working-directory: ./template
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Install dependencies
14+
run: yarn
15+
- run: mv _eslintrc.js .eslintrc.js && mv _prettierrc.js .prettierrc.js
16+
- name: Lint code
17+
run: yarn lint
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: npm Package Prerelease
2+
3+
on:
4+
release:
5+
types: [prereleased]
6+
7+
jobs:
8+
publish-npm:
9+
if: "github.event.release.prerelease"
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/setup-node@v2
14+
with:
15+
node-version: "14"
16+
registry-url: "https://registry.npmjs.org"
17+
- run: npm ci
18+
- run: npm --no-git-tag-version version ${{ github.event.release.tag_name }}
19+
- run: npm publish --access public --tag next
20+
env:
21+
NODE_AUTH_TOKEN: ${{ secrets.npm_token }}

.github/workflows/npm-publish.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: npm Package
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
publish-npm:
9+
runs-on: ubuntu-latest
10+
if: "!github.event.release.prerelease"
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/setup-node@v2
14+
with:
15+
node-version: "14"
16+
registry-url: "https://registry.npmjs.org"
17+
- run: npm ci
18+
- run: npm --no-git-tag-version version ${{ github.event.release.tag_name }}
19+
- run: npm publish --access public
20+
env:
21+
NODE_AUTH_TOKEN: ${{ secrets.npm_token }}

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node_modules/
22
.vscode/
33
.DS_Store
4-
5-
dist/
4+
.idea/

package.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"version": "0.1.0",
44
"description": "Clean and minimalist React Native template for a quick start with Redux and TypeScript.",
55
"scripts": {
6-
"test": "exit 0",
7-
"prepublishOnly": "npm --no-git-tag-version version $TRAVIS_TAG",
8-
"build": "babel --extensions '.ts,.tsx' template/App.tsx template/src -d dist"
6+
"test": "exit 0"
97
},
108
"files": [
119
"template",
@@ -28,10 +26,4 @@
2826
"url": "https://github.com/rahsheen/react-native-template-redux-typescript/issues"
2927
},
3028
"homepage": "https://github.com/rahsheen/react-native-template-redux-typescript#readme",
31-
"devDependencies": {
32-
"@babel/cli": "^7.13.14",
33-
"@babel/core": "^7.13.14",
34-
"@babel/preset-typescript": "^7.13.0",
35-
"prettier": "^2.2.1"
36-
}
3729
}

template/Gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source 'https://rubygems.org'
2+
3+
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4+
ruby '2.7.5'
5+
6+
gem 'cocoapods', '~> 1.11', '>= 1.11.2'

template/_bundle/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BUNDLE_PATH: "vendor/bundle"
2+
BUNDLE_FORCE_RUBY_PLATFORM: 1

template/_eslintrc.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
module.exports = {
22
root: true,
33
extends: '@react-native-community',
4+
parser: '@typescript-eslint/parser',
5+
plugins: ['@typescript-eslint'],
6+
overrides: [
7+
{
8+
files: ['*.ts', '*.tsx'],
9+
rules: {
10+
'@typescript-eslint/no-shadow': ['error'],
11+
'no-shadow': 'off',
12+
'no-undef': 'off',
13+
},
14+
},
15+
],
416
};

template/_gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

template/_gitignore

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23+
ios/.xcode.env.local
2324

2425
# Android/IntelliJ
2526
#
@@ -28,10 +29,8 @@ build/
2829
.gradle
2930
local.properties
3031
*.iml
31-
32-
# Visual Studio Code
33-
#
34-
.vscode/
32+
*.hprof
33+
.cxx/
3534

3635
# node.js
3736
#
@@ -52,12 +51,14 @@ buck-out/
5251
# For more information about the recommended setup visit:
5352
# https://docs.fastlane.tools/best-practices/source-control/
5453

55-
*/fastlane/report.xml
56-
*/fastlane/Preview.html
57-
*/fastlane/screenshots
54+
**/fastlane/report.xml
55+
**/fastlane/Preview.html
56+
**/fastlane/screenshots
57+
**/fastlane/test_output
5858

5959
# Bundle artifact
6060
*.jsbundle
6161

62-
# CocoaPods
62+
# Ruby / CocoaPods
6363
/ios/Pods/
64+
/vendor/bundle/

0 commit comments

Comments
 (0)