Merge pull request #122 from atom-community/upstream_master

.github/workflows/CI.yml

@@ -16,7 +16,6 @@ jobs:
           - macos-latest
           - windows-latest
         node_version:
-          - 10
           - 12
           - 14
         node_arch:
@@ -29,7 +28,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Install Node
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node_version }}
           architecture: ${{ matrix.node_arch }}

BUNDLED_NODE_VERSION

@@ -1 +1 @@
-v12.14.1
+v12.18.3

appveyor.yml

@@ -0,0 +1,6 @@
+# empty appveyor
+build: off
+
+branches:
+  only:
+  - non-existing

package.json

@@ -29,14 +29,14 @@
   "dependencies": {
     "@atom/plist": "0.4.4",
     "asar-require": "0.3.0",
-    "async": "~3.2.0",
+    "async": "^3.2.0",
     "colors": "~1.4.0",
-    "first-mate": "^7.4.1",
+    "first-mate": "^7.4.3",
     "fs-plus": "3.x",
-    "git-utils": "^5.7.1",
+    "git-utils": "^5.7.2",
     "glob": "^7.1.6",
     "hosted-git-info": "^3.0.7",
-    "keytar": "^6.0.1",
+    "keytar": "^7.7.0",
     "mv": "2.1.1",
     "ncp": "~2.0.0",
     "npm": "^6.14.9",

spec/init-spec.coffee

@@ -128,8 +128,10 @@ describe "apm init", ->
       runs ->
         expect(fs.existsSync(themePath)).toBeTruthy()
         expect(fs.existsSync(path.join(themePath, 'styles'))).toBeTruthy()
-        expect(fs.existsSync(path.join(themePath, 'styles', 'base.less'))).toBeTruthy()
+        expect(fs.existsSync(path.join(themePath, 'styles', 'colors.less'))).toBeTruthy()
         expect(fs.existsSync(path.join(themePath, 'styles', 'syntax-variables.less'))).toBeTruthy()
+        expect(fs.existsSync(path.join(themePath, 'styles', 'syntax.less'))).toBeTruthy()
+        expect(fs.existsSync(path.join(themePath, 'styles', 'editor.less'))).toBeTruthy()
         expect(fs.existsSync(path.join(themePath, 'index.less'))).toBeTruthy()
         expect(fs.existsSync(path.join(themePath, 'README.md'))).toBeTruthy()
         expect(fs.existsSync(path.join(themePath, 'package.json'))).toBeTruthy()

templates/language/spec/language-__package-name__-spec.coffee.template

@@ -9,7 +9,7 @@ describe "__PackageName__ grammar", ->
       atom.packages.activatePackage("language-__package-name__")
 
     runs ->
-      grammar = atom.syntax.grammarForScopeName("source.__package-name__")
+      grammar = atom.grammars.grammarForScopeName("source.__package-name__")
 
   it "parses the grammar", ->
     expect(grammar).toBeTruthy()

templates/theme/index.less

@@ -1 +1,3 @@
-@import "./styles/base.less";
+@import "styles/syntax-variables.less";
+@import "styles/syntax.less";
+@import "styles/editor.less";