mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-28 00:40:07 +02:00
Merge branch 'master' into translation-slovenian
This commit is contained in:
commit
58714a3d29
17 changed files with 288 additions and 187 deletions
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
0
src/style/font/fontawesome-webfont.eot → assets/font/fontawesome-webfont.eot
Executable file → Normal file
0
src/style/font/fontawesome-webfont.eot → assets/font/fontawesome-webfont.eot
Executable file → Normal file
0
src/style/font/fontawesome-webfont.svg → assets/font/fontawesome-webfont.svg
Executable file → Normal file
0
src/style/font/fontawesome-webfont.svg → assets/font/fontawesome-webfont.svg
Executable file → Normal file
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 127 KiB |
0
src/style/font/fontawesome-webfont.ttf → assets/font/fontawesome-webfont.ttf
Executable file → Normal file
0
src/style/font/fontawesome-webfont.ttf → assets/font/fontawesome-webfont.ttf
Executable file → Normal file
0
src/style/font/fontawesome-webfont.woff → assets/font/fontawesome-webfont.woff
Executable file → Normal file
0
src/style/font/fontawesome-webfont.woff → assets/font/fontawesome-webfont.woff
Executable file → Normal file
Binary file not shown.
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 5.2 KiB |
51
gulpfile.js
51
gulpfile.js
|
@ -8,8 +8,11 @@ var { src, dest, series, watch } = require('gulp');
|
|||
var log = require('fancy-log');
|
||||
var gHash = require('gulp-hash');
|
||||
var gClean = require('gulp-clean');
|
||||
var concat = require('gulp-concat');
|
||||
var cleanCSS = require('gulp-clean-css');
|
||||
var gTerser = require('gulp-terser');
|
||||
var gJasmine = require('gulp-jasmine');
|
||||
var { minify } = require('html-minifier');
|
||||
var { SpecReporter } = require('jasmine-spec-reporter');
|
||||
var gJshint = require('gulp-jshint');
|
||||
|
||||
|
@ -22,18 +25,6 @@ _.templateSettings.interpolate = /\{\{(.+?)\}\}/g;
|
|||
_.templateSettings.escape = /\{\{\{(.*?)\}\}\}/g;
|
||||
_.templateSettings.evaluate = /\{\{-(.*?)\}\}/g;
|
||||
|
||||
var prodDependencies = [
|
||||
'<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.1/es5-shim.min.js"></script>',
|
||||
'<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>',
|
||||
'<script src="https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>'
|
||||
];
|
||||
|
||||
var devDependencies = [
|
||||
'<script src="lib/jquery-1.8.0.min.js"></script>',
|
||||
'<script src="lib/raphael-min.js"></script>',
|
||||
'<script src="lib/es5-shim.min.js"></script>'
|
||||
];
|
||||
|
||||
// precompile for speed
|
||||
var indexFile = readFileSync('src/template.index.html').toString();
|
||||
var indexTemplate = _.template(indexFile);
|
||||
|
@ -57,7 +48,7 @@ const lintStrings = (done) => {
|
|||
|
||||
var destDir = './build/';
|
||||
|
||||
var buildIndex = function(config) {
|
||||
var buildIndex = function(done) {
|
||||
log('Building index...');
|
||||
|
||||
// first find the one in here that we want
|
||||
|
@ -85,19 +76,17 @@ var buildIndex = function(config) {
|
|||
var outputIndex = indexTemplate({
|
||||
jsFile,
|
||||
styleFile,
|
||||
jsDependencies: config.isProd ?
|
||||
prodDependencies.join('\n') :
|
||||
devDependencies.join('\n')
|
||||
});
|
||||
writeFileSync('index.html', outputIndex);
|
||||
};
|
||||
|
||||
var buildIndexProd = function(done) {
|
||||
buildIndex({ isProd: true });
|
||||
done();
|
||||
};
|
||||
var buildIndexDev = function(done) {
|
||||
buildIndex({ isProd: false });
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
outputIndex = minify(outputIndex, {
|
||||
minifyJS: true,
|
||||
collapseWhitespace: true,
|
||||
processScripts: ['text/html'],
|
||||
removeComments: true,
|
||||
});
|
||||
}
|
||||
writeFileSync('index.html', outputIndex);
|
||||
done();
|
||||
};
|
||||
|
||||
|
@ -141,8 +130,14 @@ var miniBuild = function() {
|
|||
};
|
||||
|
||||
var style = function() {
|
||||
return src('src/style/main.css')
|
||||
.pipe(gHash())
|
||||
var chain = src('src/style/*.css')
|
||||
.pipe(concat('main.css'));
|
||||
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
chain = chain.pipe(cleanCSS());
|
||||
}
|
||||
|
||||
return chain.pipe(gHash())
|
||||
.pipe(dest(destDir));
|
||||
};
|
||||
|
||||
|
@ -176,11 +171,11 @@ var gitDeployPushOrigin = function(done) {
|
|||
done();
|
||||
};
|
||||
|
||||
var fastBuild = series(clean, ifyBuild, style, buildIndexDev, jshint);
|
||||
var fastBuild = series(clean, ifyBuild, style, buildIndex, jshint);
|
||||
|
||||
var build = series(
|
||||
clean,
|
||||
miniBuild, style, buildIndexProd,
|
||||
miniBuild, style, buildIndex,
|
||||
gitAdd, jasmine, jshint,
|
||||
lintStrings, compliment
|
||||
);
|
||||
|
|
7
lib/es5-shim.min.js
vendored
7
lib/es5-shim.min.js
vendored
File diff suppressed because one or more lines are too long
2
lib/jquery-1.8.0.min.js
vendored
2
lib/jquery-1.8.0.min.js
vendored
File diff suppressed because one or more lines are too long
10
lib/raphael-min.js
vendored
10
lib/raphael-min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -22,11 +22,14 @@
|
|||
"glob": "^7.1.6",
|
||||
"gulp": "^4.0.2",
|
||||
"gulp-clean": "^0.4.0",
|
||||
"gulp-clean-css": "^4.3.0",
|
||||
"gulp-concat": "^2.6.1",
|
||||
"gulp-hash": "^4.2.2",
|
||||
"gulp-jasmine": "^4.0.0",
|
||||
"gulp-jshint": "^2.1.0",
|
||||
"gulp-terser": "^1.2.0",
|
||||
"gulp-uglify": "^3.0.2",
|
||||
"html-minifier": "^4.0.0",
|
||||
"jasmine-spec-reporter": "^4.2.1",
|
||||
"jshint": "^2.11.0",
|
||||
"prompt": "^1.0.0",
|
||||
|
@ -37,9 +40,12 @@
|
|||
"backbone": "^1.4.0",
|
||||
"flux": "^3.1.3",
|
||||
"jquery": "^3.4.0",
|
||||
"jquery-ui": "^1.12.1",
|
||||
"jquery-ui-sortable-npm": "^1.0.0",
|
||||
"markdown": "^0.5.0",
|
||||
"prop-types": "^15.7.2",
|
||||
"q": "^1.5.1",
|
||||
"raphael": "^2.1.0",
|
||||
"react": "^16.13.0",
|
||||
"react-dom": "^16.13.0",
|
||||
"underscore": "~1.4.3"
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
var Backbone = require('backbone');
|
||||
var jQuery = require('jquery');
|
||||
var EventEmitter = require('events').EventEmitter;
|
||||
var React = require('react');
|
||||
var ReactDOM = require('react-dom');
|
||||
|
@ -11,6 +12,16 @@ var LocaleActions = require('../actions/LocaleActions');
|
|||
/**
|
||||
* Globals
|
||||
*/
|
||||
|
||||
Backbone.$ = jQuery;
|
||||
|
||||
// Bypass jasmine
|
||||
if (util.isBrowser()) {
|
||||
window.jQuery = jQuery;
|
||||
window.$ = jQuery;
|
||||
window.Raphael = require('raphael');
|
||||
}
|
||||
|
||||
var events = Object.assign(
|
||||
{},
|
||||
EventEmitter.prototype,
|
||||
|
|
|
@ -7,6 +7,13 @@ var ModalTerminal = require('../views').ModalTerminal;
|
|||
var ContainedBase = require('../views').ContainedBase;
|
||||
var ConfirmCancelView = require('../views').ConfirmCancelView;
|
||||
|
||||
require('jquery-ui/ui/widget');
|
||||
require('jquery-ui/ui/scroll-parent');
|
||||
require('jquery-ui/ui/data');
|
||||
require('jquery-ui/ui/widgets/mouse');
|
||||
require('jquery-ui/ui/ie');
|
||||
require('jquery-ui/ui/widgets/sortable');
|
||||
|
||||
var InteractiveRebaseView = ContainedBase.extend({
|
||||
tagName: 'div',
|
||||
template: _.template($('#interactive-rebase-template').html()),
|
||||
|
|
|
@ -335,6 +335,7 @@ exports.level = {
|
|||
"Se rechazó el `push` del `commit` a la rama `master` debido a la política en la rama `master` que requiere el uso de `Pull Requests`.",
|
||||
"",
|
||||
"Trataste de crear una rama y luego hacer `pushs` creando un `Pull Request`, pero te olvidaste e hiciste `commit` directamente a `master`. Ahora estás atascado y no puedes hacer `push` de tus cambios."
|
||||
|
||||
]
|
||||
}
|
||||
},
|
||||
|
|
5
src/style/font-awesome.css
vendored
5
src/style/font-awesome.css
vendored
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
@font-face {
|
||||
font-family: "FontAwesome";
|
||||
src: url('./font/fontawesome-webfont.eot');
|
||||
src: url('./font/fontawesome-webfont.eot?#iefix') format('eot'), url('./font/fontawesome-webfont.woff') format('woff'), url('./font/fontawesome-webfont.ttf') format('truetype'), url('./font/fontawesome-webfont.svg#FontAwesome') format('svg');
|
||||
src: url('../assets/font/fontawesome-webfont.eot');
|
||||
src: url('../assets/font/fontawesome-webfont.eot?#iefix') format('eot'), url('../assets/font/fontawesome-webfont.woff') format('woff'), url('../assets/font/fontawesome-webfont.ttf') format('truetype'), url('../assets/font/fontawesome-webfont.svg#FontAwesome') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
|
@ -301,4 +301,3 @@ li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
|
|||
.icon-paste:before { content: "\f0ea"; }
|
||||
|
||||
.icon-user-md:before { content: "\f200"; }
|
||||
|
||||
|
|
|
@ -15,120 +15,8 @@
|
|||
<meta http-equiv="content-language" content="en">
|
||||
|
||||
<link rel="stylesheet" href="build/{{styleFile}}" type="text/css" charset="utf-8">
|
||||
<link rel="stylesheet" href="src/style/font-awesome.css" type="text/css" charset="utf-8">
|
||||
<link rel="stylesheet" href="src/style/rainbows.css" type="text/css" charset="utf-8">
|
||||
<link rel="icon" href="src/style/favicon.ico" type="image/x-icon">
|
||||
</head>
|
||||
<body>
|
||||
<!-- lol noscript. I did not write 9k+ lines of JS just for you to bounce off my website -->
|
||||
<noscript>
|
||||
<div style="z-index:1000000;background:red;color:white;position:absolute;top:0;left:0;height:300px;width:300px;">
|
||||
This application simulates a git repository in your browser, so you will need
|
||||
JS to use the app. Try enabling and refreshing the page -- Thanks!
|
||||
</div>
|
||||
</noscript>
|
||||
<link rel="icon" href="assets/favicon.ico" type="image/x-icon">
|
||||
|
||||
<!-- The entire interface is within this div -->
|
||||
<div id="interfaceWrapper" class="box horizontal flex1">
|
||||
<div id="controls" class="box vertical flex1 visBackgroundColor">
|
||||
<div id="commandLineHistory" class="box vertical flex3">
|
||||
<div class="toolbar box vertical center">
|
||||
<div class="controls box horizontal justify">
|
||||
<div class="box flex1">
|
||||
<div class="close">
|
||||
</div>
|
||||
</div>
|
||||
<div class="box flex1">
|
||||
<div class="minimize">
|
||||
</div>
|
||||
</div>
|
||||
<div class="box flex1">
|
||||
<div class="plus">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<i class="icon-home"></i>
|
||||
<span class="vcs-mode-aware intl-aware" data-intl="learn-git-branching">
|
||||
Learn Git Branching
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div id="levelToolbarMount">
|
||||
</div>
|
||||
|
||||
<div id="terminal" class="box flex1 horizontal startAlign">
|
||||
<div id="commandDisplay" class="box vertical flex1">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="commandLineBar" class="box vertical flex0">
|
||||
<div id="prompt" class="">
|
||||
<span class="promptSign box">$</span>
|
||||
<span class="cursor box"> </span>
|
||||
<p class="command"></p>
|
||||
</div>
|
||||
<textarea
|
||||
autocomplete="off"
|
||||
autocorrect="off"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
id="commandTextField">
|
||||
</textarea>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="mainVisSpace" class="box flex2 horizontal transitionAll visBackgroundColor">
|
||||
<span class="modeText transitionOpacity gitMode">
|
||||
Git
|
||||
</span>
|
||||
<span class="modeText transitionOpacity hgMode">
|
||||
Hg
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<!-- If you drag the goal window to the right side of the screen, this gets shown and causes
|
||||
the main visualization to squeeze a bit. This way, you could have the goal window hang out
|
||||
on the right side of the screen and still see the repo visualization. -->
|
||||
<div id="goalPlaceholder" class="box flex1 visBackgroundColor" style="display: none;"></div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="canvasHolder">
|
||||
</div>
|
||||
|
||||
<div id="reactMount">
|
||||
</div>
|
||||
|
||||
<div id="helperBarMount">
|
||||
</div>
|
||||
|
||||
<!-- lol inline styles -->
|
||||
<a class="githubLink" href="https://github.com/pcottle/learnGitBranching" target="_blank">
|
||||
<img
|
||||
style="position: absolute; top: 0; right: 0; border: 0;"
|
||||
src="assets/forkme_right_darkblue_121621.png"
|
||||
alt="Fork me on GitHub"
|
||||
/>
|
||||
</a>
|
||||
|
||||
<!-- Dependencies -->
|
||||
<script type="text/javascript">
|
||||
// PhantomJS doesn't support bind yet LOL. polyfill locally so tests
|
||||
// can pass while offline
|
||||
Function.prototype.bind = Function.prototype.bind || function (thisp) {
|
||||
var fn = this;
|
||||
return function () {
|
||||
return fn.apply(thisp, arguments);
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
{{jsDependencies}}
|
||||
|
||||
<script src="lib/jquery-ui-1.9.0.custom.min.js"></script>
|
||||
|
||||
<!-- Templates from here on out... -->
|
||||
<script type="text/html" id="modal-view-template">
|
||||
|
@ -464,11 +352,107 @@
|
|||
</div>
|
||||
</li>
|
||||
</script>
|
||||
|
||||
<!-- The compiled and minified build file (that actually does everything) is below.
|
||||
For a much easier time perusing the source, see the individual files at:
|
||||
https://github.com/pcottle/learnGitBranching
|
||||
-->
|
||||
<script src="build/{{jsFile}}"></script>
|
||||
<script defer src="build/{{jsFile}}"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- lol noscript. I did not write 9k+ lines of JS just for you to bounce off my website -->
|
||||
<noscript>
|
||||
<div style="z-index:1000000;background:red;color:white;position:absolute;top:0;left:0;height:300px;width:300px;">
|
||||
This application simulates a git repository in your browser, so you will need
|
||||
JS to use the app. Try enabling and refreshing the page -- Thanks!
|
||||
</div>
|
||||
</noscript>
|
||||
|
||||
<!-- The entire interface is within this div -->
|
||||
<div id="interfaceWrapper" class="box horizontal flex1">
|
||||
<div id="controls" class="box vertical flex1 visBackgroundColor">
|
||||
<div id="commandLineHistory" class="box vertical flex3">
|
||||
<div class="toolbar box vertical center">
|
||||
<div class="controls box horizontal justify">
|
||||
<div class="box flex1">
|
||||
<div class="close">
|
||||
</div>
|
||||
</div>
|
||||
<div class="box flex1">
|
||||
<div class="minimize">
|
||||
</div>
|
||||
</div>
|
||||
<div class="box flex1">
|
||||
<div class="plus">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<i class="icon-home"></i>
|
||||
<span class="vcs-mode-aware intl-aware" data-intl="learn-git-branching">
|
||||
Learn Git Branching
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div id="levelToolbarMount">
|
||||
</div>
|
||||
|
||||
<div id="terminal" class="box flex1 horizontal startAlign">
|
||||
<div id="commandDisplay" class="box vertical flex1">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="commandLineBar" class="box vertical flex0">
|
||||
<div id="prompt" class="">
|
||||
<span class="promptSign box">$</span>
|
||||
<span class="cursor box"> </span>
|
||||
<p class="command"></p>
|
||||
</div>
|
||||
<textarea
|
||||
autocomplete="off"
|
||||
autocorrect="off"
|
||||
autocapitalize="off"
|
||||
spellcheck="false"
|
||||
id="commandTextField"></textarea>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="mainVisSpace" class="box flex2 horizontal transitionAll visBackgroundColor">
|
||||
<span class="modeText transitionOpacity gitMode">
|
||||
Git
|
||||
</span>
|
||||
<span class="modeText transitionOpacity hgMode">
|
||||
Hg
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<!-- If you drag the goal window to the right side of the screen, this gets shown and causes
|
||||
the main visualization to squeeze a bit. This way, you could have the goal window hang out
|
||||
on the right side of the screen and still see the repo visualization. -->
|
||||
<div id="goalPlaceholder" class="box flex1 visBackgroundColor" style="display: none;"></div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="canvasHolder">
|
||||
</div>
|
||||
|
||||
<div id="reactMount">
|
||||
</div>
|
||||
|
||||
<div id="helperBarMount">
|
||||
</div>
|
||||
|
||||
<!-- lol inline styles -->
|
||||
<a class="githubLink" href="https://github.com/pcottle/learnGitBranching" target="_blank">
|
||||
<img width="149" height="149"
|
||||
style="position: absolute; top: 0; right: 0; border: 0;"
|
||||
src="assets/forkme_right_darkblue_121621.png"
|
||||
alt="Fork me on GitHub"
|
||||
/>
|
||||
</a>
|
||||
|
||||
|
||||
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
|
||||
The downside? No raw logs to parse for analytics, so I have to include
|
||||
|
|
163
yarn.lock
163
yarn.lock
|
@ -774,6 +774,14 @@ cached-path-relative@^1.0.0, cached-path-relative@^1.0.2:
|
|||
resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db"
|
||||
integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==
|
||||
|
||||
camel-case@^3.0.0:
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
|
||||
integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
|
||||
dependencies:
|
||||
no-case "^2.2.0"
|
||||
upper-case "^1.1.1"
|
||||
|
||||
camelcase-keys@^2.0.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
|
||||
|
@ -843,6 +851,13 @@ class-utils@^0.3.5:
|
|||
isobject "^3.0.0"
|
||||
static-extend "^0.1.1"
|
||||
|
||||
clean-css@4.2.3, clean-css@^4.2.1:
|
||||
version "4.2.3"
|
||||
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
|
||||
integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
|
||||
dependencies:
|
||||
source-map "~0.6.0"
|
||||
|
||||
cli@~1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/cli/-/cli-1.0.1.tgz#22817534f24bfa4950c34d532d48ecbc621b8c14"
|
||||
|
@ -955,7 +970,7 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0:
|
|||
lodash.memoize "~3.0.3"
|
||||
source-map "~0.5.3"
|
||||
|
||||
commander@^2.20.0, commander@~2.20.3:
|
||||
commander@^2.19.0, commander@^2.20.0, commander@~2.20.3:
|
||||
version "2.20.3"
|
||||
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
|
||||
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
|
||||
|
@ -980,6 +995,13 @@ concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0:
|
|||
readable-stream "^2.2.2"
|
||||
typedarray "^0.0.6"
|
||||
|
||||
concat-with-sourcemaps@^1.0.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
|
||||
integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
|
||||
dependencies:
|
||||
source-map "^0.6.1"
|
||||
|
||||
console-browserify@1.1.x:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
|
||||
|
@ -1421,6 +1443,11 @@ esutils@^2.0.0, esutils@^2.0.2:
|
|||
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
|
||||
integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
|
||||
|
||||
eve-raphael@0.5.0:
|
||||
version "0.5.0"
|
||||
resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30"
|
||||
integrity sha1-F8dUt5K+7z+maE15z1pHxjxM2jA=
|
||||
|
||||
events@^2.0.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/events/-/events-2.1.0.tgz#2a9a1e18e6106e0e812aa9ebd4a819b3c29c0ba5"
|
||||
|
@ -1899,6 +1926,16 @@ graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
|
|||
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
|
||||
integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
|
||||
|
||||
gulp-clean-css@^4.3.0:
|
||||
version "4.3.0"
|
||||
resolved "https://registry.yarnpkg.com/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz#5b1e73f2fca46703eb636014cdd4553cea65146d"
|
||||
integrity sha512-mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg==
|
||||
dependencies:
|
||||
clean-css "4.2.3"
|
||||
plugin-error "1.0.1"
|
||||
through2 "3.0.1"
|
||||
vinyl-sourcemaps-apply "0.2.1"
|
||||
|
||||
gulp-clean@^0.4.0:
|
||||
version "0.4.0"
|
||||
resolved "https://registry.yarnpkg.com/gulp-clean/-/gulp-clean-0.4.0.tgz#3bc25e7084e641bbd7bde057cf90c01c50d95950"
|
||||
|
@ -1934,6 +1971,15 @@ gulp-cli@^2.2.0:
|
|||
v8flags "^3.0.1"
|
||||
yargs "^7.1.0"
|
||||
|
||||
gulp-concat@^2.6.1:
|
||||
version "2.6.1"
|
||||
resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353"
|
||||
integrity sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=
|
||||
dependencies:
|
||||
concat-with-sourcemaps "^1.0.0"
|
||||
through2 "^2.0.0"
|
||||
vinyl "^2.0.0"
|
||||
|
||||
gulp-hash@^4.2.2:
|
||||
version "4.2.2"
|
||||
resolved "https://registry.yarnpkg.com/gulp-hash/-/gulp-hash-4.2.2.tgz#2cf4ad081ef7a65393a51e3df58f514f388f4523"
|
||||
|
@ -2081,6 +2127,11 @@ hash.js@^1.0.0, hash.js@^1.0.3:
|
|||
inherits "^2.0.3"
|
||||
minimalistic-assert "^1.0.1"
|
||||
|
||||
he@^1.2.0:
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
|
||||
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
|
||||
|
||||
hmac-drbg@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
|
||||
|
@ -2102,6 +2153,19 @@ hosted-git-info@^2.1.4:
|
|||
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
|
||||
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
|
||||
|
||||
html-minifier@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz#cca9aad8bce1175e02e17a8c33e46d8988889f56"
|
||||
integrity sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==
|
||||
dependencies:
|
||||
camel-case "^3.0.0"
|
||||
clean-css "^4.2.1"
|
||||
commander "^2.19.0"
|
||||
he "^1.2.0"
|
||||
param-case "^2.1.1"
|
||||
relateurl "^0.2.7"
|
||||
uglify-js "^3.5.1"
|
||||
|
||||
htmlescape@^1.1.0:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
|
||||
|
@ -2499,10 +2563,20 @@ jasmine@^3.1.0:
|
|||
glob "^7.1.4"
|
||||
jasmine-core "~3.5.0"
|
||||
|
||||
jquery-ui-sortable-npm@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/jquery-ui-sortable-npm/-/jquery-ui-sortable-npm-1.0.0.tgz#5fa27c36b76d1fbd45de9e24a0c940c19ba1f6ce"
|
||||
integrity sha1-X6J8NrdtH71F3p4koMlAwZuh9s4=
|
||||
|
||||
jquery-ui@^1.12.1:
|
||||
version "1.12.1"
|
||||
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
|
||||
integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=
|
||||
|
||||
jquery@^3.4.0:
|
||||
version "3.4.1"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
|
||||
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
|
||||
version "3.5.0"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
|
||||
integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
|
||||
|
||||
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
|
||||
version "4.0.0"
|
||||
|
@ -2937,6 +3011,11 @@ loud-rejection@^1.0.0:
|
|||
currently-unhandled "^0.4.1"
|
||||
signal-exit "^3.0.0"
|
||||
|
||||
lower-case@^1.1.1:
|
||||
version "1.1.4"
|
||||
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
|
||||
integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
|
||||
|
||||
lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
|
||||
|
@ -3216,6 +3295,13 @@ next-tick@~1.0.0:
|
|||
resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
|
||||
integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
|
||||
|
||||
no-case@^2.2.0:
|
||||
version "2.3.2"
|
||||
resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
|
||||
integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
|
||||
dependencies:
|
||||
lower-case "^1.1.1"
|
||||
|
||||
node-fetch@^1.0.1:
|
||||
version "1.7.3"
|
||||
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
|
||||
|
@ -3423,6 +3509,13 @@ pako@~1.0.5:
|
|||
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
|
||||
integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
|
||||
|
||||
param-case@^2.1.1:
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
|
||||
integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
|
||||
dependencies:
|
||||
no-case "^2.2.0"
|
||||
|
||||
parents@^1.0.0, parents@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
|
||||
|
@ -3591,6 +3684,16 @@ pkginfo@0.x.x:
|
|||
resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
|
||||
integrity sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=
|
||||
|
||||
plugin-error@1.0.1, plugin-error@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
|
||||
integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
|
||||
dependencies:
|
||||
ansi-colors "^1.0.1"
|
||||
arr-diff "^4.0.0"
|
||||
arr-union "^3.1.0"
|
||||
extend-shallow "^3.0.2"
|
||||
|
||||
plugin-error@^0.1.2:
|
||||
version "0.1.2"
|
||||
resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
|
||||
|
@ -3602,16 +3705,6 @@ plugin-error@^0.1.2:
|
|||
arr-union "^2.0.1"
|
||||
extend-shallow "^1.1.2"
|
||||
|
||||
plugin-error@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
|
||||
integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
|
||||
dependencies:
|
||||
ansi-colors "^1.0.1"
|
||||
arr-diff "^4.0.0"
|
||||
arr-union "^3.1.0"
|
||||
extend-shallow "^3.0.2"
|
||||
|
||||
pluralize@^1.2.1:
|
||||
version "1.2.1"
|
||||
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
|
||||
|
@ -3766,6 +3859,13 @@ randomfill@^1.0.3:
|
|||
randombytes "^2.0.5"
|
||||
safe-buffer "^5.1.0"
|
||||
|
||||
raphael@^2.1.0:
|
||||
version "2.3.0"
|
||||
resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz#eabeb09dba861a1d4cee077eaafb8c53f3131f89"
|
||||
integrity sha512-w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ==
|
||||
dependencies:
|
||||
eve-raphael "0.5.0"
|
||||
|
||||
rcfinder@^0.1.6:
|
||||
version "0.1.9"
|
||||
resolved "https://registry.yarnpkg.com/rcfinder/-/rcfinder-0.1.9.tgz#f3e80f387ddf9ae80ae30a4100329642eae81115"
|
||||
|
@ -3931,6 +4031,11 @@ regex-not@^1.0.0, regex-not@^1.0.2:
|
|||
extend-shallow "^3.0.2"
|
||||
safe-regex "^1.1.0"
|
||||
|
||||
relateurl@^0.2.7:
|
||||
version "0.2.7"
|
||||
resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
|
||||
integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
|
||||
|
||||
remove-bom-buffer@^3.0.0:
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
|
||||
|
@ -4243,7 +4348,7 @@ source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6, source-map@~0.5.3:
|
|||
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
|
||||
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
|
||||
|
||||
source-map@^0.6.0, source-map@~0.6.1:
|
||||
source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
|
||||
version "0.6.1"
|
||||
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
|
||||
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
|
||||
|
@ -4468,6 +4573,13 @@ through2-filter@^3.0.0:
|
|||
through2 "~2.0.0"
|
||||
xtend "~4.0.0"
|
||||
|
||||
through2@3.0.1, through2@^3.0.1:
|
||||
version "3.0.1"
|
||||
resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
|
||||
integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
|
||||
dependencies:
|
||||
readable-stream "2 || 3"
|
||||
|
||||
through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
|
||||
version "2.0.5"
|
||||
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
|
||||
|
@ -4476,13 +4588,6 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
|
|||
readable-stream "~2.3.6"
|
||||
xtend "~4.0.1"
|
||||
|
||||
through2@^3.0.1:
|
||||
version "3.0.1"
|
||||
resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
|
||||
integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
|
||||
dependencies:
|
||||
readable-stream "2 || 3"
|
||||
|
||||
"through@>=2.2.7 <3":
|
||||
version "2.3.8"
|
||||
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
|
||||
|
@ -4588,6 +4693,13 @@ uglify-js@^3.0.5:
|
|||
commander "~2.20.3"
|
||||
source-map "~0.6.1"
|
||||
|
||||
uglify-js@^3.5.1:
|
||||
version "3.9.1"
|
||||
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.1.tgz#a56a71c8caa2d36b5556cc1fd57df01ae3491539"
|
||||
integrity sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==
|
||||
dependencies:
|
||||
commander "~2.20.3"
|
||||
|
||||
umd@^3.0.0:
|
||||
version "3.0.3"
|
||||
resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf"
|
||||
|
@ -4670,6 +4782,11 @@ upath@^1.1.1:
|
|||
resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
|
||||
integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
|
||||
|
||||
upper-case@^1.1.1:
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
|
||||
integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
|
||||
|
||||
urix@^0.1.0:
|
||||
version "0.1.0"
|
||||
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
|
||||
|
@ -4798,7 +4915,7 @@ vinyl-sourcemap@^1.1.0:
|
|||
remove-bom-buffer "^3.0.0"
|
||||
vinyl "^2.0.0"
|
||||
|
||||
vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1:
|
||||
vinyl-sourcemaps-apply@0.2.1, vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1:
|
||||
version "0.2.1"
|
||||
resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
|
||||
integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue