Skip to content

Commit b9c06ea

Browse files
farfromrefugfarfromrefug
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # demo-react # packages/ui-pager/README.md # tools
2 parents 631859d + 7065ee3 commit b9c06ea

20 files changed

+22263
-87
lines changed

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ yarn-error.log*
2525
.project
2626
.yarn
2727
tmp/
28-
package-lock.json
29-
yarn.lock
3028

3129
!.eslintrc.js
3230
!.prettierrc.js
@@ -54,6 +52,5 @@ packages/*.ngsummary.json
5452
packages/*.metadata.json
5553
packages/angular
5654
packages/typings
57-
pnpm-lock.yaml
5855

5956
/blueprint.md

‎.gitmodules

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[submodule "tools"]
22
path = tools
3-
url = git@github.com:nativescript-community/plugin-seed-tools.git
3+
url = https://github.com/nativescript-community/plugin-seed-tools.git
44
[submodule "demo-ng"]
55
path = demo-ng
6-
url = git@github.com:nativescript-community/plugin-seed-demo-ng.git
6+
url = https://github.com/nativescript-community/plugin-seed-demo-ng.git
77
[submodule "demo-react"]
88
path = demo-react
9-
url = git@github.com:nativescript-community/plugin-seed-demo-react.git
9+
url = https://github.com/nativescript-community/plugin-seed-demo-react.git
1010
[submodule "demo-svelte"]
1111
path = demo-svelte
12-
url = git@github.com:nativescript-community/plugin-seed-demo-svelte.git
12+
url = https://github.com/nativescript-community/plugin-seed-demo-svelte.git
1313
[submodule "demo-vue"]
1414
path = demo-vue
15-
url = git@github.com:nativescript-community/plugin-seed-demo-vue.git
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
@@ -8,3 +8,4 @@ strict-peer-dependencies=false
88
shell-emulator=true
99
auto-install-peers=false
1010
loglevel=error
11+
engine-strict=true

‎.yarnrc.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
nmHoistingLimits: workspaces
2+
3+
nodeLinker: node-modules
4+
5+
yarnPath: tools/.yarn/releases/yarn-3.3.1.cjs

‎README.md

Lines changed: 61 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,4 @@
1-
<!-- ⚠️ This README has been generated from the file(s) "blueprint.md" ⚠️-->
2-
[](#demos-and-development)
3-
4-
## Demos and Development
5-
6-
7-
### Repo Setup
8-
9-
The package manager used to install and link dependencies must be `pnpm` or `yarn`. `npm` wont work.
10-
11-
To develop and test:
12-
if you use `yarn` then run `yarn`
13-
if you use `pnpm` then run `pnpm i`
14-
15-
**Interactive Menu:**
16-
17-
To start the interactive menu, run `npm start` (or `yarn start` or `pnpm start`). This will list all of the commonly used scripts.
18-
19-
### Build
20-
21-
```bash
22-
npm run build.all
23-
```
24-
25-
### Demos
26-
27-
```bash
28-
npm run demo.[ng|react|svelte|vue].[ios|android]
29-
30-
npm run demo.svelte.ios # Example
31-
```
32-
33-
34-
[](#contributing)
35-
36-
## Contributing
37-
38-
### Update repo
39-
40-
You can update the repo files quite easily
41-
42-
First update the submodules
43-
44-
```bash
45-
npm run update
46-
```
47-
48-
Then commit the changes
49-
Then update common files
50-
51-
```bash
52-
npm run sync
53-
```
54-
Then you can run `yarn|pnpm`, commit changed files if any
55-
56-
### Publish
57-
58-
The publishing is completely handled by `lerna` (you can add `-- --bump major` to force a major release)
59-
Simply run
60-
```shell
61-
npm run publish
62-
```
63-
<br><br><!-- ⚠️ This README has been generated from the file(s) "blueprint.md" ⚠️-->
1+
<!-- ⚠️ This README has been generated from the file(s) "blueprint.md" ⚠️--><!-- ⚠️ This README has been generated from the file(s) "blueprint.md" ⚠️-->
642
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
653
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
664
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -118,9 +56,14 @@ npm run publish
11856
* [Usage in Vue](#usage-in-vue)
11957
* [Examples](#examples-3)
12058
* [Demos and Development](#demos-and-development)
121-
* [Setup](#setup)
59+
* [Repo Setup](#repo-setup)
12260
* [Build](#build)
12361
* [Demos](#demos)
62+
* [Contributing](#contributing)
63+
* [Update repo ](#update-repo-)
64+
* [Update readme ](#update-readme-)
65+
* [Update doc ](#update-doc-)
66+
* [Publish](#publish)
12467
* [Questions](#questions)
12568

12669

@@ -276,18 +219,18 @@ Vue.use(Pager);
276219
## Demos and Development
277220

278221

279-
### Setup
280-
281-
To run the demos, you must clone this repo **recursively**.
222+
### Repo Setup
282223

224+
The repo uses submodules. If you did not clone with ` --recursive` then you need to call
283225
```
284-
git clone https://github.com/@nativescript-community/ui-pager.git --recursive
226+
git submodule update --init
285227
```
286228

287-
**Install Dependencies:**
288-
```bash
289-
npm i # or 'yarn install' or 'pnpm install'
290-
```
229+
The package manager used to install and link dependencies must be `pnpm` or `yarn`. `npm` wont work.
230+
231+
To develop and test:
232+
if you use `yarn` then run `yarn`
233+
if you use `pnpm` then run `pnpm i`
291234

292235
**Interactive Menu:**
293236

@@ -296,9 +239,7 @@ To start the interactive menu, run `npm start` (or `yarn start` or `pnpm start`)
296239
### Build
297240

298241
```bash
299-
npm run build
300-
301-
npm run build.angular # or for Angular
242+
npm run build.all
302243
```
303244

304245
### Demos
@@ -308,6 +249,51 @@ npm run demo.[ng|react|svelte|vue].[ios|android]
308249

309250
npm run demo.svelte.ios # Example
310251
```
252+
253+
254+
[](#contributing)
255+
256+
257+
[](#contributing)
258+
259+
## Contributing
260+
261+
### Update repo
262+
263+
You can update the repo files quite easily
264+
265+
First update the submodules
266+
267+
```bash
268+
npm run update
269+
```
270+
271+
Then commit the changes
272+
Then update common files
273+
274+
```bash
275+
npm run sync
276+
```
277+
Then you can run `yarn|pnpm`, commit changed files if any
278+
279+
### Update readme
280+
```bash
281+
npm run readme
282+
```
283+
284+
### Update doc
285+
```bash
286+
npm run doc
287+
```
288+
289+
### Publish
290+
291+
The publishing is completely handled by `lerna` (you can add `-- --bump major` to force a major release)
292+
Simply run
293+
```shell
294+
npm run publish
295+
```
296+
311297

312298
[](#questions)
313299

‎docs/.nojekyll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.

‎docs/assets/highlight.css

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
:root {
2+
--light-hl-0: #001080;
3+
--dark-hl-0: #9CDCFE;
4+
--light-hl-1: #000000;
5+
--dark-hl-1: #D4D4D4;
6+
--light-hl-2: #0000FF;
7+
--dark-hl-2: #569CD6;
8+
--light-hl-3: #267F99;
9+
--dark-hl-3: #4EC9B0;
10+
--light-hl-4: #AF00DB;
11+
--dark-hl-4: #C586C0;
12+
--light-hl-5: #A31515;
13+
--dark-hl-5: #CE9178;
14+
--light-hl-6: #795E26;
15+
--dark-hl-6: #DCDCAA;
16+
--light-hl-7: #008000;
17+
--dark-hl-7: #6A9955;
18+
--light-code-background: #FFFFFF;
19+
--dark-code-background: #1E1E1E;
20+
}
21+
22+
@media (prefers-color-scheme: light) { :root {
23+
--hl-0: var(--light-hl-0);
24+
--hl-1: var(--light-hl-1);
25+
--hl-2: var(--light-hl-2);
26+
--hl-3: var(--light-hl-3);
27+
--hl-4: var(--light-hl-4);
28+
--hl-5: var(--light-hl-5);
29+
--hl-6: var(--light-hl-6);
30+
--hl-7: var(--light-hl-7);
31+
--code-background: var(--light-code-background);
32+
} }
33+
34+
@media (prefers-color-scheme: dark) { :root {
35+
--hl-0: var(--dark-hl-0);
36+
--hl-1: var(--dark-hl-1);
37+
--hl-2: var(--dark-hl-2);
38+
--hl-3: var(--dark-hl-3);
39+
--hl-4: var(--dark-hl-4);
40+
--hl-5: var(--dark-hl-5);
41+
--hl-6: var(--dark-hl-6);
42+
--hl-7: var(--dark-hl-7);
43+
--code-background: var(--dark-code-background);
44+
} }
45+
46+
:root[data-theme='light'] {
47+
--hl-0: var(--light-hl-0);
48+
--hl-1: var(--light-hl-1);
49+
--hl-2: var(--light-hl-2);
50+
--hl-3: var(--light-hl-3);
51+
--hl-4: var(--light-hl-4);
52+
--hl-5: var(--light-hl-5);
53+
--hl-6: var(--light-hl-6);
54+
--hl-7: var(--light-hl-7);
55+
--code-background: var(--light-code-background);
56+
}
57+
58+
:root[data-theme='dark'] {
59+
--hl-0: var(--dark-hl-0);
60+
--hl-1: var(--dark-hl-1);
61+
--hl-2: var(--dark-hl-2);
62+
--hl-3: var(--dark-hl-3);
63+
--hl-4: var(--dark-hl-4);
64+
--hl-5: var(--dark-hl-5);
65+
--hl-6: var(--dark-hl-6);
66+
--hl-7: var(--dark-hl-7);
67+
--code-background: var(--dark-code-background);
68+
}
69+
70+
.hl-0 { color: var(--hl-0); }
71+
.hl-1 { color: var(--hl-1); }
72+
.hl-2 { color: var(--hl-2); }
73+
.hl-3 { color: var(--hl-3); }
74+
.hl-4 { color: var(--hl-4); }
75+
.hl-5 { color: var(--hl-5); }
76+
.hl-6 { color: var(--hl-6); }
77+
.hl-7 { color: var(--hl-7); }
78+
pre, code { background: var(--code-background); }

‎docs/assets/main.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/search.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)