Skip to content

Commit f7f27e2

Browse files
committed
Build: Simplify the factory definition
1 parent ee2767b commit f7f27e2

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ dist-module/**
1515
!dist-module/jquery.slim.module.min.js
1616
!dist-module/jquery.node-module-wrapper.js
1717
!dist-module/jquery.node-module-wrapper.slim.js
18-
!dist-module/jquery.factory.module.js
19-
!dist-module/jquery.factory.slim.module.js
2018
test/data/jquery-1.9.1.js
2119
test/data/badcall.js
2220
test/data/badjson.js

Gruntfile.cjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ module.exports = function( grunt ) {
4646
"dist-module/jquery.module.js",
4747
"dist-module/jquery.module.min.js",
4848
"dist-module/jquery.slim.module.js",
49-
"dist-module/jquery.slim.module.min.js",
50-
"dist-module/jquery.factory.module.js",
51-
"dist-module/jquery.factory.slim.module.js",
49+
"dist-module/jquery.slim.module.min.js"
5250
];
5351

5452
const builtJsMinFiles = builtJsFiles

package.json

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,8 @@
2727
"script": "./dist/jquery.slim.min.js",
2828
"default": "./dist-module/jquery.slim.module.min.js"
2929
},
30-
"./factory": {
31-
"node": "./dist/jquery.factory.js",
32-
"default": "./dist-module/jquery.factory.module.js"
33-
},
34-
"./factory-slim": {
35-
"node": "./dist/jquery.factory.slim.js",
36-
"default": "./dist-module/jquery.factory.slim.module.js"
37-
},
30+
"./factory": "./dist/jquery.factory.js",
31+
"./factory-slim": "./dist/jquery.factory.slim.js",
3832
"./src/*.js": "./src/*.js"
3933
},
4034
"main": "dist/jquery.js",
@@ -106,7 +100,7 @@
106100
},
107101
"scripts": {
108102
"build": "npm install && npm run build-all-variants",
109-
"build-all-variants": "grunt custom:slim --factory --esm --filename=jquery.factory.slim.module.js && grunt custom --factory --esm --filename=jquery.factory.module.js && grunt custom:slim --factory --filename=jquery.factory.slim.js && grunt custom --factory --filename=jquery.factory.js && grunt custom:slim --esm --filename=jquery.slim.module.js && grunt custom --esm --filename=jquery.module.js && grunt custom:slim --filename=jquery.slim.js && grunt custom",
103+
"build-all-variants": "grunt custom:slim --factory --filename=jquery.factory.slim.js && grunt custom --factory --filename=jquery.factory.js && grunt custom:slim --esm --filename=jquery.slim.module.js && grunt custom --esm --filename=jquery.module.js && grunt custom:slim --filename=jquery.slim.js && grunt custom",
110104
"start": "grunt watch",
111105
"test:browserless": "grunt && npm run test:node_smoke_tests && grunt test:slow",
112106
"test:browser": "grunt && grunt karma:main",
@@ -118,8 +112,8 @@
118112
"test:node_smoke_tests:regular-slim-module": "grunt node_smoke_tests:regular:module:./dist-module/jquery.slim.module.js && grunt node_smoke_tests:regular:module:jquery/slim",
119113
"test:node_smoke_tests:regular-full-commonjs": "grunt node_smoke_tests:regular:commonjs:./dist/jquery.js && grunt node_smoke_tests:regular:commonjs:jquery",
120114
"test:node_smoke_tests:regular-slim-commonjs": "grunt node_smoke_tests:regular:commonjs:./dist/jquery.slim.js && grunt node_smoke_tests:regular:commonjs:jquery/slim",
121-
"test:node_smoke_tests:factory-full-module": "grunt node_smoke_tests:factory:module:./dist-module/jquery.factory.module.js && grunt node_smoke_tests:factory:module:jquery/factory",
122-
"test:node_smoke_tests:factory-slim-module": "grunt node_smoke_tests:factory:module:./dist-module/jquery.factory.slim.module.js && grunt node_smoke_tests:factory:module:jquery/factory-slim",
115+
"test:node_smoke_tests:factory-full-module": "grunt node_smoke_tests:factory:module:./dist/jquery.factory.js && grunt node_smoke_tests:factory:module:jquery/factory",
116+
"test:node_smoke_tests:factory-slim-module": "grunt node_smoke_tests:factory:module:./dist/jquery.factory.slim.js && grunt node_smoke_tests:factory:module:jquery/factory-slim",
123117
"test:node_smoke_tests:factory-full-commonjs": "grunt node_smoke_tests:factory:commonjs:./dist/jquery.factory.js && grunt node_smoke_tests:factory:commonjs:jquery/factory",
124118
"test:node_smoke_tests:factory-slim-commonjs": "grunt node_smoke_tests:factory:commonjs:./dist/jquery.factory.slim.js && grunt node_smoke_tests:factory:commonjs:jquery/factory-slim",
125119
"test:node_smoke_tests:regular": "npm run test:node_smoke_tests:regular-full-module && npm run test:node_smoke_tests:regular-slim-module && npm run test:node_smoke_tests:regular-full-commonjs && npm run test:node_smoke_tests:regular-slim-commonjs",

0 commit comments

Comments
 (0)