Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/canary' into defton/cor-14-make-…
Browse files Browse the repository at this point in the history
…defaultgroup-option-a-string
  • Loading branch information
Pckool committed Nov 30, 2022
2 parents 5765e85 + f284c25 commit 1761430
Show file tree
Hide file tree
Showing 306 changed files with 29,680 additions and 8,556 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish-github-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
registry-url: https://npm.pkg.github.com/
- run: yarn publish-stable
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
NODE_AUTH_TOKEN: ${{secrets.NPM_ACCESS_TOKEN}}
15 changes: 15 additions & 0 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
on:
release:
types: [created]
workflow_dispatch:

jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- name: NPM Publish
uses: JS-DevTools/npm-publish@v1
37 changes: 37 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
on:
pull_request:
workflow_dispatch:

jobs:
run_tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- name: Cache node modules
id: cache-npm
uses: actions/cache@v3
env:
cache-name: cache-node-module
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
name: List the state of node modules
continue-on-error: true
run: npm list
- name: Install Dependencies
run: yarn install

- name: Yarn Build
run: yarn build

- name: Test
run: yarn test
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ packages/*.js
__snapshots__
*.tsbuildinfo
*.tgz
*.log
*.log
7 changes: 6 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@

public
*.hbs
node_modules
public
.docusaurus
out
dist
21 changes: 16 additions & 5 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
{
"semi": false,
"singleQuote": true,
"jsxSingleQuote": true,
"tabWidth": 2,
"useTabs": false
"trailingComma": "es5",
"tabWidth": 2,
"semi": false,
"singleQuote": true,
"jsxSingleQuote": true,
"useTabs": true,
"overrides": [
{
"files": ["*.yml", "*.yaml"],
"options": {
"tabWidth": 2,
"useTabs": false
}
}

]
}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

## Getting Started 🚀

- [Documentation](https://plexusjs.org)
- [Official Discord Server](https://discord.gg/m2VmArU6WP)
- [Documentation](https://plexusjs.org)
- [Official Discord Server](https://discord.gg/m2VmArU6WP)

## Sponsors 🫀

Expand All @@ -28,9 +28,9 @@

## Links & Socials 🔗

- [Npm Org](https://www.npmjs.com/org/plexusjs)
- [Official Discord Server](https://discord.gg/m2VmArU6WP)
- [Twitter](https://twitter.com/plexusjs)
- [Npm Org](https://www.npmjs.com/org/plexusjs)
- [Official Discord Server](https://discord.gg/m2VmArU6WP)
- [Twitter](https://twitter.com/plexusjs)

# Core

Expand Down
12 changes: 6 additions & 6 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
presets: [
['@babel/preset-env', { targets: { node: 'current' } }],
'@babel/preset-typescript',
'@babel/preset-env', '@babel/preset-react'
],
};
presets: [
['@babel/preset-env', { targets: { node: 'current' }, loose: false }],
'@babel/preset-typescript',
'@babel/preset-react',
],
}
2 changes: 2 additions & 0 deletions cli/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
core
2 changes: 2 additions & 0 deletions cli/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
src
lib
Empty file added cli/README.md
Empty file.
29 changes: 29 additions & 0 deletions cli/lib/postbuild.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/usr/bin/env node
import chalk from 'chalk'
import yArgs from 'yargs'
import fs from 'fs'
import { execSync } from 'child_process'

const upperScriptTag = '#!/usr/bin/env node'

const path = './out/bin.js'
if (fs.existsSync(path)) {
console.log(chalk.green('Found bin.js file...'))

const binContent = fs.readFileSync(path, 'utf8')

if (binContent.includes(upperScriptTag)) {
console.log(
chalk.green('bin.js file already has the correct script tag...')
)
} else {
console.log(
chalk.yellow('bin.js file does not have the correct script tag...')
)
console.log(chalk.green('Adding script tag to bin.js file...'))
fs.writeFileSync(path, upperScriptTag + '\n' + binContent)
console.log(chalk.green('bin.js file updated!'))
}
} else {
console.log(chalk.red('bin.js file not found...'))
}
Loading

0 comments on commit 1761430

Please sign in to comment.