cson(packages): Remove from specs, deprecate use for for menus, package.json files

spec/fixtures/packages/package-with-grammars/grammars/alittle.cson

@@ -1,12 +0,0 @@
-'fileTypes': ['alittle']
-'name': 'Alittle'
-'scopeName': 'source.alittle'
-
-'patterns': [
-  {
-    'captures':
-      '0':
-        'name': 'keyword.alittle'
-    'match': 'alittle'
-  }
-]

spec/fixtures/packages/package-with-grammars/grammars/alot.cson

@@ -1,12 +0,0 @@
-'fileTypes': ['alot', 'foobizbang']
-'name': 'Alot'
-'scopeName': 'source.alot'
-
-'patterns': [
-  {
-    'captures':
-      '0':
-        'name': 'keyword.alot'
-    'match': 'alot'
-  }
-]

spec/fixtures/packages/package-with-injection-selector/grammars/grammar.cson

@@ -1,4 +0,0 @@
-'name': 'test'
-'scopeName': 'source.test'
-'injectionSelector': 'comment'
-'patterns': [{'include': 'source.sql'}]

spec/fixtures/packages/package-with-keymaps-manifest/package.cson

@@ -1 +0,0 @@
-keymaps: ["keymap-2", "keymap-1"]

spec/fixtures/packages/package-with-keymaps-manifest/package.json

@@ -0,0 +1,3 @@
+{
+  "keymaps": ["keymap-2", "keymap-1"]
+}

spec/fixtures/packages/package-with-main/package.cson

@@ -1 +0,0 @@
-'main': 'main-module.coffee'

spec/fixtures/packages/package-with-main/package.json

@@ -0,0 +1,3 @@
+{
+  "main": "main-module.coffee"
+}

spec/fixtures/packages/package-with-menus-manifest/menus/menu-1.cson

@@ -1,8 +0,0 @@
-'menu': [
-  { 'label': 'Last' }
-]
-
-'context-menu':
-  '.test-1': [
-    {label: 'Menu item 1', command: 'command-1'}
-  ]

spec/fixtures/packages/package-with-menus-manifest/menus/menu-1.json

@@ -0,0 +1,5 @@
+{
+  "menu": [
+    { "label": "Last" }
+  ]
+}

spec/fixtures/packages/package-with-menus-manifest/menus/menu-2.cson

@@ -1,8 +0,0 @@
-'menu': [
-  { 'label': 'Second to Last' }
-]
-
-'context-menu':
-  '.test-1': [
-    {label: 'Menu item 2', command: 'command-2'}
-  ]

spec/fixtures/packages/package-with-menus-manifest/menus/menu-2.json

@@ -0,0 +1,5 @@
+{
+  "menu": [
+    { "label": "Second to Last" }
+  ]
+}

spec/fixtures/packages/package-with-menus-manifest/menus/menu-3.cson

@@ -1,4 +0,0 @@
-'context-menu':
-  '.test-1': [
-    {label: 'Menu item 3', command: 'command-3'}
-  ]

spec/fixtures/packages/package-with-menus-manifest/package.cson

@@ -1 +0,0 @@
-menus: ["menu-2", "menu-1"]

spec/fixtures/packages/package-with-menus-manifest/package.json

@@ -0,0 +1,3 @@
+{
+  "menus": ["menu-2", "menu-1"]
+}

spec/fixtures/packages/package-with-menus/menus/menu-1.cson

@@ -1,8 +0,0 @@
-'menu': [
-  {'label': 'Second to Last'}
-]
-
-'context-menu':
-  '.test-1': [
-    {label: 'Menu item 1', command: 'command-1'}
-  ]

spec/fixtures/packages/package-with-menus/menus/menu-1.json

@@ -0,0 +1,5 @@
+{
+  "menu": [
+    { "label": "Last" }
+  ]
+}

spec/fixtures/packages/package-with-menus/menus/menu-2.cson

@@ -1,8 +0,0 @@
-'menu': [
-  { 'label': 'Last' }
-]
-
-'context-menu':
-  '.test-1': [
-    {label: 'Menu item 2', command: 'command-2'}
-  ]

spec/fixtures/packages/package-with-menus/menus/menu-2.json

@@ -0,0 +1,5 @@
+{
+  "menu": [
+    { "label": "Second to Last" }
+  ]
+}

spec/fixtures/packages/package-with-menus/menus/menu-3.cson

@@ -1,8 +0,0 @@
-'menu': [
-  { 'label': 'Second to Last' }
-]
-
-'context-menu':
-  '.test-1': [
-    {label: 'Menu item 3', command: 'command-3'}
-  ]

spec/fixtures/packages/package-with-models/package.cson

@@ -1 +0,0 @@
-'main': 'main-module.coffee'

spec/fixtures/packages/package-with-models/package.json

@@ -0,0 +1,3 @@
+{
+  "main": "main-module.coffee"
+}

spec/fixtures/packages/package-with-serialize-error/package.cson

@@ -1 +0,0 @@
-'main': 'index.coffee'

spec/fixtures/packages/package-with-serialize-error/package.json

@@ -0,0 +1,3 @@
+{
+  "main": "index.coffee"
+}

spec/fixtures/packages/package-with-settings/settings/omg.cson

@@ -1,3 +0,0 @@
-'.source.omg':
-  'editor':
-    'increaseIndentPattern': '^a'

spec/fixtures/packages/package-with-style-sheets-manifest/package.cson

@@ -1 +0,0 @@
-styleSheets: ['2', '1']

spec/fixtures/packages/package-with-style-sheets-manifest/package.json

@@ -0,0 +1,3 @@
+{
+  "styleSheets": ["2", "1"]
+}

spec/fixtures/packages/package-with-stylesheets-manifest/package.cson

@@ -1 +0,0 @@
-styleSheets: ['2', '1']

spec/fixtures/packages/package-with-stylesheets-manifest/package.json

@@ -0,0 +1,3 @@
+{
+  "styleSheets": ["2", "1"]
+}

spec/fixtures/packages/package-without-module/package.cson

@@ -1 +0,0 @@
-"name": "perfect"

spec/fixtures/packages/package-without-module/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "perfect"
+}

spec/package-manager-spec.coffee

@@ -267,8 +267,8 @@ describe "PackageManager", ->
 
           runs ->
             expect(NylasEnv.menu.template.length).toBe 2
-            expect(NylasEnv.menu.template[0].label).toBe "Second to Last"
+            expect(NylasEnv.menu.template[1].label).toBe "Second to Last"
-            expect(NylasEnv.menu.template[1].label).toBe "Last"
+            expect(NylasEnv.menu.template[0].label).toBe "Last"
 
       describe "when the metadata contains a 'menus' manifest", ->
         it "loads only the menus specified by the manifest, in the specified order", ->

src/package.coffee

@@ -2,7 +2,6 @@ path = require 'path'
 
 _ = require 'underscore'
 async = require 'async'
-CSON = require 'season'
 fs = require 'fs-plus'
 EmitterMixin = require('emissary').Emitter
 {Emitter, CompositeDisposable} = require 'event-kit'
@@ -37,9 +36,10 @@ class Package
     if @isBundledPackagePath(packagePath)
       metadata = packagesCache[packageName]?.metadata
     unless metadata?
-      if metadataPath = CSON.resolve(path.join(packagePath, 'package'))
+      metadataPath = fs.resolve(path.join(packagePath, 'package.json'))
+      if fs.existsSync(metadataPath)
         try
-          metadata = CSON.readFileSync(metadataPath)
+          metadata = JSON.parse(fs.readFileSync(metadataPath))
         catch error
           throw error unless ignoreErrors
     metadata ?= {}
@@ -239,9 +239,9 @@ class Package
       if @bundledPackage and packagesCache[@name]?
         @menus = (["#{NylasEnv.packages.resourcePath}#{path.sep}#{menuPath}", menuObject] for menuPath, menuObject of packagesCache[@name].menus)
       else
-        @menus = @getMenuPaths().map (menuPath) -> [menuPath, CSON.readFileSync(menuPath) ? {}]
+        @menus = @getMenuPaths().map (menuPath) -> [menuPath, JSON.parse(fs.readFileSync(menuPath)) ? {}]
     catch e
-      console.error "Error reading keymaps for package '#{@name}': #{e.message}", e.stack
+      console.error "Error reading menus for package '#{@name}': #{e.message}", e.stack
 
   getKeymapPaths: ->
     keymapsDirPath = path.join(@path, 'keymaps')
@@ -253,9 +253,9 @@ class Package
   getMenuPaths: ->
     menusDirPath = path.join(@path, 'menus')
     if @metadata.menus
-      @metadata.menus.map (name) -> fs.resolve(menusDirPath, name, ['json', 'cson', ''])
+      @metadata.menus.map (name) -> fs.resolve(menusDirPath, name, ['json', ''])
     else
-      fs.listSync(menusDirPath, ['cson', 'json'])
+      fs.listSync(menusDirPath, ['json'])
 
   loadStylesheets: ->
     @stylesheets = @getStylesheetPaths().map (stylesheetPath) ->