Przeglądaj źródła

Submodule (#116)

* add submodules

* switch to using submodule for theme

* add branch
pull/118/head
Cian Butler 4 lat temu
committed by GitHub
rodzic
commit
2ed040da96
6 zmienionych plików z 21 dodań i 18 usunięć
  1. +0
    -1
      .gitignore
  2. +4
    -0
      .gitmodules
  3. +0
    -5
      bin/setup.sh
  4. +7
    -2
      package.json
  5. +1
    -0
      themes/redbrick-theme
  6. +9
    -10
      yarn.lock

+ 0
- 1
.gitignore Wyświetl plik

@@ -47,6 +47,5 @@ node_modules
public
db.json
_bower_components
themes
banner-*
thumb-*

+ 4
- 0
.gitmodules Wyświetl plik

@@ -0,0 +1,4 @@
[submodule "themes/redbrick-theme"]
path = themes/redbrick-theme
url = https://github.com/redbrick/hexo-theme-icarus.git
branch = master

+ 0
- 5
bin/setup.sh Wyświetl plik

@@ -1,5 +0,0 @@
if [ -d "themes/redbrick-theme" ]; then
exit 0;
else
git clone https://github.com/redbrick/hexo-theme-icarus.git themes/redbrick-theme
fi

+ 7
- 2
package.json Wyświetl plik

@@ -15,8 +15,8 @@
"server": "node ./bin/www",
"test": "npm run lint && npm run generate",
"lint": "./node_modules/.bin/semistandard",
"theme": "./bin/setup.sh",
"postinstall": "./bin/setup.sh && cd themes/redbrick-theme && npm install",
"theme": "git submodule init && git submodule update --remote",
"postinstall": "npm run theme && cd themes/redbrick-theme && npm install",
"generate": "npm run postinstall && hexo g",
"hexo": "hexo s",
"page": "hexo new page",
@@ -28,6 +28,11 @@
"hexo": {
"version": "3.2.2"
},
"semistandard": {
"ignore": [
"themes"
]
},
"dependencies": {
"async": "^2.0.1",
"body-parser": "~1.15.1",


+ 1
- 0
themes/redbrick-theme

@@ -0,0 +1 @@
Subproject commit 1794201b0d626db8d3829a8d9b728f8257bc407c

+ 9
- 10
yarn.lock Wyświetl plik

@@ -57,8 +57,9 @@ ajv-keywords@^1.0.0:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"

ajv@^4.7.0:
version "4.11.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"
version "4.11.3"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.3.tgz#ce30bdb90d1254f762c75af915fb3a63e7183d22"

dependencies:
co "^4.6.0"
json-stable-stringify "^1.0.1"
@@ -981,7 +982,11 @@ dom-walk@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"

domelementtype@1, domelementtype@~1.1.1:
domelementtype@1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"

domelementtype@~1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"

@@ -1090,18 +1095,12 @@ encodeurl@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"

end-of-stream@1.0.0:
end-of-stream@1.0.0, end-of-stream@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
dependencies:
once "~1.3.0"

end-of-stream@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.1.0.tgz#e9353258baa9108965efc41cb0ef8ade2f3cfb07"
dependencies:
once "~1.3.0"

entities@1.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"


Ładowanie…
Anuluj
Zapisz