Skip to content

Commit

Permalink
chore(dev-env): Remove bower on dev env
Browse files Browse the repository at this point in the history
Removed bower install for dev setup
Updated all 'bower_components' reference

Fix naver#391
Close naver#395
  • Loading branch information
netil authored Nov 1, 2016
1 parent 4b39ff4 commit 733a072
Show file tree
Hide file tree
Showing 36 changed files with 115 additions and 103 deletions.
14 changes: 5 additions & 9 deletions README-ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ egjs의 jQuery 확장 메서드는 다음과 같다.
* persist() 메서드: 웹 페이지의 현재 상태를 키에 JSON 형식으로 저장한다.
- [API 문서](http://naver.github.io/egjs/latest/doc/jQuery.html#persist)
- [메서드 사용 예](http://naver.github.io/egjs/demo/persist/), [메서드 사용 예(CodePen)](http://codepen.io/collection/XOLpog/)
* prefixCss() 메서드: CSS 속성의 제조사 접두어(vendor prefix)를 지원하지 않는 일부 jQuery 버전을 사용할 때 제조사 접두어를 지원할 수 있게 한다.
* prefixCss() 메서드: CSS 속성의 제조사 접두어(vendor prefix)를 지원하지 않는 일부 jQuery 버전(1.4.3 ~ 1.7.x)을 사용할 때 제조사 접두어를 지원할 수 있게 한다.
- [API 문서](http://naver.github.io/egjs/latest/doc/jQuery.html#persist)
- [메서드 사용 예](http://naver.github.io/egjs/demo/cssPrefix/)
* animate() 메서드: jQuery의 animate() 메서드를 확장한 메서드. CSS의 transform 속성과 3D 가속을 사용할 수 있다.
Expand Down Expand Up @@ -140,7 +140,7 @@ jQuery를 먼저 로딩한 다음 egjs를 로딩하게 설정한다.
```html
...
<!-- jQuery 로딩 -->
<script src="bower_components/jquery/jquery.js"></script>
<script src="node_modules/jquery/dist/jquery.js"></script>

<!-- 모든 의존성(Hammer.js) 파일이 패키징된 egjs를 로딩 -->
<!-- 로컬에 설치된 파일을 로딩 -->
Expand Down Expand Up @@ -171,14 +171,13 @@ egjs를 개발하려면 다음과 같이 개발 환경을 설정한다.

### 개발 환경 설정

#### 1. grunt-cli, Bower 설치
#### 1. grunt-cli 설치

grunt-cli와 Bower를 전역으로 설치한다.
grunt-cli를 전역으로 설치한다.

```bash

$ npm install grunt-cli -g # grunt-cli 설치
$ npm install bower -g # Bower 설치
```

#### 2. 저장소 복제와 의존성 모듈 설치
Expand All @@ -192,10 +191,7 @@ $ mkdir egjs && cd egjs
# 저장소에서 코드를 복제
$ git clone https://github.com/naver/egjs.git

# Bower 의존성 모듈 설치
$ bower install

# node 의존성 모듈 설치
# node 의존성 모듈들을 설치
$ npm install
```

Expand Down
14 changes: 5 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The following is a list of methods extended from jQuery.
* persist() method: Stores the current state of a webpage into a key in JSON.
- [API Documentation](http://naver.github.io/egjs/latest/doc/jQuery.html#persist)
- [Usage Examples](http://naver.github.io/egjs/demo/persist/), [Usage Examples (CodePen)](http://codepen.io/collection/XOLpog/)
* prefixCss() method: Enables to add CSS vendor prefixes when you use jQuery that does not support them.
* prefixCss() method: Enables to add CSS vendor prefixes when you use some jQuery version(1.4.3 ~ 1.7.x) that does not support them.
- [API Documentation](http://naver.github.io/egjs/latest/doc/jQuery.html#persist)
- [Usage Examples](http://naver.github.io/egjs/demo/cssPrefix/)
* animate() method: A method extended from the jQuery animate() method. It supports CSS transform property and 3D acceleration.
Expand Down Expand Up @@ -139,7 +139,7 @@ Let egjs load after jQuery loads.
```html
...
<!-- Load jQuery -->
<script src="bower_components/jquery/jquery.js"></script>
<script src="node_modules/jquery/dist/jquery.js"></script>

<!-- Load egjs packaged with all dependencies (Hammer.js) -->
<!-- Load from your local installation -->
Expand Down Expand Up @@ -170,13 +170,12 @@ For anyone interested to develop egjs, follow the instructions below.

### Development Environment

#### 1. Install grunt-cli and Bower
#### 1. Install grunt-cli

Install grunt-cli and Bower globally.
Install grunt-cli globally.

```bash
$ npm install grunt-cli -g # Install grunt-cli
$ npm install bower -g # Install Bower
```

#### 2. Clone the repository and install dependencies
Expand All @@ -190,10 +189,7 @@ $ mkdir egjs && cd egjs
# Clone a repository.
$ git clone https://github.com/naver/egjs.git

# Install the Bower dependency module.
$ bower install

# Install the node dependency module.
# Install the node dependencies modules.
$ npm install
```

Expand Down
6 changes: 3 additions & 3 deletions config/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module.exports = {
expand: true,
flatten: true,
src: [
"bower_components/jquery/jquery.js",
"bower_components/hammer.js/hammer.js"
"node_modules/jquery/dist/jquery.js",
"node_modules/hammerjs/hammer.js"
],
dest: "dist/lib"
},
Expand All @@ -24,4 +24,4 @@ module.exports = {
dest: "node_modules/jsdoc/plugins/"
}]
}
};
};
2 changes: 1 addition & 1 deletion config/dependency.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ module.exports = {
"src/plugin/persist.js"
],
hammer : [
"bower_components/hammer.js/hammer.js"
"node_modules/hammerjs/hammer.js"
]
};
15 changes: 13 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,17 @@
"persist",
"plugin",
"javascript",
"jQuery"
"jQuery",
"transform",
"animation"
],
"dependencies": {
"jquery": "^1.7.0",
"qunitjs": "^1.17.1",
"hammerjs": "^2.0.4"
},
"devDependencies": {
"bootflat": "*",
"browserstack-runner": "^0.4.1",
"egjs-jsdoc-template": "*",
"grunt": "^0.4.5",
Expand All @@ -52,11 +60,14 @@
"grunt-jscs": "^2.1.0",
"grunt-jsdoc": "^0.5.8",
"grunt-qunit-istanbul": "^0.5.0",
"handlebars": "^4.0.5",
"husky": "^0.11.4",
"iscroll": "~5.1.3",
"jshint-stylish": "^1.0.1",
"jsonfile": "^2.2.3",
"load-grunt-tasks": "^3.1.0",
"respond.js": "^1.4.2",
"time-grunt": "^1.1.0",
"xml2js": "^0.4.15"
}
}
}
2 changes: 1 addition & 1 deletion test/manual/cssPrefix.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<style>
#el {font-size:20pt}
</style>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../unit/lib/jquery-1.7.2.min.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/eg.js"></script>
<script src="../../src/hook/cssPrefix.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions test/manual/flicking.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
</style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.5/es5-shim.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.5/es5-sham.js"></script>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../bower_components/hammer.js/hammer.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../node_modules/hammerjs/hammer.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/agent.js"></script>
<script src="../../src/eg.js"></script>
Expand Down
15 changes: 10 additions & 5 deletions test/manual/infiniteGird_demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,20 @@
<title>InfiniteGrid</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi">
<link rel="stylesheet" href="../../bower_components/bootflat/bootstrap/bootstrap.min.css">
<link rel="stylesheet" href="../../bower_components/bootflat/css/bootflat.css">

<!--<link rel="stylesheet" href="../../node_modules/bootflat/css/bootstrap.min.css">
<link rel="stylesheet" href="../../node_modules/bootflat/bootflat/css/bootflat.css">-->

<link rel="stylesheet" href="../../node_modules/bootflat/css/bootstrap.min.css">
<link rel="stylesheet" href="../../node_modules/bootflat/bootflat/css/bootflat.css">

<link rel="stylesheet" href="../../assets/css/item.css">
<!--[if lt IE 9]>
<script src="../../bower_components/respond/dest/respond.min.js"></script>
<script src="../../node_modules/respond.js/dest/respond.min.js"></script>
<![endif]-->

<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../bower_components/handlebars/handlebars.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../node_modules/handlebars/dist/handlebars.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/agent.js"></script>
<script src="../../src/eg.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion test/manual/infiniteGrid.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</style>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.5/es5-shim.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.5/es5-sham.js"></script> -->
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/eg.js"></script>
<script src="../../src/class.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions test/manual/movableCoord.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.5/es5-shim.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.5/es5-sham.js"></script>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../bower_components/hammer.js/hammer.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../node_modules/hammerjs/hammer.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/agent.js"></script>
<script src="../../src/eg.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions test/manual/movableCoord_basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</style>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.5/es5-shim.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.5/es5-sham.js"></script> -->
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../bower_components/hammer.js/hammer.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../node_modules/hammerjs/hammer.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/agent.js"></script>
<script src="../../src/eg.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion test/manual/pauseResume.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.2.0/styles/default.min.css"> -->
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.2.0/highlight.min.js"></script> -->
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.12.1/jquery.min.js"></script> -->
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/eg.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion test/manual/persist.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
-webkit-tap-highlight-color: rgba(0, 0, 0, .25);
}
</style>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/agent.js"></script>
<script src="../../src/eg.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion test/manual/rotate.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
background-color:red;
}
</style>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/agent.js"></script>
<script src="../../src/eg.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion test/manual/scrollEnd.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<style>
#el {font-size:20pt}
</style>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/agent.js"></script>
<script src="../../src/eg.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion test/manual/transform.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@


</style>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/eg.js"></script>
<script src="../../src/hook/cssPrefix.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions test/manual/visible.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@
width : 50px;
}
</style>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../bower_components/iscroll/build/iscroll.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../node_modules/iscroll/build/iscroll.js"></script>
<script src="../../src/module.js"></script>
<script src="../../src/agent.js"></script>
<script src="../../src/eg.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions test/unit/agent.test.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<meta charset="utf-8">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi"> -->

<link rel="stylesheet" href="../../bower_components/qunit/qunit/qunit.css">
<link rel="stylesheet" href="../../node_modules/qunitjs/qunit/qunit.css">
<!-- user css start -->
<style>
</style>
<!-- user css end -->
<script src="../../bower_components/qunit/qunit/qunit.js"></script>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
</head>
<body>
<h1 id="qunit-header">Extend Test</h1>
Expand Down
8 changes: 4 additions & 4 deletions test/unit/buildMerge.min.test.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<meta charset="utf-8">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi"> -->

<link rel="stylesheet" href="../../bower_components/qunit/qunit/qunit.css">
<link rel="stylesheet" href="../../node_modules/qunitjs/qunit/qunit.css">
<!-- user css start -->
<style>
</style>
<!-- user css end -->
<script src="../../bower_components/qunit/qunit/qunit.js"></script>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../bower_components/hammer.js/hammer.js"></script>
<script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../node_modules/hammerjs/hammer.js"></script>
</head>
<body>
<h1 id="qunit-header">Class Test</h1>
Expand Down
8 changes: 4 additions & 4 deletions test/unit/buildMerge.test.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<meta charset="utf-8">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi"> -->

<link rel="stylesheet" href="../../bower_components/qunit/qunit/qunit.css">
<link rel="stylesheet" href="../../node_modules/qunitjs/qunit/qunit.css">
<!-- user css start -->
<style>
</style>
<!-- user css end -->
<script src="../../bower_components/qunit/qunit/qunit.js"></script>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../bower_components/hammer.js/hammer.js"></script>
<script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
<script src="../../node_modules/hammerjs/hammer.js"></script>
</head>
<body>
<h1 id="qunit-header">Class Test</h1>
Expand Down
6 changes: 3 additions & 3 deletions test/unit/class.test.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<meta charset="utf-8">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi"> -->

<link rel="stylesheet" href="../../bower_components/qunit/qunit/qunit.css">
<link rel="stylesheet" href="../../node_modules/qunitjs/qunit/qunit.css">
<!-- user css start -->
<style>
</style>
<!-- user css end -->
<script src="../../bower_components/qunit/qunit/qunit.js"></script>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
</head>
<body>
<h1 id="qunit-header">Class Test</h1>
Expand Down
6 changes: 3 additions & 3 deletions test/unit/component.test.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<meta charset="utf-8">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi"> -->

<link rel="stylesheet" href="../../bower_components/qunit/qunit/qunit.css">
<link rel="stylesheet" href="../../node_modules/qunitjs/qunit/qunit.css">
<!-- user css start -->
<style>
</style>
<!-- user css end -->
<script src="../../bower_components/qunit/qunit/qunit.js"></script>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
<script src="../../node_modules/jquery/dist/jquery.js"></script>
</head>
<body>
<h1 id="qunit-header">Component Test</h1>
Expand Down
6 changes: 3 additions & 3 deletions test/unit/cssPrefix.test.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<meta charset="utf-8">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi"> -->

<link rel="stylesheet" href="../../bower_components/qunit/qunit/qunit.css">
<link rel="stylesheet" href="../../node_modules/qunitjs/qunit/qunit.css">
<!-- user css start -->
<style>
</style>
<!-- user css end -->
<script src="../../bower_components/qunit/qunit/qunit.js"></script>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
<script src="./lib/jquery-1.7.2.min.js"></script>
</head>
<body>
<h1 id="qunit-header">css Test</h1>
Expand Down
Loading

0 comments on commit 733a072

Please sign in to comment.