Skip to content

Commit c919310

Browse files
committed
Update node and webpack versions; remove gulp
1 parent e93779d commit c919310

File tree

18 files changed

+5269
-14669
lines changed

18 files changed

+5269
-14669
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
2+
"sourceType": "unambiguous",
3+
"plugins": ["@babel/plugin-transform-runtime"],
24
"presets": [
35
["@babel/env", {
46
"loose": true,
57
"useBuiltIns": "usage",
8+
"corejs": 2,
69
"targets": {
710
"browsers": ["last 2 versions", "safari >= 7", "ie 9"],
811
"node": "8"

gulp/browserify.js

Lines changed: 0 additions & 125 deletions
This file was deleted.

gulp/sass.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

gulp/watchtask.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

gulpfile.babel.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

nested_admin/static/nested_admin/src/nested-admin/grp$.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const $ = require('jquery');
1+
import $ from 'jquery';
22

33
/**
44
* For grappelli 2.14, converts a django.jQuery instance to a grp.jQuery
@@ -20,4 +20,4 @@ function grp$($sel) {
2020
return $grpSel;
2121
}
2222

23-
module.exports = grp$;
23+
export default grp$;

nested_admin/static/nested_admin/src/nested-admin/index.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
const $ = require('jquery');
2-
const grappelli = require('grappelli');
3-
const DJNesting = require('./utils');
4-
DJNesting.DjangoFormset = require('./jquery.djangoformset');
1+
import $ from 'jquery';
2+
import * as grappelli from 'grappelli';
3+
import DJNesting from './utils';
4+
import DjangoFormset from './jquery.djangoformset';
5+
6+
DJNesting.DjangoFormset = DjangoFormset;
57

68
$(document).ready(function() {
79
// Remove the border on any empty fieldsets
@@ -37,4 +39,4 @@ $(document).ready(function() {
3739
});
3840
});
3941

40-
module.exports = DJNesting;
42+
export default DJNesting;

nested_admin/static/nested_admin/src/nested-admin/jquery.djangoformset.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
'use strict';
1+
import $ from 'jquery';
22

3-
const $ = require('jquery');
4-
const regexQuote = require('./regexquote');
5-
const DJNesting = require('./utils');
6-
const grappelli = require('grappelli');
7-
const grp = require('grp');
8-
const grp$ = require('./grp$');
3+
import regexQuote from './regexquote';
4+
import DJNesting from './utils';
5+
import * as grappelli from 'grappelli';
6+
import grp from 'grp';
7+
import grp$ from './grp$';
8+
// const grp = require('grp');
9+
// const grp$ = require('./grp$');
910

1011
var pluginName = 'djangoFormset';
1112

@@ -583,4 +584,4 @@ $.fn[pluginName] = function() {
583584
}
584585
};
585586

586-
module.exports = DjangoFormset;
587+
export default DjangoFormset;

nested_admin/static/nested_admin/src/nested-admin/jquery.djnutils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const $ = require('jquery');
1+
import $ from 'jquery';
22

33
var prefixCache = {};
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = window.django.jQuery;
1+
export default window.django.jQuery;

0 commit comments

Comments
 (0)