Skip to content

Commit 89f308c

Browse files
authored
Merge pull request #132 from hypery2k/bugfix/build-and-release
Corrected build error
2 parents 1e9d40e + 62b7e2a commit 89f308c

File tree

4 files changed

+8
-2544
lines changed

4 files changed

+8
-2544
lines changed

demo-angular/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@angular/platform-browser-dynamic": "5.2.9",
3232
"@angular/router": "5.2.9",
3333
"nativescript-angular": "5.3.0-2018-03-25-01",
34-
"nativescript-fabric": "file:../publish/package/nativescript-fabric-2.0.0.tgz",
34+
"nativescript-fabric": "*",
3535
"nativescript-theme-core": "1.0.4",
3636
"nativescript-unit-test-runner": "0.3.4",
3737
"rxjs": "5.5.6",
@@ -60,11 +60,11 @@
6060
"raw-loader": "~0.5.1",
6161
"resolve-url-loader": "~2.1.0",
6262
"tslint": "~5.4.3",
63-
"typescript": "~2.4.2",
63+
"typescript": "~2.6.2",
6464
"uglifyjs-webpack-plugin": "~1.1.6",
6565
"webpack": "~3.8.1",
6666
"webpack-bundle-analyzer": "^2.8.2",
6767
"webpack-sources": "~1.0.1",
6868
"clean-webpack-plugin": "~0.1.19"
6969
}
70-
}
70+
}

demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}
2828
},
2929
"dependencies": {
30-
"nativescript-fabric": "file:../publish/package/nativescript-fabric-2.0.0.tgz",
30+
"nativescript-fabric": "*",
3131
"nativescript-theme-core": "^1.0.2",
3232
"nativescript-unit-test-runner": "^0.3.4",
3333
"tns-core-modules": "^4.0.0"
@@ -66,4 +66,4 @@
6666
"webpack-sources": "~1.0.1",
6767
"clean-webpack-plugin": "~0.1.19"
6868
}
69-
}
69+
}

publish/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
"description": "Publish helper",
55
"scripts": {
66
"create-lib-scripts": "npm install --ignore-scripts && webpack --config scripts/webpack.config.js scripts/postinstall.js ../src/lib/postinstall.js && cd ../src && rm -rf node_modules/ package-lock.json && npm install --ignore-scripts",
7-
"setup-local-package": "rm -rf package/* && ./pack.sh && cd ../demo && npm i ../publish/package/*.tgz --ignore-scripts && npm install && cd ../demo-angular && npm i ../publish/package/*.tgz --ignore-scripts && npm install",
7+
"setup-local-package": "rm -rf package/* && ./pack.sh && cd ../demo && npm i ../publish/package/*.tgz --ignore-scripts --no-save && npm install && cd ../demo-angular && npm i ../publish/package/*.tgz --ignore-scripts --no-save && npm install",
88
"setup-dev-env": "npm run create-lib-scripts && npm run setup-local-package",
99
"end2end:demo": "cd ../demo && rm -rf hooks/ node_modules/ platforms/ package-lock.json && npm run build.plugin && npm i && npm run build-android-bundle && npm run build-ios-bundle && tns test android --justlaunch && tns test ios --emulator --justlaunch",
1010
"end2end:demo-ng": "cd ../demo-angular && rm -rf hooks/ node_modules/ platforms/ package-lock.json && npm run build.plugin && npm i && npm run build-android-bundle",
1111
"end2end": "npm run setup-dev-env && npm run end2end:demo && npm run end2end:demo-ng",
1212
"changelog": "cd ../src && conventional-changelog -p angular -i ../CHANGELOG.md -s -r 0",
13-
"changelog:add": "git add ../CHANGELOG.md && git commit -m 'chore(changelog): Updated CHANGELOG.md'",
14-
"release:pre": "cd ../src && npm run clean && npm run test",
15-
"release:post": "npm run changelog && git add ../src && git add ../CHANGELOG.md && git commit -m 'chore(release): New Release'",
13+
"release:pre": "cd ../src && npm run clean && npm run test && cd ../publish && npm run setup-local-package",
14+
"release:post": "npm run changelog && npm run release:pre && git add ../src && git add ../CHANGELOG.md && git commit -m 'chore(release): New Release'",
1615
"release:major": "npm run release:pre && cd ../src && npm version major && cd ../publish && npm run release:post && git push origin && git push origin --tags && npm run version-and-push",
1716
"release:minor": "npm run release:pre && cd ../src && npm version minor && cd ../publish && npm run release:post && git push origin && git push origin --tags && npm run version-and-push",
1817
"release:patch": "npm run release:pre && cd ../src && npm version patch && cd ../publish && npm run release:post && git push origin && git push origin --tags && npm run version-and-push",

0 commit comments

Comments
 (0)