Skip to content

Commit 5571231

Browse files
authored
Merge pull request #468 from rackerlabs/pipeline-scripts-reorg--CITguy
refactor(scripts): reorganize build scripts
2 parents 234520e + 598bac7 commit 5571231

File tree

23 files changed

+60
-53
lines changed

23 files changed

+60
-53
lines changed

.eslintignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
# directories
22
bin/*
33
lib/*
4+
scripts/*
45
node_modules/*
56
public/*
6-
source/vendor/*
77
test/*
88

9-
# files
10-
_config.*
11-
129
# spec files
13-
src/**/*.spec.js
10+
src/**/*.spec.js

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ node_modules
44
debug.log
55
package-lock.json
66

7-
# Generated Hexo Files/Directories
7+
# Generated Files/Directories
88
db.json
99
*.log
1010
public/
1111
.deploy*/
1212
dist/
13-
14-
# Private credentials/config
15-
_config.private.js
13+
lib/
1614

1715
# Removing Coverage Reports folder created.
1816
coverage

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.5.0
1+
8.15.0

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,22 @@
6565
"scripts": {
6666
"apidocs": "jsdoc -c jsdoc.conf.json",
6767
"clean": "rm -fr node_modules",
68-
"clean:public": "bin/cleanPublic.js",
69-
"compile": "bin/compile.js",
68+
"clean:public": "scripts/cleanPublic.js",
69+
"compile": "scripts/compile.js",
7070
"test:coverage": "nyc --reporter=lcov mocha",
7171
"pregenerate": "yarn compile",
72-
"generate": "bin/generate.js",
72+
"generate": "scripts/generate.js",
7373
"preghpages": "yarn generate",
74-
"ghpages": "bin/ghpages.js",
74+
"ghpages": "scripts/publish.js",
7575
"install:clean": "rm -fr node_modules && yarn install",
7676
"lint": "eslint -c .eslintrc.prod.json src",
7777
"postversion": "git push origin --tags",
7878
"prepublishOnly": "yarn compile",
7979
"rollup": "rollup -c rollup.config.js",
8080
"preserve": "yarn clean:public && yarn generate",
81-
"serve": "bin/serve.js",
81+
"serve": "scripts/serve.js",
8282
"prestart": "yarn clean:public && yarn generate",
83-
"start": "bin/start.js",
83+
"start": "scripts/start.js",
8484
"test:unit": "mocha test/run_unit.js",
8585
"test": "cd test; yarn test"
8686
},
File renamed without changes.

rollup.config.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import babel from 'rollup-plugin-babel';
22
import html from 'rollup-plugin-html';
33
import json from 'rollup-plugin-json';
4-
import pkg from './package.json';
54
import { uglify } from 'rollup-plugin-uglify';
65
import { minify } from 'uglify-es';
7-
import less from './lib/rollup-plugin-less';
86
import resolve from 'rollup-plugin-node-resolve';
97
import commonjs from 'rollup-plugin-commonjs';
108
import eslint from 'rollup-plugin-eslint';
119

10+
import pkg from './package.json';
11+
import less from './plugins/rollup-plugin-less';
12+
1213
let htmlPlugin = html ({
1314
include: [
1415
'**/*.svg',

lib/compile.js renamed to scripts/_compile/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* Tasks in this file handle compiling distributable assets
55
* from src/* to dist/*
66
*/
7-
8-
const CONFIG = require('../_config');
97
const CleanCSS = require('clean-css');
108
const LESS = require('less');
119
const path = require('path');
1210
const { ensureDir } = require('fs-extra');
13-
const { exec, readFile, writeFile } = require('./util');
11+
12+
const CONFIG = require('../_config');
13+
const { exec, readFile, writeFile } = require('../_util');
1414

1515
// See http://lesscss.org/usage/#programmatic-usage
1616
async function compileStyles () {

_config.js renamed to scripts/_config/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict';
22

3-
const _ = require('lodash');
43
const path = require('path');
54
const CONFIG = {};
65

7-
// PATHS
8-
CONFIG.root = path.resolve(__dirname);// absolute path to project directory
6+
/* ===== PATHS ===== */
7+
// absolute path to project directory
8+
CONFIG.root = path.resolve(__dirname, '../../');
99
CONFIG.publicDir = 'public';
1010
CONFIG.sourceDir = 'src';
1111
CONFIG.docsDir = 'docs';

lib/context.js renamed to scripts/_generate/context.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
'use strict';
22

3-
const CONFIG = require('../_config');
43
const JSON5 = require('json5');
5-
const PKG = require('../package.json');
6-
const _ = require('lodash');
74
const fm = require('front-matter');
85
const fs = require('fs');
96
const globby = require('globby');
107
const moment = require('moment');
118
const path = require('path');
129

10+
const PKG = require('../../package.json');
11+
const CONFIG = require('../_config');
12+
1313
// Fetch data from {CONFIG.docsDir}/_data
1414
function getData () {
1515
const dataDir = `${CONFIG.root}/${CONFIG.docsDir}/_data`;
@@ -63,7 +63,6 @@ function _getPageContext (relPath) {
6363

6464
function forFile (relPath) {
6565
return {
66-
_: _,
6766
site: CONFIG.site,
6867
data: getData(),
6968
page: _getPageContext(relPath),

lib/generate.js renamed to scripts/_generate/index.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
* needed for the component explorer documentation.
66
*/
77

8-
const CONFIG = require('../_config');
9-
const pkg = require('../package.json');
10-
const tar = require('tar');
11-
const Context = require('./context');
128
const LESS = require('less');
13-
const Markup = require('./markup');
149
const path = require('path');
10+
const tar = require('tar');
1511
const webpack = require('webpack');
1612
const { copy, ensureDir, ensureDirSync, remove } = require('fs-extra');
17-
const { exec, readFile, writeFile } = require('./util');
13+
14+
const pkg = require('../../package.json');
15+
const CONFIG = require('../_config');
16+
const { exec, readFile, writeFile } = require('../_util');
17+
18+
const Context = require('./context');
19+
const Markup = require('./markup');
1820

1921
async function generateStyles () {
2022
console.log('Generating CSS');

0 commit comments

Comments
 (0)