glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

finish integrating npm. move underscore/backbone into npm management

Browse source
This commit is contained in:
Devin Howard 2016-08-01 08:32:32 +08:00
parent e6954eb37a
commit ad2814b14e
5 changed files with 10 additions and 2803 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/application.js
View file

@ -13,8 +13,7 @@
//= require jquery //= require jquery
//= require jquery-ui //= require jquery-ui
//= require jquery_ujs //= require jquery_ujs
//= require ./orderedLibraries/underscore //= require ./webpacked/metamaps.bundle
//= require ./orderedLibraries/backbone
//= require_directory ./lib //= require_directory ./lib
//= require ./src/Metamaps.GlobalUI //= require ./src/Metamaps.GlobalUI
//= require ./src/Metamaps.Router //= require ./src/Metamaps.Router

1571
app/assets/javascripts/orderedLibraries/backbone.js
View file

File diff suppressed because it is too large Load diff

1227
app/assets/javascripts/orderedLibraries/underscore.js
View file

File diff suppressed because it is too large Load diff

6
frontend/package.json
View file

@ -25,11 +25,13 @@
"babel-preset-react": "^6.11.1", "babel-preset-react": "^6.11.1",
"chai": "^3.5.0", "chai": "^3.5.0",
"mocha": "^2.4.5", "mocha": "^2.4.5",
"path": "^0.12.7",
"webpack": "^1.13.1" "webpack": "^1.13.1"
}, },
"dependencies": { "dependencies": {
"backbone": "^1.0.0",
"react": "^15.3.0", "react": "^15.3.0",
"react-dom": "^15.3.0" "react-dom": "^15.3.0",
"requirejs": "^2.1.1",
"underscore": "^1.8.3"
} }
} }

6
frontend/src/index.js
View file

@ -1,11 +1,15 @@
import React from 'react' import React from 'react'
import ReactDOM from 'react-dom' import ReactDOM from 'react-dom'
import ExploreHeader from './components/ExploreHeader.js' import Backbone from 'backbone'
import _ from 'underscore'
import ExploreHeader from './components/ExploreHeader'
// this is optional really, if we import components directly React will be // this is optional really, if we import components directly React will be
// in the bundle, so we won't need a global reference // in the bundle, so we won't need a global reference
window.React = React window.React = React
window.ReactDOM = ReactDOM window.ReactDOM = ReactDOM
window.Backbone = Backbone
window._ = _
window.Metamaps = window.Metamaps || {} window.Metamaps = window.Metamaps || {}
window.Metamaps.ReactComponents = { window.Metamaps.ReactComponents = {