Skip to content
This repository has been archived by the owner on Mar 13, 2023. It is now read-only.

Commit

Permalink
Bump emmet and use atom-space-pen-views-plus (#635)
Browse files Browse the repository at this point in the history
* bump emmet to 1.6.3

* use atom-space-pen-views-plus

* add activation hook

* add test script

* Update activation in the tests

* use GitHub action instead of Travis

* add @types/atom
  • Loading branch information
aminya committed Jul 5, 2020
1 parent f542f5e commit cccca58
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 11 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: CI
on:
- push
- pull_request

defaults:
run:
shell: bash

jobs:
Test:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
name: ${{ matrix.os }} - Atom ${{ matrix.atom_channel }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
# - macos-latest
# - windows-latest
atom_channel: [stable, beta]
steps:
- uses: actions/checkout@v2
- uses: UziTech/action-setup-atom@v1
with:
channel: ${{ matrix.atom_channel }}
- name: Versions
run: apm -v
- name: Install APM dependencies
run: |
apm install
# - name: Run tests 👩🏾‍💻
# run: npm run test

Skip:
if: contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-latest
steps:
- name: Skip CI 🚫
run: echo skip ci
6 changes: 0 additions & 6 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion lib/prompt.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{$, TextEditorView, View} = require 'atom-space-pen-views'
{$, TextEditorView, View} = require 'atom-space-pen-views-plus'
noop = ->

method = (delegate, method) ->
Expand Down
15 changes: 12 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,21 @@
"main": "./lib/emmet",
"version": "2.4.3",
"dependencies": {
"emmet": "^1.3.2",
"atom-space-pen-views": "^2.0.3"
"emmet": "^1.6.3",
"atom-space-pen-views-plus": "^3.0.4"
},
"devDependencies": {
"@types/atom": "^1.40.4"
},
"license": "MIT",
"repository": "https://github.com/emmetio/emmet-atom",
"engines": {
"atom": "*"
}
},
"scripts": {
"test": "atom --test spec"
},
"activationHooks": [
"core:loaded-shell-environment"
]
}
7 changes: 6 additions & 1 deletion spec/emmet-spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ describe "Emmet", ->
atom.workspace.open("tabbing.html")

waitsForPromise ->
atom.packages.activatePackage("emmet")
# Package activation will be deferred to the configured, activation hook, which is then triggered
# Activate activation hook
atom.packages.triggerDeferredActivationHooks();
atom.packages.triggerActivationHook("core:loaded-shell-environment");
waitsForPromise ->
atom.packages.activatePackage("emmet");

waitsForPromise ->
atom.packages.activatePackage("snippets") # to intentionally disrupt tab expansion
Expand Down

0 comments on commit cccca58

Please sign in to comment.