inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-denys-340

Browse Source 
# Conflicts:
#	ng2-components/ng2-alfresco-datatable/package.json
#	ng2-components/ng2-alfresco-documentlist/package.json
This commit is contained in:
Denys Vuika
2016-07-06 13:06:31 +01:00
parent 2377a59361 fa8a98f947
commit a1df4af65e
14 changed files with 90 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
demo-shell-ng2/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "Alfresco-Angular2-Demo",
"description": "Demo shell for Alfresco Angular2 components",
"version": "0.1.0",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf node_modules typings",
@@ -76,13 +76,13 @@
"flag-icon-css": "2.3.0",
"alfresco-js-api": "^0.1.0",
"ng2-alfresco-core": "0.0.0-PLACEHOLDER",
"ng2-alfresco-datatable": "0.0.0-PLACEHOLDER",
"ng2-alfresco-documentlist": "0.0.0-PLACEHOLDER",
"ng2-alfresco-login": "0.0.0-PLACEHOLDER",
"ng2-alfresco-search": "0.0.0-PLACEHOLDER",
"ng2-alfresco-upload": "0.0.0-PLACEHOLDER",
"ng2-alfresco-viewer": "0.0.0-PLACEHOLDER"
"ng2-alfresco-core": "0.2.0",
"ng2-alfresco-datatable": "0.2.0",
"ng2-alfresco-documentlist": "0.2.0",
"ng2-alfresco-login": "0.2.0",
"ng2-alfresco-search": "0.2.0",
"ng2-alfresco-upload": "0.2.0",
"ng2-alfresco-viewer": "0.2.0"
},
"devDependencies": {
"browser-sync": "2.10.0",

2
ng2-components/ng2-alfresco-core/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-core",
"description": "Alfresco Angular 2 Components core",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",

2
ng2-components/ng2-alfresco-datatable/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-datatable",
"description": "Alfresco Angular2 DataTable Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",

8
ng2-components/ng2-alfresco-documentlist/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-documentlist",
"description": "Alfresco Angular2 Document List Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",
@@ -74,9 +74,9 @@
"zone.js": "0.6.12",
"rimraf": "2.5.2",
"ng2-translate": "2.2.2",
"alfresco-js-api": "^0.1.0",
"ng2-alfresco-core": "0.0.0-PLACEHOLDER",
"ng2-alfresco-datatable": "0.0.0-PLACEHOLDER"
"ng2-alfresco-core": "0.2.0",
"ng2-alfresco-datatable": "0.2.0",
"alfresco-js-api": "^0.1.0"
},
"peerDependencies": {
"material-design-icons": "^2.2.3",

4
ng2-components/ng2-alfresco-login/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-login",
"description": "Alfresco Angular2 Login Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",
@@ -82,7 +82,7 @@
"zone.js": "0.6.12",
"rimraf": "2.5.2",
"ng2-translate": "2.2.2",
"ng2-alfresco-core": "0.0.0-PLACEHOLDER",
"ng2-alfresco-core": "0.2.0",
"alfresco-js-api": "^0.1.0",
"coveralls": "^2.11.9"
},

4
ng2-components/ng2-alfresco-search/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-search",
"description": "Alfresco Angular2 Search Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",
@@ -76,7 +76,7 @@
"ng2-translate": "2.2.2",
"material-design-lite": "1.1.3",
"alfresco-js-api": "^0.1.0",
"ng2-alfresco-core": "0.0.0-PLACEHOLDER"
"ng2-alfresco-core": "0.2.0"
},
"peerDependencies": {
"material-design-icons": "^2.2.3",

4
ng2-components/ng2-alfresco-upload/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-upload",
"description": "Alfresco Angular2 Upload Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",
@@ -78,7 +78,7 @@
"rimraf": "2.5.2",
"ng2-translate": "2.2.2",
"alfresco-js-api": "^0.1.0",
"ng2-alfresco-core": "0.0.0-PLACEHOLDER"
"ng2-alfresco-core": "0.2.0"
},
"peerDependencies": {
"material-design-icons": "^2.2.3",

2
ng2-components/ng2-alfresco-viewer/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-viewer",
"description": "Alfresco documents viewer",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",

7
scripts/README.md
View File

@@ -34,4 +34,11 @@ feel for what's available.
./start.sh -update
```
* If you want to use your local components use the following script with any of the previous option. It will npm link all the components
in the demo shell:
```sh
./start-linked.sh
```
For development environment configuration please refer to [project docs](demo-shell-ng2/README.md).

2
scripts/npm-clean.sh
View File

@@ -18,3 +18,5 @@ done
cd "$DIR/../demo-shell-ng2"
npm run clean
cd ${DIR}

7
scripts/npm-publish.sh
View File

@@ -2,6 +2,8 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
"$DIR/npm-clean.sh"
for PACKAGE in \
ng2-alfresco-core \
ng2-alfresco-datatable \
@@ -13,5 +15,8 @@ for PACKAGE in \
do
DESTDIR="$DIR/../ng2-components/${PACKAGE}"
echo "====== PUBLISHING: ${DESTDIR} ====="
npm publish ${DESTDIR}
cd ${DESTDIR}
npm install
npm publish
cd ${DIR}
done

21
scripts/start-linked.sh Executable file
View File

@@ -0,0 +1,21 @@
#!/usr/bin/env bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
"$DIR/npm-link-demo-shell.sh"
cd "$DIR/../demo-shell-ng2"
if [[ $1 = "-install" ]]; then
npm install
npm run start
elif [[ $1 = "-update " ]]; then
npm run update
npm run start
elif [[ $1 = "-cleanInstall" ]]; then
npm run clean
npm install
npm run start
else
npm run start
fi

16
scripts/start.sh
View File

@@ -2,22 +2,6 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
for PACKAGE in \
ng2-alfresco-core \
ng2-alfresco-datatable \
ng2-alfresco-documentlist \
ng2-alfresco-login \
ng2-alfresco-search \
ng2-alfresco-upload \
ng2-alfresco-viewer
do
cd "$DIR/../ng2-components/${PACKAGE}"; npm version patch
done
"$DIR/update-version.sh" ^0.1.0
"$DIR/npm-link-demo-shell.sh"
cd "$DIR/../demo-shell-ng2"
if [[ $1 = "-install" ]]; then

35
scripts/update-version.sh
View File

@@ -1,5 +1,7 @@
#!/usr/bin/env bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
set -ex
cd `dirname $0`
@@ -12,5 +14,34 @@ then
exit 1
fi
echo "====== RENAMING 0.0.0-PLACEHOLDER to N.N.N version ======"
find ././../ -type f -name package.json -print0 | xargs -0 sed -i '' "s/0\\.0\\.0-PLACEHOLDER/${VERSION}/g"
for PACKAGE in \
ng2-alfresco-core \
ng2-alfresco-datatable \
ng2-alfresco-documentlist \
ng2-alfresco-login \
ng2-alfresco-search \
ng2-alfresco-upload \
ng2-alfresco-viewer
do
DESTDIR="$DIR/../ng2-components/${PACKAGE}"
echo "====== UPDATE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======"
find ././../ -type f -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"0\\.2\\.0\"/\"${PACKAGE}\": \"${VERSION}\"/g"
done
for PACKAGE in \
ng2-alfresco-core \
ng2-alfresco-datatable \
ng2-alfresco-documentlist \
ng2-alfresco-login \
ng2-alfresco-search \
ng2-alfresco-upload \
ng2-alfresco-viewer
do
DESTDIR="$DIR/../ng2-components/${PACKAGE}"
echo "====== UPDATE VERSION OF ${PACKAGE} to ${VERSION} version ======"
sed -i '' "s/\"version\": \"0\\.2\\.0\"/\"version\": \"${VERSION}\"/g" ${DESTDIR}/package.json
done
echo "====== UPDATE VERSION OF DEMO-SHELL to ${VERSION} version ======"
sed -i '' "s/\"version\": \"0\\.2\\.0\"/\"version\": \"${VERSION}\"/g" ${DIR}/../demo-shell-ng2/package.json