Skip to content

Commit ceb26da

Browse files
ajoslinajoslin
committed
chore(build): reorganization for local testing & demos
1 parent 9f334ff commit ceb26da

60 files changed

Lines changed: 240 additions & 480 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
node_modules
33
*.sw[mnpcod]
44
*.log
5+
*.tmp
56
log.txt
67
example/cordova/iOS/www/js/framework
78

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ionic",
33
"version": "1.0.0-beta.6",
4-
"codename": "cadmium-camel",
4+
"codename": "gadolinium-gator",
55
"homepage": "https://github.com/driftyco/ionic",
66
"authors": [
77
"Max Lynch <[email protected]>",

‎config/build.config.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ var fs = require('fs');
33

44
module.exports = {
55
dist: 'dist',
6-
distJs: 'dist/js',
7-
distCss: 'dist/css',
86
releasePostUrl: fs.readFileSync('config/RELEASE_POST_URL'),
97

108
banner:

docs/README.md renamed to config/dgeni/README.md

‎config/dgeni/demos.config.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
var path = require('canonical-path');
2+
var _ = require('lodash');
3+
4+
var projectBase = path.resolve(__dirname, '../..');
5+
6+
module.exports = function(config) {
7+
8+
config.set('logging.level', 'info');
9+
10+
config.set('rendering.templateFolders', [
11+
path.resolve(__dirname, 'templates/demo')
12+
]);
13+
14+
config.set('basePath', __dirname);
15+
config.set('source.projectPath', '.');
16+
17+
config.set('rendering.outputFolder', path.resolve(projectBase, 'temp/ionic-demo'));
18+
19+
};

docs/docs.config.js renamed to config/dgeni/docs.config.js

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
var path = require('canonical-path');
2-
var basePath = path.resolve(__dirname, '..');
3-
42
var _ = require('lodash');
5-
63
var basePackage = require('dgeni-packages/ngdoc');
7-
var pkg = require('../package.json');
4+
5+
var projectBase = path.resolve(__dirname, '../..');
6+
var pkg = require('../../package.json');
87

98
module.exports = function(config) {
10-
config.set('currentVersion', process.env.DOC_VERSION || 'nightly');
119

1210
config = basePackage(config);
1311

@@ -19,34 +17,33 @@ module.exports = function(config) {
1917

2018
config.set('basePath', __dirname);
2119
config.set('source.projectPath', '.');
22-
config.set('rendering.outputFolder', '../temp/ionic-site');
2320

24-
var versionData = require('./generate-versions')(config);
25-
config.set('versionData', versionData);
26-
config.set('rendering.contentsFolder', path.join('docs', versionData.current.folder));
27-
28-
config.set('demos.outputFolder', path.join(__dirname, '../temp/ionic-demo'));
21+
config.set('rendering.outputFolder', path.resolve(projectBase, 'dist/ionic-site'));
22+
//contentsFolder is set in the version-data processor
2923

3024
config.set('processing.api-docs', {
3125
outputPath: 'api/${docType}/${name}/index.md',
3226
path: 'api/${docType}/${name}/',
3327
moduleOutputPath: 'api/module/${name}/index.md',
34-
modulePath: 'api/module/${name}/',
35-
mergeableTypes: {
36-
demo: 'demos'
37-
}
28+
modulePath: 'api/module/${name}/'
3829
});
3930

40-
config.append('rendering.filters', [
41-
require('./filters/capital')
31+
config.append('processing.inlineTagDefinitions', [
32+
require('./inline-tag-defs/link')
4233
]);
4334

4435
config.set('source.files', [
45-
{ pattern: 'js/**/*.js', basePath: basePath }
36+
{ pattern: 'js/**/*.js', basePath: projectBase }
4637
]);
4738

48-
config.append('processing.inlineTagDefinitions', [
49-
require('./inline-tag-defs/link')
39+
config.append('processing.processors', [
40+
require('./processors/version-data'),
41+
require('./processors/index-page'),
42+
require('./processors/jekyll'),
43+
]);
44+
45+
config.append('rendering.filters', [
46+
require('./filters/capital')
5047
]);
5148

5249
config.append('processing.tagDefinitions', require('./tag-defs'));
@@ -61,14 +58,5 @@ module.exports = function(config) {
6158
commentEnd: '#>'
6259
});
6360

64-
config.append('processing.processors', [
65-
require('./processors/latest-version'),
66-
require('./processors/keywords'),
67-
require('./processors/index-page'),
68-
require('./processors/version-data'),
69-
require('./processors/jekyll'),
70-
require('./processors/demos')
71-
]);
72-
7361
return config;
7462
};

docs/filters/capital.js renamed to config/dgeni/filters/capital.js

File renamed without changes.

docs/generate-versions.js renamed to config/dgeni/generate-versions.js

File renamed without changes.

docs/ignore.words renamed to config/dgeni/ignore.words

File renamed without changes.

docs/inline-tag-defs/link.js renamed to config/dgeni/inline-tag-defs/link.js

File renamed without changes.

0 commit comments

Comments
 (0)