Skip to content

Commit 575170b

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents a21f3e4 + c54ff00 commit 575170b

File tree

9 files changed

+32
-45
lines changed

9 files changed

+32
-45
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NativeScript
22
hooks/
33
node_modules/
4-
/platforms/
4+
platforms
55

66
# NativeScript Template
77
*.js.map

.yarnrc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
compressionLevel: mixed
2+
13
nmHoistingLimits: workspaces
24

35
nodeLinker: node-modules
46

5-
yarnPath: tools/.yarn/releases/yarn-3.6.4.cjs
7+
yarnPath: tools/.yarn/releases/yarn-4.0.1.cjs

demo-ng

demo-react

lerna.json

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,32 @@
11
{
22
"version": "0.0.29",
3+
"$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
34
"packages": [
45
"packages/*"
56
],
67
"npmClient": "yarn",
78
"useWorkspaces": true,
89
"command": {
910
"publish": {
10-
"conventionalCommits": true,
11-
"conventionalBlacklist": [
12-
"chore"
13-
],
14-
"changelogPreset": "angular",
15-
"createRelease": "github",
16-
"commitHooks": false,
17-
"private": false,
18-
"ignoreChanges": [
19-
"*.md",
20-
"docs/**"
21-
]
22-
},
23-
"version": {
24-
"conventionalCommits": true,
25-
"conventionalBlacklist": [
26-
"chore"
27-
],
28-
"changelogPreset": "angular",
29-
"createRelease": "github",
30-
"commitHooks": false,
31-
"private": false,
32-
"ignoreChanges": [
33-
"*.md",
34-
"docs/**"
35-
]
36-
},
37-
"bootstrap": {
38-
"npmClientArgs": [
39-
"--no-package-lock"
11+
"cleanupTempFiles": true,
12+
"removePackageFields": [
13+
"devDependencies",
14+
"scripts"
4015
]
4116
}
42-
}
17+
},
18+
"npmClientArgs": [
19+
"--no-package-lock"
20+
],
21+
"commitHooks": false,
22+
"createRelease": "github",
23+
"conventionalCommits": true,
24+
"private": false,
25+
"message": "chore(release): publish new version %v",
26+
"changelogPreset": "conventional-changelog-conventionalcommits",
27+
"ignoreChanges": [
28+
"**/__fixtures__/**",
29+
"**/__tests__/**",
30+
"**/*.md"
31+
]
4332
}

package.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"demo.vue.clean": "cd ./demo-vue && ns clean",
3030
"demo.vue.ios": "cd ./demo-vue && ns run ios --no-hmr --env.watchNodeModules",
3131
"postinstall": "npm run setup",
32-
"publish": "npm run clean ; npm run build.all ; npm run readme ; npm run doc ; npm run commit_readme_doc_changes ; lerna publish",
32+
"publish": "npm run setup && npm run clean && npm run build.all && npm run readme && npm run doc && npm run commit_readme_doc_changes && lerna publish",
3333
"readme": "lerna run readme && node ./tools/readme.js",
3434
"setup": "npm run submodules && ts-patch install",
3535
"start": "./node_modules/.bin/ntl -A -s 15 -o",
@@ -40,7 +40,7 @@
4040
"update": "node ./tools/update.js",
4141
"doc": "node tools/builddoc.mjs",
4242
"fullclean": "npm run clean && rimraf 'packages/**/node_modules' 'demo-*/hooks' 'demo-*/node_modules' 'package-lock.json' 'pnpm-lock.yaml' 'node_modules'",
43-
"commit_readme_doc_changes": "git add docs *.md ; git commit -m \"readme/doc\""
43+
"commit_readme_doc_changes": "git add docs/** *.md ; git commit -m \"readme/doc\" ; echo \"commit readme doc done\""
4444
},
4545
"commitlint": {
4646
"extends": [
@@ -76,10 +76,6 @@
7676
},
7777
"workspaces": [
7878
"packages/*",
79-
"demo-vue",
80-
"demo-ng",
81-
"demo-svelte",
82-
"demo-react",
83-
"demo-snippets"
79+
"demo*"
8480
]
8581
}

0 commit comments

Comments
 (0)