Skip to content

Commit

Permalink
Merge pull request #86 from atom-community/parcel-update
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya authored Jul 25, 2021
2 parents 16cf1b6 + f532e75 commit 54b5808
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 8,139 deletions.
32 changes: 20 additions & 12 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,16 @@ jobs:
uses: UziTech/action-setup-atom@v1
with:
channel: ${{ matrix.channel }}
- name: Atom Version
run: atom -v
- name: APM Version
run: apm -v

- name: Cache
uses: actions/cache@v2
with:
path: |
./node_modules/
~/.npm
~/AppData/Roaming/npm-cache
key: "cache--OS:${{ matrix.os }}-Atom:${{ matrix.channel }}-${{ hashFiles('./package.json') }}"

- name: Install Dependencies
run: |
apm install --production
Expand All @@ -49,6 +55,15 @@ jobs:
- name: Commit lint ✨
uses: wagoid/commitlint-github-action@v4

- name: Cache
uses: actions/cache@v2
with:
path: |
./node_modules/
~/.npm
~/AppData/Roaming/npm-cache
key: "cache--OS:${{ matrix.os }}-${{ hashFiles('./package.json') }}"

- name: Install dependencies
run: npm install

Expand All @@ -72,7 +87,7 @@ jobs:
- name: Install Node
uses: dcodeIO/setup-node-nvm@master
with:
node-version: 12.4.0 # use the same Node as Atom
node-version: 12.14.1
- name: Install Dependencies
run: npm install
- name: Build and Commit
Expand All @@ -84,10 +99,3 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ATOM_ACCESS_TOKEN: ${{ secrets.ATOM_ACCESS_TOKEN }}

Skip:
if: contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-latest
steps:
- name: Skip CI 🚫
run: echo skip ci
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ dist

# linter
.parcel-cache
pnpm-lock.yaml
1 change: 1 addition & 0 deletions .terserrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("terser-config-atomic")
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"atomTestRunner": "./spec/custom-runner",
"license": "MIT",
"engines": {
"atom": ">=1.50.0 <2.0.0"
"atom": ">=1.52 <2.0.0",
"electron": ">=6.x"
},
"providedServices": {
"platformioIDETerminal": {
Expand Down Expand Up @@ -76,10 +77,11 @@
"build-commit": "0.1.4",
"cross-env": "7.0.3",
"eslint-config-atomic": "^1.16.2",
"parcel": "^2.0.0-beta.2",
"parcel": "2.0.0-nightly.776",
"prettier-config-atomic": "^2.0.5",
"shx": "0.3.3",
"temp": "^0.9.4",
"terser-config-atomic": "^0.1.1",
"typescript": "^4.3.5"
},
"scripts": {
Expand All @@ -89,11 +91,11 @@
"test.lint": "eslint .",
"test": "atom --test spec",
"integration.test": "npm run build && atom --test ./spec/terminal-spec.js",
"clean": "shx rm -rf dist ~/.parcel-cache",
"clean": "shx rm -rf dist ./.parcel-cache",
"build.tsc": "tsc -p src/tsconfig.json",
"dev": "tsc --watch -p src/tsconfig.json",
"build": "cross-env NODE_ENV=production parcel build --target main ./src/terminal.ts --no-scope-hoist",
"build-commit": "build-commit -o dist",
"build": "cross-env NODE_ENV=production parcel build --target main ./src/terminal.ts",
"build-commit": "npm run clean && build-commit -o dist",
"prepare": "npm run build"
},
"prettier": "prettier-config-atomic",
Expand All @@ -103,15 +105,13 @@
"targets": {
"main": {
"context": "electron-renderer",
"engines": {
"electron": ">=6.x"
},
"includeNodeModules": {
"atom": false,
"electron": false,
"node-pty-prebuilt-multiarch": false
},
"isLibrary": true
"isLibrary": true,
"optimize": true
}
}
}
Loading

0 comments on commit 54b5808

Please sign in to comment.