Skip to content
This repository has been archived by the owner on Sep 7, 2021. It is now read-only.

Commit

Permalink
Possible fix for #34
Browse files Browse the repository at this point in the history 
Updates to few NPM packages
Using node modules instead of the dist versions
  • Loading branch information
@booleanhunter
booleanhunter committed Jan 23, 2017
1 parent 99b6dec commit d6375a4
Show file tree
Hide file tree
Showing 22 changed files with 34 additions and 30 deletions.
11 changes: 6 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adminlte-reactjs",
"version": "1.0.4",
"version": "1.0.5",
"repository": {
"type": "git",
"url": "http://github.com/booleanhunter/ReactJS-AdminLTE"
Expand All @@ -26,17 +26,18 @@
"jquery": "^3.1.1",
"jsx-loader": "^0.13.2",
"raphael": "^2.1.4",
"react": "~0.14.7",
"velocity-animate": "^1.2.3",
"webpack": "^1.12.13",
"react": "^0.14.8",
"react-dom": "^15.4.2",
"velocity-animate": "^1.4.0",
"webpack": "^1.14.0",
"webpack-raphael": "^2.1.4"
},
"devDependencies": {
"chai": "^3.5.0",
"css-loader": "^0.23.1",
"expect": "^1.20.2",
"mocha": "^3.1.2",
"react-hot-loader": "~1.3.0",
"react-hot-loader": "^1.3.1",
"style-loader": "^0.13.0",
"webpack-dev-server": "~1.14.1"
},
Expand Down
7 changes: 5 additions & 2 deletions reactjsAdminlte.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion reactjsAdminlte.js.map
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/components/chat-box/chat-box.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
'../../services/common-functions'
],
function (React, ReactDOM, commonFunctions) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/custom-box/box-functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define(
[
'exports',
'jquery',
'velocity'
'velocity-animate'
],
function (exports, $, velocity) {
//https://www.debuggex.com/r/Q-7k9g2R6hDLKE7J
Expand Down
2 changes: 1 addition & 1 deletion src/components/custom-box/box-tool.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
'./box-functions'
],
function (React, ReactDOM, boxFunctions) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/custom-box/box.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
],
function (React, ReactDOM) {
var Box = React.createClass({
Expand Down
2 changes: 1 addition & 1 deletion src/components/post/post.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
'./comment',
'./attachment',
'../../services/common-functions'
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dashboardV1/js/components/containers/container-five.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define(
[
'react',
'jquery',
'velocity'
'velocity-animate'

],
function(React,$){
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dashboardV1/js/dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
define(
[
'react',
'reactDom',
'react-dom',
'jquery',
'raphael',
'morris',
Expand Down
2 changes: 1 addition & 1 deletion src/pages/timeline-page/js/timeline-page.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
'jquery',
'../../../widgets.src'
],
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ui-elements-page/general/js/common-functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define(
[
'exports',
'jquery',
'velocity'
'velocity-animate'
],
function (exports, $, velocity) {

Expand Down
2 changes: 1 addition & 1 deletion src/pages/ui-elements-page/general/js/components/custom-box/box-functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define(
[
'exports',
'jquery',
'velocity'
'velocity-animate'
],
function (exports, $, velocity) {
//https://www.debuggex.com/r/Q-7k9g2R6hDLKE7J
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ui-elements-page/general/js/components/custom-box/box-tool.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
'./box-functions'
],
function (React, ReactDOM, boxFunctions) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ui-elements-page/general/js/components/custom-box/box.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
],
function (React, ReactDOM) {
var Box = React.createClass({
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ui-elements-page/general/js/components/custom-tabs/custom-tabs.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
],
function (React, ReactDOM) {
var CustomTabs = React.createClass({
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ui-elements-page/general/js/components/small-box.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
'../../common-functions'
],
function (React, ReactDOM, commonFunctions) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ui-elements-page/general/js/page-ui-elements.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define(
[
'react',
'reactDom',
'react-dom',
'jquery',
'./components/header-bar/header-bar',
'./components/navigation-menu',
Expand Down
2 changes: 1 addition & 1 deletion src/pages/widgets-page/js/widgets-page.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
define(
[
'react',
'reactDom',
'react-dom',
'jquery',
'../../../widgets.src'
],
Expand Down
2 changes: 1 addition & 1 deletion src/services/common-functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define(
[
'exports',
'jquery',
'velocity'
'velocity-animate'
],
function (exports, $, velocity) {

Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ var config = {
resolve: {
alias: {
react: node_dir + '/react',
reactDom: lib_dir + '/react-dom',
"react-dom": node-dir + '/react-dom',
jquery: node_dir + '/jquery/dist/jquery.min.js',
velocity: lib_dir + '/velocity.min.js',
"velocity-animate": node_dir + '/velocity-animate',
jqueryUi: plugins_dir + '/jQueryUI/jquery-ui.min.js',
bootstrap: plugins_dir + '/bootstrap/js/bootstrap.min.js',
//eve: node_dir + '/raphael/eve/eve.js',
Expand Down
6 changes: 3 additions & 3 deletions webpack.production.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ var config = {
resolve: {
alias: {
react: node_dir + '/react',
reactDom: lib_dir + '/react-dom',
"react-dom": node_dir + '/react-dom',
jquery: node_dir + '/jquery/dist/jquery.min.js',
velocity: lib_dir + '/velocity.min.js',
"velocity-animate": node_dir + '/velocity-animate',
jqueryUi: plugins_dir + '/jQueryUI/jquery-ui.min.js',
bootstrap: plugins_dir + '/bootstrap/js/bootstrap.min.js',
//eve: node_dir + '/raphael/eve/eve.js',
Expand Down Expand Up @@ -65,7 +65,7 @@ var config = {
externals: [
{
'react': 'react',
'reactDom': 'reactDom',
'react-dom': 'react-dom',
'jquery': 'jquery',
'velocity': 'velocity',
'jqueryUI': 'jqueryUI',
Expand Down

0 comments on commit d6375a4

Please sign in to comment.