Skip to content

Commit 0f3f722

Browse files
authored
Merge pull request #712 from atom-ide-community/activation-hook-4upstream
2 parents 4d3ef9f + d294adc commit 0f3f722

File tree

5 files changed

+33
-9
lines changed

5 files changed

+33
-9
lines changed

.github/workflows/CI.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: npm run lint
5555

5656
Release:
57-
needs: Lint # [Test, Lint]
57+
needs: [Test, Lint]
5858
if: github.ref == 'refs/heads/master' &&
5959
github.event.repository.fork == false
6060
runs-on: ubuntu-latest
@@ -68,14 +68,14 @@ jobs:
6868
run: npm install
6969
# - name: Build and Commit
7070
# run: npm run build-commit
71-
# - name: Release 🎉
72-
# uses: cycjimmy/semantic-release-action@v2
73-
# with:
74-
# extends: |
75-
# @semantic-release/apm-config
76-
# env:
77-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
78-
# ATOM_ACCESS_TOKEN: ${{ secrets.ATOM_ACCESS_TOKEN }}
71+
- name: Release 🎉
72+
uses: cycjimmy/semantic-release-action@v2
73+
with:
74+
extends: |
75+
@semantic-release/apm-config
76+
env:
77+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
78+
ATOM_ACCESS_TOKEN: ${{ secrets.ATOM_ACCESS_TOKEN }}
7979
Skip:
8080
if: contains(github.event.head_commit.message, '[skip ci]')
8181
runs-on: ubuntu-latest

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# v4.30.1 (2020-11-20)
2+
3+
- :sparkles: Startup time improvement: [fix: add activation hook](https://github.com/atom-minimap/minimap/pull/712)
4+
15
# v4.30.0 (2020-11-20)
26

37
- :sparkles: Performance improvement: [Make event listeners passive](https://github.com/atom-minimap/minimap/pull/683)

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
"viewProviders": [
4141
"minimapViewProvider"
4242
],
43+
"activationHooks": [
44+
"core:loaded-shell-environment"
45+
],
4346
"configSchema": {
4447
"plugins": {
4548
"type": "object",

spec/minimap-element-spec.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ describe('MinimapElement', () => {
5252
? document.body.querySelector('#jasmine-content')
5353
: document.body
5454

55+
56+
// Package activation will be deferred to the configured, activation hook, which is then triggered
57+
// Activate activation hook
58+
atom.packages.triggerDeferredActivationHooks();
59+
atom.packages.triggerActivationHook("core:loaded-shell-environment");
5560
waitsForPromise(() => atom.packages.activatePackage('minimap'))
5661

5762
runs(() => {
@@ -1949,6 +1954,10 @@ describe('MinimapElement', () => {
19491954
describe('with plugins registered in the package', () => {
19501955
let [minimapPackage, pluginA, pluginB] = []
19511956
beforeEach(() => {
1957+
// Package activation will be deferred to the configured, activation hook, which is then triggered
1958+
// Activate activation hook
1959+
atom.packages.triggerDeferredActivationHooks();
1960+
atom.packages.triggerActivationHook("core:loaded-shell-environment");
19521961
waitsForPromise(() => {
19531962
return atom.packages.activatePackage('minimap').then((pkg) => {
19541963
minimapPackage = pkg.mainModule

spec/minimap-main-spec.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ describe('Minimap package', () => {
1616
return atom.workspace.open('sample.coffee')
1717
})
1818

19+
// Package activation will be deferred to the configured, activation hook, which is then triggered
20+
// Activate activation hook
21+
atom.packages.triggerDeferredActivationHooks();
22+
atom.packages.triggerActivationHook("core:loaded-shell-environment");
1923
waitsForPromise(() => {
2024
return atom.packages.activatePackage('minimap').then((pkg) => {
2125
minimapPackage = pkg.mainModule
@@ -66,6 +70,10 @@ describe('Minimap package', () => {
6670
const m = new Minimap({textEditor: editor})
6771
const v = atom.views.getView(m)
6872
editorElement.appendChild(v)
73+
// Package activation will be deferred to the configured, activation hook, which is then triggered
74+
// Activate activation hook
75+
atom.packages.triggerDeferredActivationHooks();
76+
atom.packages.triggerActivationHook("core:loaded-shell-environment");
6977
waitsForPromise(() => atom.packages.activatePackage('minimap'))
7078
})
7179

0 commit comments

Comments
 (0)