Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Breaking: v6 with backward compatibility #3370

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
"plugin:react/recommended"
],
"globals": {
"Promise": true,
"requirejs": true,
"Backbone": true,
"$": true,
"ENUM": true,
"Modernizr": true,
"_": true,
"Handlebars": true,
"Backbone": "off",
"$": "off",
"ENUM": "off",
"Modernizr": "off",
"_": "off",
"Handlebars": "off",
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
Expand All @@ -31,6 +30,29 @@
"requirejs"
],
"rules": {
"no-restricted-globals": [
"error",
{
"name": "ENUM",
"message": "Use: import ENUM from 'enum';"
},
{
"name": "Backbone",
"message": "Use: import Backbone from 'backbone';"
},
{
"name": "Handlebars",
"message": "Use: import Handlebars from 'handlebars';"
},
{
"name": "_",
"message": "Use: import _ from 'underscore';"
},
{
"name": "$",
"message": "Use: import $ from 'jquery';"
}
],
"indent": ["error", 2, { "SwitchCase": 1 }],
"array-bracket-spacing": "off",
"semi": ["error", "always"],
Expand Down
11 changes: 8 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ src/extensions
src/less
src/less/adapt.less
src/plugins.js
build
bower_components
node_modules
.DS_Store
.idea
.idea
build/*
!build/course
!build/course/*
build/course/*/language_data_manifest.js
node_modules
src/node_modules/
src/package-lock.json
5 changes: 0 additions & 5 deletions .gitmodules

This file was deleted.

6 changes: 2 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var path = require('path');

module.exports = function(grunt) {
var helpers = require('./grunt/helpers')(grunt);

const helpers = require('./grunt/helpers')(grunt);
grunt.option('helpers', helpers);
require('time-grunt')(grunt);
require('load-grunt-config')(grunt, {
data: helpers.generateConfigData(),
Expand All @@ -14,8 +14,6 @@ module.exports = function(grunt) {
}
}
});

grunt.config('helpers', helpers);
grunt.registerTask('default', ['help']);
};

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading