Skip to content

Commit fd70d0b

Browse files
committed
Merge branch 'master' into weex-loader-es6
2 parents 3d7ddb5 + d38b370 commit fd70d0b

35 files changed

+681
-11
lines changed

weex-loader/.eslintrc .eslintrc

File renamed without changes.

weex-loader/.gitignore .gitignore

File renamed without changes.

weex-loader/.npmignore .npmignore

File renamed without changes.

LICENSE

+674
Large diffs are not rendered by default.

weex-loader/README.md README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,23 +83,23 @@ Then change the entry to `main.js` in `webpack.config.js`
8383
#### add some loader in webpack config
8484

8585
**loader for script**
86-
```json
86+
```javascript
8787
{
8888
test: /\.js(\?[^?]+)?$/,
8989
loader: 'weex?type=script'
9090
}
9191
```
9292

9393
**loader for style**
94-
```json
94+
```javascript
9595
{
9696
test: /\.css(\?[^?]+)?$/,
9797
loader: 'weex?type=style'
9898
}
9999
```
100100

101101
**loader for template**
102-
```json
102+
```javascript
103103
{
104104
test: /\.tpl(\?[^?]+)?$/,
105105
loader: 'weex?type=tpl'
@@ -130,7 +130,7 @@ For examples:
130130

131131
Only your need is chain babel-loader before weex-loader.
132132

133-
```json
133+
```javascript
134134
{
135135
test: /\.js(\?[^?]+)?$/,
136136
loader: 'weex?type=script!babel?presets[]=es2015'
@@ -141,7 +141,7 @@ Only your need is chain babel-loader before weex-loader.
141141

142142
Only your need is chain scss loader before weex-loader.
143143

144-
```json
144+
```javascript
145145
{
146146
test: /\.scss(\?[^?]+)?$/,
147147
loader: 'weex?type=style!scss'

circle.yml

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
machine:
22
node:
33
version: 4.2.1
4-
5-
test:
6-
override:
7-
- cd weex-loader && npm install && npm run test && cd ..

weex-loader/index.js index.js

File renamed without changes.

weex-loader/package.json package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"author": "terrykingcha <[email protected]>",
77
"repository": {
88
"type": "git",
9-
"url": "git@github.com:alibaba/weex_toolchain.git"
9+
"url": "https://github.com/weexteam/weex-loader.git"
1010
},
11-
"licenses": "MIT",
11+
"licenses": "GPL",
1212
"keywords": [
1313
"weex",
1414
"loader",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

weex-loader/test/a.js test/a.js

File renamed without changes.
File renamed without changes.

weex-loader/test/a.tpl test/a.tpl

File renamed without changes.

weex-loader/test/b.js test/b.js

File renamed without changes.

weex-loader/test/b.tpl test/b.tpl

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)