refactor(deps): Ditch bower, use npm for deps.
This commit is contained in:
Родитель
c8e6066682
Коммит
2f146354ea
4
.bowerrc
4
.bowerrc
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"directory": "components",
|
||||
"json": "bower.json"
|
||||
}
|
10
bower.json
10
bower.json
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"name": "fxa-js-client",
|
||||
"devDependencies": {
|
||||
"cjs": "https://github.com/guybedford/cjs.git#69c7f33059"
|
||||
},
|
||||
"dependencies": {
|
||||
"es6-promise": "https://github.com/stefanpenner/es6-promise.git#4.1.1",
|
||||
"sjcl": "1.0.0"
|
||||
}
|
||||
}
|
|
@ -8,7 +8,7 @@
|
|||
"start": "grunt",
|
||||
"test": "grunt test",
|
||||
"test-local": "intern-client config=tests/intern auth_server=LOCAL",
|
||||
"setup": "npm install && bower install && grunt sjcl",
|
||||
"setup": "npm install && grunt sjcl",
|
||||
"contributors": "git shortlog -s | cut -c8- | sort -f > CONTRIBUTORS.md"
|
||||
},
|
||||
"main": "node/index.js",
|
||||
|
@ -35,7 +35,6 @@
|
|||
"xhr2": "0.0.7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"bower": "1.4.1",
|
||||
"eslint-config-fxa": "1.8.1",
|
||||
"grunt": "0.4.2",
|
||||
"grunt-build-control": "git://github.com/robwierzbowski/grunt-build-control#274952",
|
||||
|
|
|
@ -14,7 +14,6 @@ module.exports = function (grunt) {
|
|||
'**/*.js',
|
||||
'!tests/addons/sinon.js',
|
||||
'!build/**',
|
||||
'!components/**',
|
||||
'!node_modules/**',
|
||||
'!docs/**'
|
||||
]
|
||||
|
|
|
@ -11,7 +11,6 @@ module.exports = function (grunt) {
|
|||
'tests/**/*.js',
|
||||
'!node_modules/**',
|
||||
'!build/**',
|
||||
'!components/**',
|
||||
'!docs/**',
|
||||
'!tests/addons/sinon.js'
|
||||
],
|
||||
|
|
|
@ -12,7 +12,7 @@ module.exports = function (grunt) {
|
|||
var src = 'core_closure.js';
|
||||
var dist = 'sjcl.js';
|
||||
|
||||
process.chdir('components/sjcl/');
|
||||
process.chdir('node_modules/sjcl/');
|
||||
|
||||
exec(configSJCL,
|
||||
function (error, stdout, stderr) {
|
||||
|
|
|
@ -36,8 +36,8 @@ define(['intern/lib/args'], function (args) {
|
|||
packages: [ { name: 'fxa-js-client', location: 'client' } ],
|
||||
map: {
|
||||
'*': {
|
||||
'es6-promise': 'components/es6-promise/dist/es6-promise',
|
||||
sjcl: 'components/sjcl/sjcl'
|
||||
'es6-promise': 'node_modules/es6-promise/dist/es6-promise',
|
||||
sjcl: 'node_modules/sjcl/sjcl'
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
define([
|
||||
'intern!tdd',
|
||||
'intern/chai!assert',
|
||||
'components/sjcl/sjcl',
|
||||
'node_modules/sjcl/sjcl',
|
||||
'client/lib/credentials'
|
||||
], function (tdd, assert, sjcl, credentials) {
|
||||
with (tdd) {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
define([
|
||||
'intern!tdd',
|
||||
'intern/chai!assert',
|
||||
'components/sjcl/sjcl',
|
||||
'node_modules/sjcl/sjcl',
|
||||
'client/lib/hawkCredentials'
|
||||
], function (tdd, assert, sjcl, hawkCredentials) {
|
||||
with (tdd) {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
define([
|
||||
'intern!tdd',
|
||||
'intern/chai!assert',
|
||||
'components/sjcl/sjcl',
|
||||
'node_modules/sjcl/sjcl',
|
||||
'client/lib/hkdf'
|
||||
], function (tdd, assert, sjcl, hkdf) {
|
||||
with (tdd) {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
define([
|
||||
'intern!tdd',
|
||||
'intern/chai!assert',
|
||||
'components/sjcl/sjcl',
|
||||
'node_modules/sjcl/sjcl',
|
||||
'client/lib/credentials'
|
||||
], function (tdd, assert, sjcl, credentials) {
|
||||
with (tdd) {
|
||||
|
|
|
@ -27,8 +27,8 @@ module.exports = {
|
|||
path.resolve(__dirname, 'client')
|
||||
],
|
||||
alias: {
|
||||
'es6-promise': path.resolve(__dirname, 'components/es6-promise/dist/es6-promise'),
|
||||
sjcl: path.resolve(__dirname, 'components/sjcl/sjcl')
|
||||
'es6-promise': path.resolve(__dirname, 'node_modules/es6-promise/dist/es6-promise'),
|
||||
sjcl: path.resolve(__dirname, 'node_modules/sjcl/sjcl')
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -66,6 +66,15 @@ module.exports = {
|
|||
})
|
||||
],
|
||||
|
||||
node: {
|
||||
global: true,
|
||||
process: false,
|
||||
Buffer: false,
|
||||
__filename: false,
|
||||
__dirname: false,
|
||||
setImmediate: false
|
||||
},
|
||||
|
||||
module: {},
|
||||
stats: { colors: true },
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче