Move from mapbox-gl-style-spec -> mapbox-gl.

package.json

@@ -30,9 +30,8 @@
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.4.0",
     "lodash.throttle": "^4.1.1",
-    "mapbox-gl": "^0.33.0",
+    "mapbox-gl": "^0.34.0",
     "mapbox-gl-inspect": "^1.2.2",
-    "mapbox-gl-style-spec": "^8.11.0",
     "mousetrap": "^1.6.0",
     "ol-mapbox-style": "1.0.1",
     "openlayers": "^3.19.1",

src/components/App.jsx

@@ -10,9 +10,9 @@ import AppLayout from './AppLayout'
 import MessagePanel from './MessagePanel'
 
 import { downloadGlyphsMetadata, downloadSpriteMetadata } from '../libs/metadata'
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
-import validateStyleMin from 'mapbox-gl-style-spec/lib/validate_style.min'
+import validateStyleMin from 'mapbox-gl/src/style-spec/validate_style.min'
-import formatStyle from 'mapbox-gl-style-spec/lib/format'
+import formatStyle from 'mapbox-gl/src/style-spec/format'
 import style from '../libs/style.js'
 import { initialStyleUrl, loadStyleUrl } from '../libs/urlopen'
 import { undoMessages, redoMessages } from '../libs/diffmessage'

src/components/filter/FilterEditor.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { combiningFilterOps } from '../../libs/filterops.js'
 
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import DocLabel from '../fields/DocLabel'
 import SelectInput from '../inputs/SelectInput'
 import SingleFilterEditor from './SingleFilterEditor'

src/components/layers/LayerIdBlock.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import InputBlock from '../inputs/InputBlock'
 import StringInput from '../inputs/StringInput'
 

src/components/layers/LayerSourceBlock.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import InputBlock from '../inputs/InputBlock'
 import StringInput from '../inputs/StringInput'
 import SelectInput from '../inputs/SelectInput'

src/components/layers/LayerSourceLayerBlock.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import InputBlock from '../inputs/InputBlock'
 import StringInput from '../inputs/StringInput'
 import SelectInput from '../inputs/SelectInput'

src/components/layers/LayerTypeBlock.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import InputBlock from '../inputs/InputBlock'
 import SelectInput from '../inputs/SelectInput'
 

src/components/layers/MaxZoomBlock.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import InputBlock from '../inputs/InputBlock'
 import NumberInput from '../inputs/NumberInput'
 

src/components/layers/MinZoomBlock.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import InputBlock from '../inputs/InputBlock'
 import NumberInput from '../inputs/NumberInput'
 

src/components/map/MapboxGlMap.jsx

@@ -4,7 +4,7 @@ import MapboxGl from 'mapbox-gl/dist/mapbox-gl.js'
 import MapboxInspect from 'mapbox-gl-inspect'
 import FeatureLayerPopup from './FeatureLayerPopup'
 import FeaturePropertyPopup from './FeaturePropertyPopup'
-import validateColor from 'mapbox-gl-style-spec/lib/validate/validate_color'
+import validateColor from 'mapbox-gl/src/style-spec/validate/validate_color'
 import style from '../../libs/style.js'
 import tokens from '../../config/tokens.json'
 import colors from 'mapbox-gl-inspect/lib/colors'

src/components/modals/ExportModal.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { saveAs } from 'file-saver'
 
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import InputBlock from '../inputs/InputBlock'
 import StringInput from '../inputs/StringInput'
 import SelectInput from '../inputs/SelectInput'
@@ -10,7 +10,7 @@ import Button from '../Button'
 import Modal from './Modal'
 import MdFileDownload from 'react-icons/lib/md/file-download'
 import style from '../../libs/style.js'
-import formatStyle from 'mapbox-gl-style-spec/lib/format'
+import formatStyle from 'mapbox-gl/src/style-spec/format'
 import GitHub from 'github-api'
 
 

src/components/modals/SettingsModal.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import InputBlock from '../inputs/InputBlock'
 import StringInput from '../inputs/StringInput'
 import SelectInput from '../inputs/SelectInput'

src/components/modals/SourcesModal.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import Modal from './Modal'
 import Button from '../Button'
 import InputBlock from '../inputs/InputBlock'

src/components/sources/SourceTypeEditor.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 import InputBlock from '../inputs/InputBlock'
 import StringInput from '../inputs/StringInput'
 import NumberInput from '../inputs/NumberInput'

src/libs/diffmessage.js

@@ -1,4 +1,4 @@
-import diffStyles from 'mapbox-gl-style-spec/lib/diff'
+import diffStyles from 'mapbox-gl/src/style-spec/diff'
 
 export function diffMessages(beforeStyle, afterStyle) {
   const changes = diffStyles(beforeStyle, afterStyle)

src/libs/filterops.js

@@ -1,4 +1,4 @@
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 export const combiningFilterOps = ['all', 'any', 'none']
 export const setFilterOps = ['in', '!in']
 export const otherFilterOps = Object

src/libs/layer.js

@@ -1,4 +1,4 @@
-import GlSpec from 'mapbox-gl-style-spec/reference/latest.js'
+import GlSpec from 'mapbox-gl/src/style-spec/reference/latest'
 
 export function changeType(layer, newType) {
   const changedPaintProps = { ...layer.paint }

src/libs/style.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import spec from 'mapbox-gl-style-spec/reference/latest.min.js'
+import spec from 'mapbox-gl/src/style-spec/reference/latest'
-import derefLayers from 'mapbox-gl-style-spec/lib/deref'
+import derefLayers from 'mapbox-gl/src/style-spec/deref'
 import tokens from '../config/tokens.json'
 
 // Empty style is always used if no style could be restored or fetched

webpack.production.config.js

@@ -12,8 +12,6 @@ module.exports = {
     vendor: [
         'file-saver',
         'mapbox-gl/dist/mapbox-gl.js',
-        //TODO: Build failure because cannot resolve migrations file
-        //"mapbox-gl-style-spec",
         "lodash.clonedeep",
         "lodash.throttle",
         'color',