Skip to content

Commit d7e6419

Browse files
mgolmgol
authored
Build: Remove the external directory, read from node_modules directly
Now that Sizzle is gone & we use npm, we can read from node_modules directly and skip the setup that copies some files to the external directory. Closes gh-4466
1 parent 5ea5946 commit d7e6419

12 files changed

+10
-41508
lines changed

‎.npmignore

-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,3 @@
1010
/speed
1111
/test
1212
/Gruntfile.js
13-
14-
/external/qunit
15-
/external/requirejs
16-
/external/sinon

‎Gruntfile.js

+4-24
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,6 @@ module.exports = function( grunt ) {
6868
}
6969
}
7070
},
71-
npmcopy: {
72-
all: {
73-
options: {
74-
destPrefix: "external"
75-
},
76-
files: {
77-
"npo/npo.js": "native-promise-only/lib/npo.src.js",
78-
79-
"qunit/qunit.js": "qunit/qunit/qunit.js",
80-
"qunit/qunit.css": "qunit/qunit/qunit.css",
81-
"qunit/LICENSE.txt": "qunit/LICENSE.txt",
82-
83-
"requirejs/require.js": "requirejs/require.js",
84-
85-
"sinon/sinon.js": "sinon/pkg/sinon.js",
86-
"sinon/LICENSE.txt": "sinon/LICENSE"
87-
}
88-
}
89-
},
9071
jsonlint: {
9172
pkg: {
9273
src: [ "package.json" ]
@@ -161,9 +142,9 @@ module.exports = function( grunt ) {
161142
],
162143
files: [
163144
"test/data/jquery-1.9.1.js",
164-
"external/sinon/sinon.js",
165-
"external/npo/npo.js",
166-
"external/requirejs/require.js",
145+
"node_modules/sinon/pkg/sinon.js",
146+
"node_modules/native-promise-only/lib/npo.src.js",
147+
"node_modules/requirejs/require.js",
167148
"test/data/testinit.js",
168149

169150
"test/jquery.js",
@@ -196,7 +177,7 @@ module.exports = function( grunt ) {
196177

197178
{ pattern: "dist/jquery.*", included: false, served: true },
198179
{ pattern: "src/**", included: false, served: true },
199-
{ pattern: "external/**", included: false, served: true },
180+
{ pattern: "node_modules/**", included: false, served: true },
200181
{
201182
pattern: "test/**/*.@(js|css|jpg|html|xml|svg)",
202183
included: false,
@@ -231,7 +212,6 @@ module.exports = function( grunt ) {
231212
// jsdom only runs basic tests
232213
"test/unit/basic.js",
233214

234-
{ pattern: "external/**", included: false, served: true },
235215
{
236216
pattern: "test/**/*.@(js|css|jpg|html|xml|svg)",
237217
included: false,

0 commit comments

Comments
 (0)