Skip to content

Commit 5cad8ca

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # README.md # docs/assets/highlight.css # docs/index.html # package.json
2 parents 2e1accb + b66e831 commit 5cad8ca

File tree

6 files changed

+13
-232
lines changed

6 files changed

+13
-232
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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-vue"]
55
path = demo-vue
6-
url = git@github.com:nativescript-community/plugin-seed-demo-vue.git
6+
url = https://github.com/nativescript-community/plugin-seed-demo-vue.git

README.md

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
* [Update readme ](#update-readme-)
5757
* [Update doc ](#update-doc-)
5858
* [Publish](#publish)
59-
* [modifying submodules](#modifying-submodules)
6059
* [Questions](#questions)
6160

6261

@@ -185,7 +184,6 @@ To start the interactive menu, run `npm start` (or `yarn start` or `pnpm start`)
185184
```bash
186185
npm run build.all
187186
```
188-
WARNING: it seems `yarn build.all` wont always work (not finding binaries in `node_modules/.bin`) which is why the doc explicitly uses `npm run`
189187

190188
### Demos
191189

@@ -195,10 +193,6 @@ npm run demo.[ng|react|svelte|vue].[ios|android]
195193
npm run demo.svelte.ios # Example
196194
```
197195

198-
Demo setup is a bit special in the sense that if you want to modify/add demos you dont work directly in `demo-[ng|react|svelte|vue]`
199-
Instead you work in `demo-snippets/[ng|react|svelte|vue]`
200-
You can start from the `install.ts` of each flavor to see how to register new demos
201-
202196

203197
[](#contributing)
204198

@@ -243,115 +237,9 @@ Simply run
243237
npm run publish
244238
```
245239

246-
### modifying submodules
247-
248-
The repo uses https:// for submodules which means you won't be able to push directly into the submodules.
249-
One easy solution is t modify `~/.gitconfig` and add
250-
```
251-
[url "ssh://[email protected]/"]
252-
pushInsteadOf = https://github.com/
253-
```
254-
255-
256-
[](#questions)
257-
258240

259241
[](#questions)
260242

261-
## Questions
262-
263-
If you have any questions/issues/comments please feel free to create an issue or start a conversation in the [NativeScript Community Discord](https://nativescript.org/discord).
264-
265-
[](#demos-and-development)
266-
267-
## Demos and Development
268-
269-
270-
### Repo Setup
271-
272-
The repo uses submodules. If you did not clone with ` --recursive` then you need to call
273-
```
274-
git submodule update --init
275-
```
276-
277-
The package manager used to install and link dependencies must be `pnpm` or `yarn`. `npm` wont work.
278-
279-
To develop and test:
280-
if you use `yarn` then run `yarn`
281-
if you use `pnpm` then run `pnpm i`
282-
283-
**Interactive Menu:**
284-
285-
To start the interactive menu, run `npm start` (or `yarn start` or `pnpm start`). This will list all of the commonly used scripts.
286-
287-
### Build
288-
289-
```bash
290-
npm run build.all
291-
```
292-
WARNING: it seems `yarn build.all` wont always work (not finding binaries in `node_modules/.bin`) which is why the doc explicitly uses `npm run`
293-
294-
### Demos
295-
296-
```bash
297-
npm run demo.[ng|react|svelte|vue].[ios|android]
298-
299-
npm run demo.svelte.ios # Example
300-
```
301-
302-
Demo setup is a bit special in the sense that if you want to modify/add demos you dont work directly in `demo-[ng|react|svelte|vue]`
303-
Instead you work in `demo-snippets/[ng|react|svelte|vue]`
304-
You can start from the `install.ts` of each flavor to see how to register new demos
305-
306-
307-
[](#contributing)
308-
309-
## Contributing
310-
311-
### Update repo
312-
313-
You can update the repo files quite easily
314-
315-
First update the submodules
316-
317-
```bash
318-
npm run update
319-
```
320-
321-
Then commit the changes
322-
Then update common files
323-
324-
```bash
325-
npm run sync
326-
```
327-
Then you can run `yarn|pnpm`, commit changed files if any
328-
329-
### Update readme
330-
```bash
331-
npm run readme
332-
```
333-
334-
### Update doc
335-
```bash
336-
npm run doc
337-
```
338-
339-
### Publish
340-
341-
The publishing is completely handled by `lerna` (you can add `-- --bump major` to force a major release)
342-
Simply run
343-
```shell
344-
npm run publish
345-
```
346-
347-
### modifying submodules
348-
349-
The repo uses https:// for submodules which means you won't be able to push directly into the submodules.
350-
One easy solution is t modify `~/.gitconfig` and add
351-
```
352-
[url "ssh://[email protected]/"]
353-
pushInsteadOf = https://github.com/
354-
```
355243

356244
[](#questions)
357245

docs/assets/highlight.css

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
--dark-hl-8: #B5CEA8;
2020
--light-hl-9: #008000;
2121
--dark-hl-9: #6A9955;
22-
--light-hl-10: #000000;
23-
--dark-hl-10: #C8C8C8;
2422
--light-code-background: #FFFFFF;
2523
--dark-code-background: #1E1E1E;
2624
}
@@ -36,7 +34,6 @@
3634
--hl-7: var(--light-hl-7);
3735
--hl-8: var(--light-hl-8);
3836
--hl-9: var(--light-hl-9);
39-
--hl-10: var(--light-hl-10);
4037
--code-background: var(--light-code-background);
4138
} }
4239

@@ -51,7 +48,6 @@
5148
--hl-7: var(--dark-hl-7);
5249
--hl-8: var(--dark-hl-8);
5350
--hl-9: var(--dark-hl-9);
54-
--hl-10: var(--dark-hl-10);
5551
--code-background: var(--dark-code-background);
5652
} }
5753

@@ -66,7 +62,6 @@
6662
--hl-7: var(--light-hl-7);
6763
--hl-8: var(--light-hl-8);
6864
--hl-9: var(--light-hl-9);
69-
--hl-10: var(--light-hl-10);
7065
--code-background: var(--light-code-background);
7166
}
7267

@@ -81,7 +76,6 @@
8176
--hl-7: var(--dark-hl-7);
8277
--hl-8: var(--dark-hl-8);
8378
--hl-9: var(--dark-hl-9);
84-
--hl-10: var(--dark-hl-10);
8579
--code-background: var(--dark-code-background);
8680
}
8781

@@ -95,5 +89,4 @@
9589
.hl-7 { color: var(--hl-7); }
9690
.hl-8 { color: var(--hl-8); }
9791
.hl-9 { color: var(--hl-9); }
98-
.hl-10 { color: var(--hl-10); }
9992
pre, code { background: var(--code-background); }

docs/index.html

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ <h2>Table of Contents</h2>
7474
<li><a href="#update-readme-">Update readme </a></li>
7575
<li><a href="#update-doc-">Update doc </a></li>
7676
<li><a href="#publish">Publish</a></li>
77-
<li><a href="#modifying-submodules">modifying submodules</a></li>
7877
</ul>
7978
</li>
8079
<li><a href="#questions">Questions</a></li>
@@ -165,16 +164,12 @@ <h3>Build</h3>
165164
</a>
166165
<pre><code class="language-bash"><span class="hl-1">npm run build.all</span>
167166
</code></pre>
168-
<p>WARNING: it seems <code>yarn build.all</code> wont always work (not finding binaries in <code>node_modules/.bin</code>) which is why the doc explicitly uses <code>npm run</code></p>
169167

170168
<a href="#demos" id="demos" style="color: inherit; text-decoration: none;">
171169
<h3>Demos</h3>
172170
</a>
173171
<pre><code class="language-bash"><span class="hl-1">npm run demo.[ng|react|svelte|vue].[ios|android]</span><br/><br/><span class="hl-1">npm run demo.svelte.ios </span><span class="hl-9"># Example</span>
174172
</code></pre>
175-
<p>Demo setup is a bit special in the sense that if you want to modify/add demos you dont work directly in <code>demo-[ng|react|svelte|vue]</code>
176-
Instead you work in <code>demo-snippets/[ng|react|svelte|vue]</code>
177-
You can start from the <code>install.ts</code> of each flavor to see how to register new demos </p>
178173
<p><a href="#contributing"></a></p>
179174
<p><a href="#contributing"></a></p>
180175

@@ -214,107 +209,13 @@ <h3>Publish</h3>
214209
Simply run </p>
215210
<pre><code class="language-shell"><span class="hl-1">npm run publish</span>
216211
</code></pre>
217-
218-
<a href="#modifying-submodules" id="modifying-submodules" style="color: inherit; text-decoration: none;">
219-
<h3>modifying submodules</h3>
220-
</a>
221-
<p>The repo uses https:// for submodules which means you won&#39;t be able to push directly into the submodules.
222-
One easy solution is t modify <code>~/.gitconfig</code> and add</p>
223-
<pre><code><span class="hl-1">[</span><span class="hl-2">url</span><span class="hl-1"> </span><span class="hl-3">&quot;ssh://[email protected]/&quot;</span><span class="hl-1">]</span><br/><span class="hl-1"> </span><span class="hl-2">pushInsteadOf</span><span class="hl-1"> = </span><span class="hl-10">https</span><span class="hl-1">:</span><span class="hl-9">//github.com/</span>
224-
</code></pre>
225212
<p><a href="#questions"></a></p>
226213
<p><a href="#questions"></a></p>
227214

228215
<a href="#questions" id="questions" style="color: inherit; text-decoration: none;">
229216
<h2>Questions</h2>
230217
</a>
231218
<p>If you have any questions/issues/comments please feel free to create an issue or start a conversation in the <a href="https://nativescript.org/discord">NativeScript Community Discord</a>.</p>
232-
<p><a href="#demos-and-development"></a></p>
233-
234-
<a href="#demos-and-development-1" id="demos-and-development-1" style="color: inherit; text-decoration: none;">
235-
<h2>Demos and Development</h2>
236-
</a>
237-
238-
<a href="#repo-setup-1" id="repo-setup-1" style="color: inherit; text-decoration: none;">
239-
<h3>Repo Setup</h3>
240-
</a>
241-
<p>The repo uses submodules. If you did not clone with <code> --recursive</code> then you need to call</p>
242-
<pre><code><span class="hl-2">git</span><span class="hl-1"> </span><span class="hl-2">submodule</span><span class="hl-1"> </span><span class="hl-2">update</span><span class="hl-1"> --</span><span class="hl-2">init</span>
243-
</code></pre>
244-
<p>The package manager used to install and link dependencies must be <code>pnpm</code> or <code>yarn</code>. <code>npm</code> wont work.</p>
245-
<p>To develop and test:
246-
if you use <code>yarn</code> then run <code>yarn</code>
247-
if you use <code>pnpm</code> then run <code>pnpm i</code></p>
248-
<p><strong>Interactive Menu:</strong></p>
249-
<p>To start the interactive menu, run <code>npm start</code> (or <code>yarn start</code> or <code>pnpm start</code>). This will list all of the commonly used scripts.</p>
250-
251-
<a href="#build-1" id="build-1" style="color: inherit; text-decoration: none;">
252-
<h3>Build</h3>
253-
</a>
254-
<pre><code class="language-bash"><span class="hl-1">npm run build.all</span>
255-
</code></pre>
256-
<p>WARNING: it seems <code>yarn build.all</code> wont always work (not finding binaries in <code>node_modules/.bin</code>) which is why the doc explicitly uses <code>npm run</code></p>
257-
258-
<a href="#demos-1" id="demos-1" style="color: inherit; text-decoration: none;">
259-
<h3>Demos</h3>
260-
</a>
261-
<pre><code class="language-bash"><span class="hl-1">npm run demo.[ng|react|svelte|vue].[ios|android]</span><br/><br/><span class="hl-1">npm run demo.svelte.ios </span><span class="hl-9"># Example</span>
262-
</code></pre>
263-
<p>Demo setup is a bit special in the sense that if you want to modify/add demos you dont work directly in <code>demo-[ng|react|svelte|vue]</code>
264-
Instead you work in <code>demo-snippets/[ng|react|svelte|vue]</code>
265-
You can start from the <code>install.ts</code> of each flavor to see how to register new demos </p>
266-
<p><a href="#contributing"></a></p>
267-
268-
<a href="#contributing-1" id="contributing-1" style="color: inherit; text-decoration: none;">
269-
<h2>Contributing</h2>
270-
</a>
271-
272-
<a href="#update-repo-1" id="update-repo-1" style="color: inherit; text-decoration: none;">
273-
<h3>Update repo</h3>
274-
</a>
275-
<p>You can update the repo files quite easily</p>
276-
<p>First update the submodules</p>
277-
<pre><code class="language-bash"><span class="hl-1">npm run update</span>
278-
</code></pre>
279-
<p>Then commit the changes
280-
Then update common files</p>
281-
<pre><code class="language-bash"><span class="hl-1">npm run sync</span>
282-
</code></pre>
283-
<p>Then you can run <code>yarn|pnpm</code>, commit changed files if any</p>
284-
285-
<a href="#update-readme-1" id="update-readme-1" style="color: inherit; text-decoration: none;">
286-
<h3>Update readme</h3>
287-
</a>
288-
<pre><code class="language-bash"><span class="hl-1">npm run readme</span>
289-
</code></pre>
290-
291-
<a href="#update-doc-1" id="update-doc-1" style="color: inherit; text-decoration: none;">
292-
<h3>Update doc</h3>
293-
</a>
294-
<pre><code class="language-bash"><span class="hl-1">npm run doc</span>
295-
</code></pre>
296-
297-
<a href="#publish-1" id="publish-1" style="color: inherit; text-decoration: none;">
298-
<h3>Publish</h3>
299-
</a>
300-
<p>The publishing is completely handled by <code>lerna</code> (you can add <code>-- --bump major</code> to force a major release)
301-
Simply run </p>
302-
<pre><code class="language-shell"><span class="hl-1">npm run publish</span>
303-
</code></pre>
304-
305-
<a href="#modifying-submodules-1" id="modifying-submodules-1" style="color: inherit; text-decoration: none;">
306-
<h3>modifying submodules</h3>
307-
</a>
308-
<p>The repo uses https:// for submodules which means you won&#39;t be able to push directly into the submodules.
309-
One easy solution is t modify <code>~/.gitconfig</code> and add</p>
310-
<pre><code><span class="hl-1">[</span><span class="hl-2">url</span><span class="hl-1"> </span><span class="hl-3">&quot;ssh://[email protected]/&quot;</span><span class="hl-1">]</span><br/><span class="hl-1"> </span><span class="hl-2">pushInsteadOf</span><span class="hl-1"> = </span><span class="hl-10">https</span><span class="hl-1">:</span><span class="hl-9">//github.com/</span>
311-
</code></pre>
312-
<p><a href="#questions"></a></p>
313-
314-
<a href="#questions-1" id="questions-1" style="color: inherit; text-decoration: none;">
315-
<h2>Questions</h2>
316-
</a>
317-
<p>If you have any questions/issues/comments please feel free to create an issue or start a conversation in the <a href="https://nativescript.org/discord">NativeScript Community Discord</a>.</p>
318219
</div></div>
319220
<div class="col-4 col-menu menu-sticky-wrap menu-highlight">
320221
<div class="tsd-navigation settings">

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"demo.ng.clean": "cd ./demo-ng && ns clean",
2222
"demo.ng.ios": "cd ./demo-ng && ns run ios --no-hmr --env.watchNodeModules",
2323
"postinstall": "npm run setup",
24-
"publish": "npm run clean ; npm run build.all ; npm run readme ; npm run doc ; npm run commit_readme_doc_changes ; lerna publish",
24+
"publish": "npm run clean && npm run build.all && npm run readme && lerna publish --no-private --create-release=github --force-publish",
2525
"readme": "lerna run readme && node ./tools/readme.js",
2626
"setup": "npm run submodules && ts-patch install",
2727
"start": "./node_modules/.bin/ntl -A -s 15 -o",
@@ -31,8 +31,7 @@
3131
"tsc": "cpy '**/*.d.ts' '../plugin' --parents --cwd=src && tsc -skipLibCheck -d",
3232
"update": "node ./tools/update.js",
3333
"doc": "node tools/builddoc.mjs",
34-
"fullclean": "npm run clean && rimraf 'packages/**/node_modules' 'demo-*/hooks' 'demo-*/node_modules' 'package-lock.json' 'pnpm-lock.yaml' 'node_modules'",
35-
"commit_readme_doc_changes": "git add docs *.md ; git commit -m \"readme/doc\""
34+
"fullclean": "npm run clean && rimraf 'packages/**/node_modules' 'demo-*/hooks' 'demo-*/node_modules' 'package-lock.json' 'pnpm-lock.yaml' 'node_modules'"
3635
},
3736
"commitlint": {
3837
"extends": [

0 commit comments

Comments
 (0)