mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-20 04:14:21 +08:00
Merge master
This commit is contained in:
@ -38,6 +38,8 @@ function run {
|
||||
./node_modules/.bin/gulp docs.dgeni --doc-version="$VERSION_NAME"
|
||||
./node_modules/.bin/gulp docs.dgeni --doc-version="nightly"
|
||||
|
||||
./node_modules/.bin/gulp docs.homepageVersionUpdate
|
||||
|
||||
else
|
||||
|
||||
if [ -d "$DOCS_DEST/nightly/api" ]; then
|
||||
|
@ -17,6 +17,7 @@ export const ES_2015 = 'es2015';
|
||||
export const ES5 = 'es5';
|
||||
export const INDEX_JS = 'index.js';
|
||||
export const BUNDLES = 'bundles';
|
||||
export const SITE_NAME = 'ionic-site';
|
||||
|
||||
// File Paths
|
||||
export const PROJECT_ROOT = join(__dirname, '../..');
|
||||
@ -36,6 +37,7 @@ export const DIST_VENDOR_ROOT = join(DIST_ROOT, VENDOR_NAME);
|
||||
export const NODE_MODULES_ROOT = join(PROJECT_ROOT, NODE_MODULES);
|
||||
export const SCRIPTS_ROOT = join(PROJECT_ROOT, SCRIPTS_NAME);
|
||||
export const SRC_ROOT = join(PROJECT_ROOT, SRC_NAME);
|
||||
export const SITE_ROOT = join(PROJECT_ROOT, '..', SITE_NAME);
|
||||
|
||||
export const SRC_COMPONENTS_ROOT = join(SRC_ROOT, COMPONENTS_NAME);
|
||||
export const WORKERS_SRC = join(SCRIPTS_ROOT, 'workers');
|
||||
|
@ -10,6 +10,8 @@ import { valid }from 'semver';
|
||||
import { argv } from 'yargs';
|
||||
|
||||
import { DIST_DEMOS_ROOT } from '../constants';
|
||||
import { SITE_ROOT } from '../constants';
|
||||
import { PROJECT_ROOT } from '../constants';
|
||||
|
||||
task('docs', ['docs.dgeni', 'docs.demos', 'docs.sassVariables']);
|
||||
|
||||
@ -136,3 +138,16 @@ task('docs.sassVariables', () => {
|
||||
writeFileSync(outputFile, JSON.stringify(variables));
|
||||
}));
|
||||
});
|
||||
|
||||
task('docs.homepageVersionUpdate', () => {
|
||||
// This assumes you're currently releasing
|
||||
const sourcePackageJSON = require(`${PROJECT_ROOT}/package.json`);
|
||||
let now = new Date();
|
||||
|
||||
const frameworkInfo = JSON.stringify({
|
||||
version: sourcePackageJSON.version,
|
||||
date: now.toISOString().split('T')[0]
|
||||
}, null, 2);
|
||||
|
||||
writeFileSync(`${SITE_ROOT}/server/data/framework-info.json`, frameworkInfo);
|
||||
});
|
||||
|
@ -85,6 +85,7 @@ function karmaTest(watch: boolean, done: Function) {
|
||||
|
||||
let karmaConfig = {
|
||||
configFile: join(SCRIPTS_ROOT, 'karma/karma.conf.js'),
|
||||
singleRun: true,
|
||||
};
|
||||
|
||||
if (watch) {
|
||||
@ -96,6 +97,9 @@ function karmaTest(watch: boolean, done: Function) {
|
||||
args: ['--grep', argv.testGrep]
|
||||
};
|
||||
}
|
||||
if (typeof argv.debug !== 'undefined') {
|
||||
karmaConfig.singleRun = false;
|
||||
}
|
||||
|
||||
new karma.Server(karmaConfig, done).start();
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
|
||||
|
||||
// disable console debugs/errors/warns from printing out
|
||||
console.debug = () => {};
|
||||
console.error = () => {};
|
||||
// console.error = () => {};
|
||||
console.warn = () => {};
|
||||
|
||||
__karma__.loaded = function () {};
|
||||
|
Reference in New Issue
Block a user