Skip to content

Commit e398b63

Browse files
farfromrefugfarfromrefug
committed
Merge branch 'master' of github.com:nativescript-community/nativescript-collectionview
# Conflicts: # package.json
2 parents 2461aff + 3a15955 commit e398b63

File tree

8 files changed

+30
-232
lines changed

8 files changed

+30
-232
lines changed

‎.eslintignore‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.eslintrc.js‎

Lines changed: 1 addition & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -1,186 +1,3 @@
11
module.exports = {
2-
extends: ['plugin:prettier/recommended', 'plugin:vue/essential'],
3-
plugins: ['prettier', '@typescript-eslint', '@nativescript'],
4-
parser: 'vue-eslint-parser',
5-
parserOptions: {
6-
ecmaVersion: 2019,
7-
sourceType: 'module',
8-
extraFileExtensions: ['.vue', '.svelte'],
9-
parser: '@typescript-eslint/parser',
10-
project: 'tsconfig.eslint.json',
11-
warnOnUnsupportedTypeScriptVersion: false,
12-
tsconfigRootDir: __dirname
13-
},
14-
rules: {
15-
'prettier/prettier': 'warn',
16-
'vue/custom-event-name-casing': 'off',
17-
'@nativescript/no-nativescript-angular-imports': 'warn',
18-
'@nativescript/no-tns-core-modules-imports': 'warn',
19-
'@nativescript/no-duplicate-ns-imports': 'warn',
20-
'@typescript-eslint/adjacent-overload-signatures': 'error',
21-
'@typescript-eslint/array-type': 'error',
22-
'@typescript-eslint/await-thenable': 'error',
23-
'@typescript-eslint/ban-types': 'off',
24-
'@typescript-eslint/class-name-casing': 'off',
25-
'@typescript-eslint/consistent-type-assertions': 'error',
26-
'@typescript-eslint/consistent-type-definitions': 'error',
27-
'@typescript-eslint/explicit-member-accessibility': [
28-
'off',
29-
{
30-
accessibility: 'explicit'
31-
}
32-
],
33-
'@typescript-eslint/indent': [
34-
'error',
35-
4,
36-
{
37-
FunctionDeclaration: {
38-
parameters: 'first'
39-
},
40-
FunctionExpression: {
41-
parameters: 'first'
42-
},
43-
SwitchCase: 1
44-
}
45-
],
46-
'@typescript-eslint/interface-name-prefix': 'off',
47-
'@typescript-eslint/member-delimiter-style': 'error',
48-
'@typescript-eslint/member-ordering': 'off',
49-
'@typescript-eslint/no-empty-function': 'off',
50-
'@typescript-eslint/no-empty-interface': 'off',
51-
'@typescript-eslint/no-explicit-any': 'off',
52-
'@typescript-eslint/no-floating-promises': 'off',
53-
'@typescript-eslint/no-inferrable-types': 'off',
54-
'@typescript-eslint/no-misused-new': 'off',
55-
'@typescript-eslint/no-namespace': 'off',
56-
'@typescript-eslint/no-parameter-properties': 'off',
57-
'@typescript-eslint/no-require-imports': 'off',
58-
'@typescript-eslint/no-unnecessary-qualifier': 'error',
59-
'@typescript-eslint/no-unnecessary-type-assertion': 'error',
60-
'@typescript-eslint/no-use-before-declare': 'off',
61-
'@typescript-eslint/no-var-requires': 'off',
62-
'@typescript-eslint/prefer-for-of': 'off',
63-
'@typescript-eslint/prefer-function-type': 'error',
64-
'@typescript-eslint/prefer-namespace-keyword': 'error',
65-
'@typescript-eslint/quotes': [
66-
'error',
67-
'single',
68-
{
69-
avoidEscape: true
70-
}
71-
],
72-
'@typescript-eslint/semi': ['error'],
73-
'@typescript-eslint/space-within-parens': ['off', 'never'],
74-
'@typescript-eslint/triple-slash-reference': 'off',
75-
'@typescript-eslint/type-annotation-spacing': 'error',
76-
'@typescript-eslint/unified-signatures': 'error',
77-
'arrow-body-style': 'error',
78-
'arrow-parens': ['off', 'as-needed'],
79-
camelcase: 'off',
80-
'capitalized-comments': 'off',
81-
complexity: 'off',
82-
'constructor-super': 'error',
83-
curly: ['error', 'multi-line'],
84-
'dot-notation': 'off',
85-
'eol-last': 'error',
86-
eqeqeq: ['error', 'smart'],
87-
'guard-for-in': 'off',
88-
'id-blacklist': ['error', 'any', 'string', 'boolean', 'Undefined'],
89-
'id-match': 'error',
90-
'sort-imports': [
91-
'error',
92-
{
93-
ignoreCase: false,
94-
ignoreDeclarationSort: true,
95-
ignoreMemberSort: false,
96-
memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single']
97-
}
98-
],
99-
'linebreak-style': 'off',
100-
'max-classes-per-file': 'off',
101-
'max-len': [
102-
'off',
103-
{
104-
ignorePattern: '^import |^export {(.*?)}',
105-
code: 200
106-
}
107-
],
108-
'new-parens': 'off',
109-
'newline-per-chained-call': 'off',
110-
'no-bitwise': 'off',
111-
'no-caller': 'error',
112-
'no-cond-assign': 'off',
113-
'no-console': [
114-
'off',
115-
{
116-
allow: [
117-
'log',
118-
'warn',
119-
'dir',
120-
'timeLog',
121-
'assert',
122-
'clear',
123-
'count',
124-
'countReset',
125-
'group',
126-
'groupEnd',
127-
'table',
128-
'debug',
129-
'dirxml',
130-
'error',
131-
'groupCollapsed',
132-
'Console',
133-
'profile',
134-
'profileEnd',
135-
'timeStamp',
136-
'context'
137-
]
138-
}
139-
],
140-
'no-constant-condition': 'error',
141-
'no-control-regex': 'off',
142-
'no-debugger': 'error',
143-
'no-duplicate-imports': 'error',
144-
'no-empty': 'off',
145-
'no-eval': 'off',
146-
'no-extra-semi': 'off',
147-
'no-fallthrough': 'error',
148-
'no-invalid-regexp': 'error',
149-
'no-invalid-this': 'off',
150-
'no-irregular-whitespace': 'off',
151-
'no-multiple-empty-lines': 'off',
152-
'no-new-wrappers': 'error',
153-
'no-redeclare': ['error', { builtinGlobals: false }],
154-
'no-regex-spaces': 'error',
155-
'no-return-await': 'error',
156-
'no-shadow': [
157-
'off',
158-
{
159-
hoist: 'all'
160-
}
161-
],
162-
'no-throw-literal': 'error',
163-
'no-trailing-spaces': 'error',
164-
'no-undef-init': 'error',
165-
'no-underscore-dangle': 'off',
166-
'no-unsafe-finally': 'error',
167-
'no-unused-expressions': [
168-
'error',
169-
{
170-
allowTaggedTemplates: true,
171-
allowShortCircuit: true
172-
}
173-
],
174-
'no-unused-labels': 'error',
175-
'no-var': 'error',
176-
'object-shorthand': 'error',
177-
'one-var': ['off', 'never'],
178-
'prefer-arrow/prefer-arrow-functions': 'off',
179-
'prefer-const': 'error',
180-
'quote-props': 'off',
181-
radix: 'error',
182-
'space-before-function-paren': 'off',
183-
'use-isnan': 'error',
184-
'valid-typeof': 'off'
185-
}
2+
extends: './tools/.eslintrc.js'
1863
};

‎.gitmodules‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
[submodule "tools"]
22
path = tools
3-
url = [email protected]:nativescript-community/plugin-seed-tools.git
4-
ignore = dirty
5-
[submodule "demo-vue"]
6-
path = demo-vue
7-
url = [email protected]:nativescript-community/plugin-seed-demo-vue.git
8-
ignore = dirty
9-
[submodule "demo-svelte"]
10-
path = demo-svelte
11-
url = [email protected]:nativescript-community/plugin-seed-demo-svelte.git
12-
ignore = dirty
13-
[submodule "demo-react"]
14-
path = demo-react
15-
url = [email protected]:nativescript-community/plugin-seed-demo-react.git
16-
ignore = dirty
3+
url = https://github.com/nativescript-community/plugin-seed-tools.git
174
[submodule "demo-ng"]
185
path = demo-ng
19-
url = [email protected]:nativescript-community/plugin-seed-demo-ng.git
20-
ignore = dirty
6+
url = https://github.com/nativescript-community/plugin-seed-demo-ng.git
7+
[submodule "demo-react"]
8+
path = demo-react
9+
url = https://github.com/nativescript-community/plugin-seed-demo-react.git
10+
[submodule "demo-svelte"]
11+
path = demo-svelte
12+
url = https://github.com/nativescript-community/plugin-seed-demo-svelte.git
13+
[submodule "demo-vue"]
14+
path = demo-vue
15+
url = https://github.com/nativescript-community/plugin-seed-demo-vue.git

‎.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
shamefully-hoist=true

‎.prettierignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
package-lock.json
22
node_modules/
33
plugin/
4-
demo-ng/
5-
demo-react/
6-
demo-svelte/
7-
demo-vue/
84
docs/

‎demo-snippets/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@nativescript-community/template-snippet",
33
"version": "0.0.1",
44
"dependencies": {
5-
"@nativescript-community/ui-collectionview": "../packages/collectionview",
6-
"@nativescript-community/ui-collectionview-waterfall": "../packages/waterfall"
5+
"@nativescript-community/ui-collectionview": "file:../packages/collectionview",
6+
"@nativescript-community/ui-collectionview-waterfall": "file:../packages/waterfall"
77
}
8-
}
8+
}

‎package.json‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@nativescript-community/ui-collectionview",
33
"version": "1.0.0",
4-
"homepage": "https://github.com/Akylas/nativescript-collectionview#readme",
4+
"homepage": "https://github.com/@nativescript-community/ui-collectionview#readme",
55
"bugs": {
6-
"url": "https://github.com/Akylas/nativescript-collectionview/issues"
6+
"url": "https://github.com/@nativescript-community/ui-collectionview/issues"
77
},
88
"repository": {
99
"type": "git",
10-
"url": "git+https://github.com/Akylas/nativescript-collectionview.git"
10+
"url": "git+https://github.com/@nativescript-community/ui-collectionview.git"
1111
},
1212
"license": "ISC",
1313
"author": "",
@@ -19,24 +19,25 @@
1919
"clean": "rimraf packages/**/*.d.ts packages/**/*.js packages/**/*.js.map packages/**/*.metadata.json packages/**/*.ngsummary.json node_modules package-lock.json",
2020
"commitmsg": "commitlint -e $GIT_PARAMS",
2121
"demo.ng.android": "cd ./demo-ng && ns run android --no-hmr",
22+
"demo.ng.clean": "cd ./demo-ng && ns clean",
2223
"demo.ng.ios": "cd ./demo-ng && ns run ios --no-hmr",
2324
"demo.react.android": "cd ./demo-react && ns run android --no-hmr",
25+
"demo.react.clean": "cd ./demo-react && ns clean",
2426
"demo.react.ios": "cd ./demo-react && ns run ios --no-hmr",
2527
"demo.svelte.android": "cd ./demo-svelte && ns run android --no-hmr",
28+
"demo.svelte.clean": "cd ./demo-svelte && ns clean",
2629
"demo.svelte.ios": "cd ./demo-svelte && ns run ios --no-hmr",
2730
"demo.vue.android": "cd ./demo-vue && ns run android --no-hmr",
31+
"demo.vue.clean": "cd ./demo-vue && ns clean",
2832
"demo.vue.ios": "cd ./demo-vue && ns run ios --no-hmr",
29-
"e2e": "./e2e/run-tests.js",
30-
"e2e.build": "./e2e/run-tests.js -b",
31-
"e2e.run": "./e2e/run-tests.js -r",
3233
"postinstall": "npm run setup",
3334
"prepare": "npm run setup",
3435
"publish": "npm run setup && npm run build.all && lerna publish --create-release=github --force-publish",
3536
"readme": "node ./tools/readme.js",
3637
"setup": "npm run submodules && ts-patch install",
3738
"start": "./node_modules/.bin/ntl -A -s 15 -o",
3839
"submodules": "git submodule update --init",
39-
"sync": "node ./tools/sync.js -w && npx sort-package-json",
40+
"sync": "node ./tools/sync.js",
4041
"sync.test": "node ./tools/sync.js",
4142
"tsc": "cpy '**/*.d.ts' '../plugin' --parents --cwd=src && tsc -skipLibCheck -d",
4243
"update": "node ./tools/update.js",
@@ -50,11 +51,6 @@
5051
"dependencies": {
5152
"@nativescript-community/plugin-seed-tools": "file:tools"
5253
},
53-
"dependenciesMeta": {
54-
"@nativescript-community/plugin-seed-tools": {
55-
"injected": true
56-
}
57-
},
5854
"ntl": {
5955
"descriptions": {
6056
"build": "Build the plugin",
@@ -71,5 +67,10 @@
7167
"demo.vue.ios": "Runs the Vue demo on iOS.",
7268
"watch": "Watch for changes in the plugin source and re-build."
7369
}
70+
},
71+
"dependenciesMeta": {
72+
"@nativescript-community/plugin-seed-tools": {
73+
"injected": true
74+
}
7475
}
75-
}
76+
}

‎tsconfig.eslint.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)