Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/mt-data-api-sdk-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ jobs:
cache: npm
node-version: 18
# # 'sudo' was not transformed because there is no suitable equivalent in GitHub Actions
- run: curl -sL https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2 | tar -xj
- run: sudo mv phantomjs-1.9.8-linux-x86_64 /usr/local/share/phantomjs
- run: sudo ln -sf /usr/local/share/phantomjs/bin/phantomjs /usr/local/bin/phantomjs
- run: npm install -g grunt-cli
- run: npm install -g bower
- run: bower install
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,5 @@ RUN set -ex \
&& npm install -g grunt-cli \
&& npm install -g bower

RUN curl -sL https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2 | tar -xj && \
mv phantomjs-1.9.8-linux-x86_64 /usr/local/share/phantomjs && \
ln -sf /usr/local/share/phantomjs/bin/phantomjs /usr/local/bin/phantomjs
ENV OPENSSL_CONF=/etc/ssl/

18 changes: 9 additions & 9 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,20 @@ module.exports = function( grunt ) {
},
preprocess: {
"data-api-browser": {
dest: "mt-static/data-api/v6/js/mt-data-api.js",
src: "src/data-api/v6/mt-data-api.js"
dest: "mt-static/data-api/v7/js/mt-data-api.js",
src: "src/data-api/v7/mt-data-api.js"
},
"data-api-node": {
dest: "node-lib/data-api/v6/node-mt-data-api.js",
src: "src/data-api/v6/node-mt-data-api.js"
dest: "node-lib/data-api/v7/node-mt-data-api.js",
src: "src/data-api/v7/node-mt-data-api.js"
},
"node-bootstrap": {
dest: "node-lib/bootstrap.js",
src: "src/node/bootstrap.js"
},
"data-api-coverage-endpoints": {
dest: ".src/data-api/coverage/endpoints.js",
src: "src/data-api/v6/endpoints.js"
src: "src/data-api/v7/endpoints.js"
}
},
watch: {
Expand All @@ -96,13 +96,13 @@ module.exports = function( grunt ) {
uglify: {
"data-api-browser": {
files: {
"mt-static/data-api/v6/js/mt-data-api.min.js": [
"mt-static/data-api/v6/js/mt-data-api.js"
"mt-static/data-api/v7/js/mt-data-api.min.js": [
"mt-static/data-api/v7/js/mt-data-api.js"
]
},
options: {
banner: "/* Copyright (c) Six Apart Ltd.\n * This file is generated by Movable Type DataAPI SDK for JavaScript.\n * Consult the source files for their respective licenses and copyrights.\n * <%= pkg.homepage %>\n */\n",
sourceMap: "mt-static/data-api/v6/js/mt-data-api.min.map",
sourceMap: "mt-static/data-api/v7/js/mt-data-api.min.map",
sourceMapPrefix: 4,
sourceMappingURL: "mt-data-api.min.map",
report: "min",
Expand Down Expand Up @@ -183,7 +183,7 @@ module.exports = function( grunt ) {
},
jasmine: {
"data-api": {
src: ["mt-static/data-api/v6/js/mt-data-api.js"],
src: ["mt-static/data-api/v7/js/mt-data-api.js"],
options: {
specs: "spec/data-api/**/*.js",
host: "http://localhost:<%= connect.jasmine.options.port %>/",
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ build:
test:
-grunt test

JSON_VERSION := v4
JSON_BASE_URL := http://mt-app.movabletype.test/cgi-bin/MT7-R4601/mt-data-api.cgi
JSON_VERSION := v7
JSON_BASE_URL := http://localhost/cgi-bin/mt/mt-data-api.cgi

json:
perl tools/make-json.pl --version=$(JSON_VERSION) --base-url=$(JSON_BASE_URL) > src/data-api/$(JSON_VERSION)/endpoints.json
Expand Down
Loading
Loading