Skip to content

Commit

Permalink
Removing require.def, it has been a while since it has been broadcast…
Browse files Browse the repository at this point in the history
…ed as a public API.
  • Loading branch information
jrburke committed Aug 25, 2011
1 parent 70886a8 commit 2720387
Show file tree
Hide file tree
Showing 49 changed files with 66 additions and 63 deletions.
2 changes: 1 addition & 1 deletion require.js
Original file line number Diff line number Diff line change
Expand Up @@ -1579,7 +1579,7 @@ var requirejs, require, define;
* return a value to define the module corresponding to the first argument's
* name.
*/
define = req.def = function (name, deps, callback) {
define = function (name, deps, callback) {
var node, context;

//Allow for anonymous functions
Expand Down
5 changes: 4 additions & 1 deletion tasks.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
Release Notes
-------------------
- removed module.setExports support.
- removed require.def support

Next release
--------------

- remove require.def()
- domready
- code pass
- need to document writeFile

coffeescript:
- mix of types a problem? https://github.com/jrburke/require-cs/issues/5
Expand Down
2 changes: 1 addition & 1 deletion tests/anon/c.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def(function (require) {
define(function (require) {
var a = require('a');
return {
name: 'c',
Expand Down
2 changes: 1 addition & 1 deletion tests/anon/green.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def({
define({
name: "green"
});
2 changes: 1 addition & 1 deletion tests/anon/red.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("red", function () {
define("red", function () {
return {
name: "red"
};
Expand Down
2 changes: 1 addition & 1 deletion tests/anon/yellow.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def("yellow", {
define("yellow", {
name: "yellow"
});
2 changes: 1 addition & 1 deletion tests/exports/assign.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("assign",
define("assign",
["require", "exports", "module"],
function (require, exports, module) {
module.exports = "assign";
Expand Down
2 changes: 1 addition & 1 deletion tests/exports/assign2.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def(["module", "exports", "require"],
define(["module", "exports", "require"],
function (module, exports, require) {
module.exports = "assign2";
});
2 changes: 1 addition & 1 deletion tests/exports/funcSet.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("funcSet",
define("funcSet",
["require", "exports", "module"],
function (require, exports, module) {
module.exports = "funcSet";
Expand Down
2 changes: 1 addition & 1 deletion tests/exports/vanilla.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("vanilla",
define("vanilla",
["require", "exports", "module"],
function (require, exports, module) {
exports.name = "vanilla";
Expand Down
2 changes: 1 addition & 1 deletion tests/funcOne.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("funcOne",
define("funcOne",
["require", "funcTwo"],
function (require) {
var one = function (name) {
Expand Down
4 changes: 2 additions & 2 deletions tests/funcThree.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("funcThree",
define("funcThree",
["funcFour"],
function (four) {
var three = function (arg) {
Expand All @@ -8,7 +8,7 @@ require.def("funcThree",
three.suffix = function () {
return "THREE_SUFFIX";
};

return three;
}
);
2 changes: 1 addition & 1 deletion tests/i18n/nls/colors.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def({
define({
"root": {
red: "red",
blue: "blue",
Expand Down
2 changes: 1 addition & 1 deletion tests/i18n/nls/fr/colors.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def({
define({
red: "rouge",
blue: "bleu"
});
2 changes: 1 addition & 1 deletion tests/i18n/testModule.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//A sample module to use in the i18n build test.

require.def(["i18n!nls/colors"], function (colors) {
define(["i18n!nls/colors"], function (colors) {
var red = colors.red;
});
2 changes: 1 addition & 1 deletion tests/layers/epsilon.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("epsilon",
define("epsilon",
{
name: "epsilon"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/layers/layer1.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Example layer file.

require.def("alpha",
define("alpha",
["beta", "gamma"],
function (beta, gamma) {
return {
Expand Down
2 changes: 1 addition & 1 deletion tests/map.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("map",
define("map",
function() {
return {
name: "map"
Expand Down
2 changes: 1 addition & 1 deletion tests/packages/baz/lib/helper.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def({
define({
name: "baz/helper"
});
2 changes: 1 addition & 1 deletion tests/packages/dojox/door.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def({
define({
name: 'dojox/door'
});
2 changes: 1 addition & 1 deletion tests/packages/dojox/window/pane.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def({
define({
name: 'dojox/window/pane'
});
2 changes: 1 addition & 1 deletion tests/packages/dojox/window/window.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def(['./pane'], function (pane) {
define(['./pane'], function (pane) {
return {
name: 'dojox/window',
paneName: pane.name
Expand Down
2 changes: 1 addition & 1 deletion tests/packages/pkgs/alpha/main.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def({
define({
name: 'alpha'
});
2 changes: 1 addition & 1 deletion tests/packages/pkgs/beta/0.2/scripts/beta.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def(function () {
define(function () {
return 'beta';
});
2 changes: 1 addition & 1 deletion tests/packages/pkgs/dojox/chair/legs.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def({
define({
name: 'dojox/chair/legs'
});
2 changes: 1 addition & 1 deletion tests/packages/pkgs/dojox/table/table.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def(['dojox/chair'], function (chair) {
define(['dojox/chair'], function (chair) {
return {
name: 'dojox/table',
chairName: chair.name
Expand Down
2 changes: 1 addition & 1 deletion tests/packages/replace.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Tests overriding a package path with a more specific mapping.
require.def({
define({
name: 'fake/alpha/replace'
});
2 changes: 1 addition & 1 deletion tests/priority/leaf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var globalLeafName = "leaf";

require.def("leaf", {
define("leaf", {
name: globalLeafName
});
4 changes: 2 additions & 2 deletions tests/priority/one.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Example layer file.

require.def("alpha",
define("alpha",
["beta", "gamma"],
function (beta, gamma) {
return {
Expand All @@ -10,7 +10,7 @@ require.def("alpha",
}
);

require.def("beta",
define("beta",
["gamma"],
function (gamma) {
return {
Expand Down
4 changes: 2 additions & 2 deletions tests/priority/priorityOptimized.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ doh.run();

//START simulated optimization of the "one" dependency, it should not be
//be requested as a separate script.
require.def("alphaPrime",
define("alphaPrime",
function () {
return {
name: "alphaPrime"
};
}
);

require.def("betaPrime",
define("betaPrime",
["alphaPrime"],
function (alphaPrime) {
return {
Expand Down
6 changes: 3 additions & 3 deletions tests/priority/priorityWithDeps/script/req/app.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
require.def('Carousel', function () {
define('Carousel', function () {
return function Carousel(service) {
this.service = service;
this.someType = 'Carousel';
};
});

require.def('app', ['Carousel'], function () {
define('app', ['Carousel'], function () {

});
2 changes: 1 addition & 1 deletion tests/priority/priorityWithDeps/script/req/begin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def('req/begin', function() {
define('req/begin', function() {
window.ip = {
begin: 'begin',
controllers: {},
Expand Down
8 changes: 4 additions & 4 deletions tests/priority/priorityWithDeps/script/req/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def('req/bootstrap', [
define('req/bootstrap', [
'req/begin',
'req/config',
'req/utils/utils'
Expand All @@ -10,17 +10,17 @@ require.def('req/bootstrap', [
/*
//begin module defines a global
var begin = {};
require.def('begin', function () {
define('begin', function () {
begin.name = 'begin';
});
//appConfig defines a global.
var appConfig = {};
require.def('appConfig', ['begin'], function () {
define('appConfig', ['begin'], function () {
appConfig.state = 'alpha';
});
require.def('bootstrap', ['begin', 'appConfig'], function () {
define('bootstrap', ['begin', 'appConfig'], function () {
appConfig.bootstrap = 'bootstrap';
});
*/
2 changes: 1 addition & 1 deletion tests/priority/priorityWithDeps/script/req/config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def('req/config', [
define('req/config', [
'req/begin'
], function() {
var config = {
Expand Down
2 changes: 1 addition & 1 deletion tests/priority/priorityWithDeps/script/req/utils/utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def('req/utils/utils', [
define('req/utils/utils', [
'req/begin',
'req/config'
], function() {
Expand Down
10 changes: 5 additions & 5 deletions tests/priority/three.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Example layer file.

require.def("alpha",
define("alpha",
["beta", "gamma"],
function (beta, gamma) {
return {
Expand All @@ -10,7 +10,7 @@ require.def("alpha",
}
);

require.def("beta",
define("beta",
["gamma"],
function (gamma) {
return {
Expand All @@ -23,7 +23,7 @@ require.def("beta",

//Example layer file.

require.def("gamma",
define("gamma",
["theta", "epsilon"],
function (theta, epsilon) {
return {
Expand All @@ -34,15 +34,15 @@ require.def("gamma",
}
);

require.def("theta",
define("theta",
function () {
return {
name: "theta"
};
}
);

require.def("epsilon",
define("epsilon",
{
name: "epsilon"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/priority/tree.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("bark", function () {
define("bark", function () {
return {
name: "bark"
};
Expand Down
4 changes: 2 additions & 2 deletions tests/priority/two.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Example layer file.

require.def("gamma",
define("gamma",
["theta", "epsilon"],
function (theta, epsilon) {
return {
Expand All @@ -11,7 +11,7 @@ require.def("gamma",
}
);

require.def("theta",
define("theta",
function () {
return {
name: "theta"
Expand Down
2 changes: 1 addition & 1 deletion tests/relative/foo/bar/two.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def("foo/bar/two", {
define("foo/bar/two", {
name: "two"
});
2 changes: 1 addition & 1 deletion tests/relative/foo/three.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def("foo/three", {
define("foo/three", {
name: "three"
});
2 changes: 1 addition & 1 deletion tests/text/subwidget.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("subwidget",
define("subwidget",
["text!subwidget.html!strip", "text!subwidget2.html"],
function(template, template2) {
return {
Expand Down
2 changes: 1 addition & 1 deletion tests/tres.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("tres",
define("tres",
function() {
return {
name: "tres"
Expand Down
2 changes: 1 addition & 1 deletion tests/uniques/three.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.def("three", {
define("three", {
name: "three"
});
2 changes: 1 addition & 1 deletion tests/uniques/two.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("two", ["one", "three", "one"], function (one, three, one2) {
define("two", ["one", "three", "one"], function (one, three, one2) {
return {
name: "two",
oneName: one.name,
Expand Down
2 changes: 1 addition & 1 deletion tests/uno.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("uno",
define("uno",
["dos", "tres"],
function(dos, tres) {
return {
Expand Down
2 changes: 1 addition & 1 deletion tests/urlfetch/three.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require.def("three", {
define("three", {
name: "three"
});

Expand Down
Loading

0 comments on commit 2720387

Please sign in to comment.