Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
local-cdn
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
eterfund
local-cdn
Commits
a1c5e093
Commit
a1c5e093
authored
Nov 28, 2017
by
Etersoft admin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Switch to yarn instead of npm"
This reverts commit
43688ce3
.
parent
17e82ee7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
14 deletions
+8
-14
README.md
README.md
+2
-2
add.sh
add.sh
+2
-2
functions.sh
functions.sh
+3
-9
update.sh
update.sh
+1
-1
No files found.
README.md
View file @
a1c5e093
Зависимости для работы - jq и
yarn
(ставятся в теле скрипта через epm).
Зависимости для работы - jq и
npm
(ставятся в теле скрипта через epm).
Чтобы начать работу, нужно склонировать репозиторий и запустить ./init.sh - это
Чтобы начать работу, нужно склонировать репозиторий и запустить ./init.sh - это
создаст пустой registry.json.
создаст пустой registry.json.
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
нет);
нет);
-
Создастся (если ещё не существует) каталог packages/jquery/latest, а в нём
-
Создастся (если ещё не существует) каталог packages/jquery/latest, а в нём
package.json с "jquery": "
*
" в зависимостях;
package.json с "jquery": "
*
" в зависимостях;
-
В каталоге будет выполнен
yarn upgrade
;
-
В каталоге будет выполнен
npm install
;
-
Будет создан каталог public/jquery/latest, в нём хардлинки jquery.min.js и
-
Будет создан каталог public/jquery/latest, в нём хардлинки jquery.min.js и
jquery.js на сжатую версию, и jquery.development.js на несжатую.
jquery.js на сжатую версию, и jquery.development.js на несжатую.
...
...
add.sh
View file @
a1c5e093
...
@@ -48,10 +48,10 @@ if ! [[ "$version" =~ $re ]] && [ "$version" != "latest" ]; then
...
@@ -48,10 +48,10 @@ if ! [[ "$version" =~ $re ]] && [ "$version" != "latest" ]; then
fi
fi
epm assure jq
||
exit
epm assure jq
||
exit
epm assure
yarn
||
exit
epm assure
npm
||
exit
if
!
yarn info
"
$library
"
>
/dev/null
;
then
if
!
npm view
"
$library
"
>
/dev/null
;
then
echo
'Failed to get package info. Are you sure it exists?'
echo
'Failed to get package info. Are you sure it exists?'
echo
'If not sure, check npm-debug.log for details.'
echo
'If not sure, check npm-debug.log for details.'
exit
1
exit
1
...
...
functions.sh
View file @
a1c5e093
...
@@ -83,7 +83,7 @@ create_dist_link () {
...
@@ -83,7 +83,7 @@ create_dist_link () {
mkdir
-p
"
$public_base
"
||
fatal
mkdir
-p
"
$public_base
"
||
fatal
#if [ -z "$3" ]; then
#if [ -z "$3" ]; then
# main_file=$(
yarn info
"$1" main)
# main_file=$(
npm view
"$1" main)
#else
#else
#fi
#fi
if
[
"
$main_file_minified
"
!=
"-"
]
;
then
if
[
"
$main_file_minified
"
!=
"-"
]
;
then
...
@@ -106,7 +106,6 @@ create_package_version () {
...
@@ -106,7 +106,6 @@ create_package_version () {
mkdir
-p
"packages/
$1
/
$2
"
mkdir
-p
"packages/
$1
/
$2
"
rm
-f
"packages/
$1
/
$2
/package.json"
rm
-f
"packages/
$1
/
$2
/package.json"
# private: true is to avoid yarn warnings
cat
>>
"packages/
$1
/
$2
/package.json"
<<
EOL
cat
>>
"packages/
$1
/
$2
/package.json"
<<
EOL
{
{
"name": "",
"name": "",
...
@@ -114,8 +113,7 @@ create_package_version () {
...
@@ -114,8 +113,7 @@ create_package_version () {
"version": "0.1.0",
"version": "0.1.0",
"dependencies": {
"dependencies": {
"
$1
": "
$semver_version
"
"
$1
": "
$semver_version
"
},
}
"private": true
}
}
EOL
EOL
}
}
...
@@ -123,11 +121,7 @@ EOL
...
@@ -123,11 +121,7 @@ EOL
install_or_update_package
()
{
install_or_update_package
()
{
cd
"packages/
$1
/
$2
/"
||
fatal
cd
"packages/
$1
/
$2
/"
||
fatal
if
[
-e
yarn.lock
]
;
then
npm i
>
/dev/null
||
fatal
"Failed to install
$1
@
$2
"
yarn upgrade
>
/dev/null
||
fatal
"Failed to update
$1
@
$2
"
else
yarn
install
>
/dev/null
||
fatal
"Failed to install
$1
@
$2
"
fi
cd
../../../
||
fatal
cd
../../../
||
fatal
}
}
...
...
update.sh
View file @
a1c5e093
...
@@ -26,7 +26,7 @@ if [ "$1" == '-h' ] || [ "$1" == '--help' ] || [ $# -eq 1 ] ; then
...
@@ -26,7 +26,7 @@ if [ "$1" == '-h' ] || [ "$1" == '--help' ] || [ $# -eq 1 ] ; then
fi
fi
epm assure jq
||
exit
epm assure jq
||
exit
epm assure
yarn
||
exit
epm assure
npm
||
exit
library
=
"
$1
"
library
=
"
$1
"
version
=
"
$2
"
version
=
"
$2
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment