Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Switch to bower for test deps

  • Loading branch information...
commit 46edb95d2847a7f41eeef251340d8fa95d90b2dc 1 parent 1f4fc06
Brian Cavalier briancavalier authored
21 .gitmodules
View
@@ -1,24 +1,3 @@
[submodule "test/util"]
path = test/util
url = https://github.com/dojo/util.git
-[submodule "test/curl"]
- path = test/curl
- url = git://github.com/cujojs/curl.git
-[submodule "support/sizzle"]
- path = support/sizzle
- url = https://github.com/cujojs/sizzle.git
-[submodule "support/meld"]
- path = support/meld
- url = https://github.com/cujojs/meld.git
-[submodule "support/when"]
- path = support/when
- url = git://github.com/cujojs/when.git
-[submodule "test/requirejs"]
- path = test/requirejs
- url = https://github.com/jrburke/requirejs.git
-[submodule "test/requirejs-domReady"]
- path = test/requirejs-domReady
- url = https://github.com/requirejs/domReady.git
-[submodule "support/poly"]
- path = support/poly
- url = git://github.com/cujojs/poly.git
12 component.json
View
@@ -1,8 +1,18 @@
{
"name": "wire",
"version": "0.10.0",
+ "main": "./wire.js",
"dependencies": {
"meld": "~1",
- "when": "~2"
+ "when": "~2",
+ "poly": "~0"
+ },
+ "devDependencies": {
+ "curl": "~0",
+ "requirejs": "~2",
+ "requirejs-domready": "~2",
+ "jquery": "~1",
+ "dojo": "~1",
+ "dijit": "~1"
}
}
1  support/meld
@@ -1 +0,0 @@
-Subproject commit c3e5da0892e07ae159ae1f6d384a549098fc2444
1  support/poly
@@ -1 +0,0 @@
-Subproject commit 2e2e2a61f3f4e78f2b39ad774d5710695623bead
1  support/sizzle
@@ -1 +0,0 @@
-Subproject commit 362a3747366316c8197b24634f468ff7db868353
1  support/when
@@ -1 +0,0 @@
-Subproject commit 1f30cddbe2e88dfc6958f163d0e266cc3b4ba1e4
1  test/curl
@@ -1 +0,0 @@
-Subproject commit 83f445b1ac48402b411176a2ee2a76b2d6b87a65
31 test/test-config.js
View
@@ -25,13 +25,11 @@
loaders = {
curl: {
- script: 'test/curl/src/curl',
+ script: 'components/curl/src/curl',
mixin: {
apiName: 'require',
- pluginPath: 'curl/plugin',
paths: {
- 'jquery': 'test/lib/jquery'
-// 'wire/domReady': 'test/curl/src/curl/domReady'
+ jquery: 'components/jquery/jquery'
},
preloads: [
'poly/all',
@@ -40,15 +38,11 @@
}
},
requirejs: {
- script: 'test/requirejs/require',
+ script: 'components/requirejs/require',
mixin: {
paths: {
- 'jquery': 'test/lib/jquery',
-// 'wire/domReady': 'test/requirejs-domReady/domReady',
- domReady: 'test/requirejs-domReady/domReady'
- },
- config: {
- when: { paranoid: false }
+ jquery: 'components/jquery/jquery',
+ domReady: 'components/requirejs-domready/domReady'
}
}
}
@@ -97,16 +91,15 @@
loaderConfig[m] = loader.mixin[m];
}
- addPackage({ name: 'dojo', location: 'test/lib/dojo18/dojo' });
-// addPackage({ name: 'dijit', location: 'test/lib/dojo17/dijit', main: 'main' });
-// addPackage({ name: 'dojo', location: 'test/lib/dojo16/dojo', main: 'lib/main-browser' });
-// addPackage({ name: 'dijit', location: 'test/lib/dojo16/dijit', main: 'lib/main' });
- addPackage({ name: 'sizzle', location: 'support/sizzle' });
- addPackage({ name: 'meld', location: 'support/meld' });
- addPackage({ name: 'when', location: 'support/when' });
- addPackage({ name: 'poly', location: 'support/poly' });
// This is needed because we're running unit tests from *within* the wire dir
addPackage({ name: 'wire', location: '.' });
+ addPackage({ name: 'meld', location: 'components/meld' });
+ addPackage({ name: 'when', location: 'components/when' });
+ addPackage({ name: 'poly', location: 'components/poly' });
+ addPackage({ name: 'sizzle', location: 'components/sizzle' });
+ addPackage({ name: 'dojo', location: 'components/dojo', main: 'main' });
+ addPackage({ name: 'dijit', location: 'components/dijit' });
+ addPackage({ name: 'jquery', location: 'components/jquery', main: 'jquery' });
// Other loaders may not need this
loaderConfig.paths[loaderName] = loaderPath;
Please sign in to comment.
Something went wrong with that request. Please try again.