Skip to content

Commit 0ef193f

Browse files
petebacondarwinpetebacondarwin
committed
chore(docs): don't use bower for docs dependencies
1 parent dea8ae9 commit 0ef193f

File tree

10 files changed

+42
-42
lines changed

10 files changed

+42
-42
lines changed

‎docs/app/assets/js/search-worker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/* global importScripts, lunr */
55

66
// Load up the lunr library
7-
importScripts('../components/lunr.js-0.5.12/lunr.min.js');
7+
importScripts('../components/lunr-0.7.2/lunr.min.js');
88

99
// Create the lunr index - the docs should be an array of object, each object containing
1010
// the path and search terms for a page

‎docs/bower.json

-10
This file was deleted.

‎docs/config/services/deployments/debug.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ module.exports = function debugDeployment(getVersion) {
1717
'../angular-sanitize.js',
1818
'../angular-touch.js',
1919
'../angular-animate.js',
20-
'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
20+
'components/marked-' + getVersion('marked') + '/lib/marked.js',
2121
'js/angular-bootstrap/dropdown-toggle.js',
22-
'components/lunr.js-' + getVersion('lunr.js') + '/lunr.js',
22+
'components/lunr-' + getVersion('lunr') + '/lunr.js',
2323
'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
2424
'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
2525
'js/current-version-data.js',

‎docs/config/services/deployments/default.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ module.exports = function defaultDeployment(getVersion) {
1717
'../angular-sanitize.min.js',
1818
'../angular-touch.min.js',
1919
'../angular-animate.min.js',
20-
'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
20+
'components/marked-' + getVersion('marked') + '/lib/marked.js',
2121
'js/angular-bootstrap/dropdown-toggle.min.js',
22-
'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
22+
'components/lunr-' + getVersion('lunr') + '/lunr.min.js',
2323
'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
2424
'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
2525
'js/current-version-data.js',

‎docs/config/services/deployments/jquery.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ module.exports = function jqueryDeployment(getVersion) {
2121
'../angular-sanitize.min.js',
2222
'../angular-touch.min.js',
2323
'../angular-animate.min.js',
24-
'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
24+
'components/marked-' + getVersion('marked') + '/lib/marked.js',
2525
'js/angular-bootstrap/dropdown-toggle.min.js',
26-
'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
26+
'components/lunr-' + getVersion('lunr') + '/lunr.min.js',
2727
'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
2828
'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
2929
'js/current-version-data.js',

‎docs/config/services/deployments/production.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ module.exports = function productionDeployment(getVersion) {
3434
cdnUrl + '/angular-sanitize.min.js',
3535
cdnUrl + '/angular-touch.min.js',
3636
cdnUrl + '/angular-animate.min.js',
37-
'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
37+
'components/marked-' + getVersion('marked') + '/lib/marked.js',
3838
'js/angular-bootstrap/dropdown-toggle.min.js',
39-
'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
39+
'components/lunr-' + getVersion('lunr') + '/lunr.min.js',
4040
'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
4141
'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
4242
'js/current-version-data.js',

‎docs/config/services/getVersion.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ module.exports = function getVersion(readFilesProcessor) {
1010
var basePath = readFilesProcessor.basePath;
1111

1212
return function(component, sourceFolder, packageFile) {
13-
sourceFolder = path.resolve(basePath, sourceFolder || 'docs/bower_components');
14-
packageFile = packageFile || 'bower.json';
13+
sourceFolder = path.resolve(basePath, sourceFolder || 'node_modules');
14+
packageFile = packageFile || 'package.json';
1515
return require(path.join(sourceFolder,component,packageFile)).version;
1616
};
1717
};

‎docs/gulpfile.js

+6-21
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
'use strict';
22

33
var gulp = require('gulp');
4-
var log = require('gulp-util').log;
54
var concat = require('gulp-concat');
65
var eslint = require('gulp-eslint');
7-
var bower = require('bower');
86
var Dgeni = require('dgeni');
97
var merge = require('event-stream').merge;
108
var path = require('canonical-path');
@@ -18,7 +16,6 @@ var rename = require('gulp-rename');
1816
// See clean and bower for async tasks, and see assets and doc-gen for dependent tasks below
1917

2018
var outputFolder = '../build/docs';
21-
var bowerFolder = 'bower_components';
2219

2320
var src = 'app/src/**/*.js';
2421
var ignoredFiles = '!src/angular.bind.js';
@@ -57,27 +54,15 @@ var getMergedEslintConfig = function(filepath) {
5754

5855
var copyComponent = function(component, pattern, sourceFolder, packageFile) {
5956
pattern = pattern || '/**/*';
60-
sourceFolder = sourceFolder || bowerFolder;
61-
packageFile = packageFile || 'bower.json';
57+
sourceFolder = sourceFolder || '../node_modules';
58+
packageFile = packageFile || 'package.json';
6259
var version = require(path.resolve(sourceFolder, component, packageFile)).version;
6360
return gulp
6461
.src(sourceFolder + '/' + component + pattern)
6562
.pipe(gulp.dest(outputFolder + '/components/' + component + '-' + version));
6663
};
6764

6865

69-
gulp.task('bower', function() {
70-
var bowerTask = bower.commands.install();
71-
bowerTask.on('log', function(result) {
72-
log('bower:', result.id, result.data.endpoint.name);
73-
});
74-
bowerTask.on('error', function(error) {
75-
log(error);
76-
});
77-
return bowerTask;
78-
});
79-
80-
8166
gulp.task('build-app', function() {
8267
var file = 'docs.js';
8368
var minFile = 'docs.min.js';
@@ -94,7 +79,7 @@ gulp.task('build-app', function() {
9479
});
9580

9681

97-
gulp.task('assets', ['bower'], function() {
82+
gulp.task('assets', function() {
9883
var JS_EXT = /\.js$/;
9984
return merge(
10085
gulp.src(['img/**/*']).pipe(gulp.dest(outputFolder + '/img')),
@@ -113,15 +98,15 @@ gulp.task('assets', ['bower'], function() {
11398
})),
11499
copyComponent('bootstrap', '/dist/**/*'),
115100
copyComponent('open-sans-fontface'),
116-
copyComponent('lunr.js', '/*.js'),
101+
copyComponent('lunr', '/*.js'),
117102
copyComponent('google-code-prettify'),
118103
copyComponent('jquery', '/dist/*.js'),
119-
copyComponent('marked', '/**/*.js', '../node_modules', 'package.json')
104+
copyComponent('marked', '/**/*.js')
120105
);
121106
});
122107

123108

124-
gulp.task('doc-gen', ['bower'], function() {
109+
gulp.task('doc-gen', function() {
125110
var dgeni = new Dgeni([require('./config')]);
126111
return dgeni.generate().catch(function() {
127112
process.exit(1);

‎package.json

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"devDependencies": {
2323
"angular-benchpress": "0.x.x",
2424
"benchmark": "1.x.x",
25+
"bootstrap": "3.1.1",
2526
"bower": "~1.3.9",
2627
"browserstacktunnel-wrapper": "^1.4.2",
2728
"canonical-path": "0.0.2",
@@ -35,6 +36,7 @@
3536
"dgeni-packages": "^0.16.4",
3637
"event-stream": "~3.1.0",
3738
"glob": "^6.0.1",
39+
"google-code-prettify": "1.0.1",
3840
"grunt": "^1.0.1",
3941
"grunt-bump": "^0.8.0",
4042
"grunt-cli": "^1.2.0",
@@ -57,6 +59,7 @@
5759
"jasmine-core": "^2.4.0",
5860
"jasmine-node": "^2.0.0",
5961
"jasmine-reporters": "^2.2.0",
62+
"jquery": "^3.1.1",
6063
"karma": "^1.1.2",
6164
"karma-browserstack-launcher": "^1.0.1",
6265
"karma-chrome-launcher": "^1.0.1",
@@ -69,9 +72,11 @@
6972
"load-grunt-tasks": "^3.5.0",
7073
"lodash": "~2.4.1",
7174
"log4js": "^0.6.27",
75+
"lunr": "^0.7.2",
7276
"marked": "~0.3.0",
7377
"node-html-encoder": "0.0.2",
7478
"npm-run": "^4.1.0",
79+
"open-sans-fontface": "^1.4.0",
7580
"promises-aplus-tests": "~2.1.0",
7681
"protractor": "^4.0.10",
7782
"q": "~1.0.0",

‎yarn.lock

+20
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,10 @@ [email protected]:
525525
dependencies:
526526
hoek "2.x.x"
527527

528+
[email protected]:
529+
version "3.1.1"
530+
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.1.1.tgz#17e14ed261c0fcd9b52ea9aa6420f6d51cd5fa77"
531+
528532
bootstrap@^3.2.0:
529533
version "3.3.7"
530534
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"
@@ -2588,6 +2592,10 @@ glogg@^1.0.0:
25882592
dependencies:
25892593
sparkles "^1.0.0"
25902594

2595+
[email protected]:
2596+
version "1.0.1"
2597+
resolved "https://registry.yarnpkg.com/google-code-prettify/-/google-code-prettify-1.0.1.tgz#72ed730414769db2ecc470f4ec413174ccb76327"
2598+
25912599
got@^0.3.0:
25922600
version "0.3.0"
25932601
resolved "https://registry.yarnpkg.com/got/-/got-0.3.0.tgz#888ec66ca4bc735ab089dbe959496d0f79485493"
@@ -3483,6 +3491,10 @@ jodid25519@^1.0.0:
34833491
dependencies:
34843492
jsbn "~0.1.0"
34853493

3494+
jquery@^3.1.1:
3495+
version "3.1.1"
3496+
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.1.1.tgz#347c1c21c7e004115e0a4da32cece041fad3c8a3"
3497+
34863498
js-tokens@^2.0.0:
34873499
version "2.0.0"
34883500
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5"
@@ -4041,6 +4053,10 @@ [email protected]:
40414053
dependencies:
40424054
es5-ext "~0.10.2"
40434055

4056+
lunr@^0.7.2:
4057+
version "0.7.2"
4058+
resolved "https://registry.yarnpkg.com/lunr/-/lunr-0.7.2.tgz#79a30e932e216cba163541ee37a3607c12cd7281"
4059+
40444060
map-cache@^0.2.0:
40454061
version "0.2.2"
40464062
resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -4564,6 +4580,10 @@ onetime@^1.0.0:
45644580
version "1.1.0"
45654581
resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
45664582

4583+
open-sans-fontface@^1.4.0:
4584+
version "1.4.0"
4585+
resolved "https://registry.yarnpkg.com/open-sans-fontface/-/open-sans-fontface-1.4.0.tgz#03cc6d1bf5e6a8b5b47910888562f722c5dd3428"
4586+
45674587
opn@^4.0.0:
45684588
version "4.0.2"
45694589
resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"

0 commit comments

Comments
 (0)