Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Konnorrogers/add light diff #23

Merged
merged 14 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
cache: "pnpm"
cache-dependency-path: |
pnpm-lock.yaml
docs/pnpm-lock.yaml

- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
ruby-version: "3.0"
rubygems: latest
bundler-cache: true

Expand All @@ -62,7 +62,6 @@ jobs:
- name: Set base_url
run: echo "BASE_URL=$URL/$BASE_PATH" >> $GITHUB_ENV


- name: Build website
run: |
pnpm run setup
Expand Down
30 changes: 14 additions & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,17 @@ jobs:
node-version: [18]
steps:
- uses: actions/checkout@v3
# - uses: pnpm/action-setup@v2
# with:
# version: 8
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v3
# with:
# node-version: ${{ matrix.node-version }}
# cache: 'pnpm'
# - name: Install dependencies
# run: pnpm install
# - name: Install dependencies
# run: pnpm install
# - name: Install Playwright Browsers
# run: pnpm exec playwright install --with-deps
# - name: Run Playwright tests
# run: pnpm run verify
- uses: pnpm/action-setup@v2
with:
version: 8
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"
- name: Install dependencies
run: pnpm install
- name: Install Playwright Browsers
run: pnpm exec playwright install --with-deps
- name: Run Playwright tests
run: pnpm run verify
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,6 @@ dist

exports/**/*.d.ts
internal/**/*.d.ts
!exports/**/*-types.d.ts
!exports/**/*-globals.d.ts
!internal/**/*-types.d.ts
!internal/**/*-globals.d.ts

/custom-elements.json
/_site
Expand Down
8 changes: 8 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
scripts/
docs/output/
docs/bridgetown/
docs/src/bridgetown/static
docs/.bridgetown-cache
*.hbs
tests/fixtures/
*.yaml
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
## Next

- BREAKING_CHANGE: All components are now scoped under `exports/components/<component-name>/<component-name>.js`

## v3.1.2 - 07/18/2024

- Bug Fix(light-code): `wrap="none"` properly renamed to `wrap="hard"` [#22](https://github.com/KonnorRogers/light-pen/pull/22)
- Bug Fix(light-code): Fixes wrapping in light-editor, and adjusts the `wrap` values to align with `<light-pen>` [#22](https://github.com/KonnorRogers/light-pen/pull/22)
- Bug Fix(light-code) Line highlights now work properly when using `wrap="hard"` [#22](https://github.com/KonnorRogers/light-pen/pull/22)
- Bug Fix(light-code): Added cursor syncing due to line numbers obstructing view of text [#22](https://github.com/KonnorRogers/light-pen/pull/22)


## v3.1.1 - 06/01/2024

- Bug Fix(light-code): Fixed a bug that caused LineNumberPlugin to run before the Prism `afterTokenize` hooks.
Expand Down Expand Up @@ -69,7 +72,6 @@ Bug Fix: `<light-preview>` now correctly passes the `wrap` property down to `<li
- Improvement: `<light-editor>`, `<light-code>`, and `<light-preview>` all use `<light-code>` internally now.
- Improvement: Use declarative shadow DOM and fallback to polyfill in `<light-preview>`


## v2.3.1 - 02/13/2024

- Update form associated package
Expand Down Expand Up @@ -107,7 +109,7 @@ Bug Fix: `<light-preview>` now correctly passes the `wrap` property down to `<li
## v1.1.2

- Don't use `src` or `srcdoc`, return to using `iframe.contentWindow.writeln(content)` due to fixing
some CORS bugs.
some CORS bugs.

## v1.1.0

Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ npm install light-pen
import "light-pen"

// Registry yourself
import LightPen "light-pen/exports/light-pen.js"
import LightPen "light-pen/exports/components/light-pen/light-pen.js"

LightPen.define() // Registers `<light-pen>`

// Register under another name
import LightPen "light-pen/exports/light-pen.js"
import LightPen "light-pen/exports/components/light-pen/light-pen.js"
LightPen.define("other-name")
```

Expand All @@ -40,7 +40,6 @@ LightPen.define("other-name")

That's it!


### Slotting in HTML / CSS / JS

```html
Expand Down Expand Up @@ -93,4 +92,4 @@ More to come for more docs coming on how to change things!
- [ ] - Add vertical resizing of `<textarea>`
- [ ] - More documentation around customization.
- [ ] - Add a console logger
>>>>>>> 7b592c8f5f05ed82d439d7950450eec06dc3ab66
> > > > > > > 7b592c8f5f05ed82d439d7950450eec06dc3ab66
12 changes: 8 additions & 4 deletions custom-elements-manifest.config.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
// @ts-check
// import { expandTypesPlugin } from './expand-types.js'

const globs = ['exports/**/*.{d.ts,js}', 'internal/**/*.{d.ts,js}', 'types/**/*.d.ts']
const globs = [
"exports/**/*.{d.ts,js}",
"internal/**/*.{d.ts,js}",
"types/**/*.d.ts",
];

export default {
/** Globs to analyze */
globs,
/** Globs to exclude */
exclude: ['node_modules', 'docs'],
exclude: ["node_modules", "docs"],
/** Directory to output CEM to */
outdir: '.',
outdir: ".",
/** Run in dev mode, provides extra logging */
dev: process.argv.includes("--verbose"),
/** Run in watch mode, runs on file changes */
Expand Down Expand Up @@ -41,4 +45,4 @@ export default {
// /** You can now pass the typeChecker to your plugins */
// expandTypesPlugin({ globs })
// ],
}
};
14 changes: 7 additions & 7 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ GEM
zeitwerk (~> 2.6)
e2mmap (0.1.0)
erubi (1.13.0)
faraday (2.10.0)
faraday (2.10.1)
faraday-net_http (>= 2.0, < 3.2)
logger
faraday-follow_redirects (0.3.0)
faraday (>= 1, < 3)
faraday-net_http (3.1.0)
faraday-net_http (3.1.1)
net-http
ffi (1.16.2)
hash_with_dot_access (1.2.0)
Expand Down Expand Up @@ -149,20 +149,20 @@ GEM
net-http (0.4.1)
uri
nio4r (2.7.3)
nokogiri (1.16.6-arm64-darwin)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
parallel (1.25.1)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
psych (5.1.2)
stringio
public_suffix (6.0.0)
public_suffix (6.0.1)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.8.0)
racc (1.8.1)
rack (3.1.7)
rack-cors (2.0.2)
rack (>= 2.0.0)
Expand Down Expand Up @@ -227,7 +227,7 @@ GEM
unicode-display_width (2.5.0)
uri (0.13.0)
yard (0.9.36)
zeitwerk (2.6.16)
zeitwerk (2.6.17)

PLATFORMS
arm64-darwin-21
Expand Down
1 change: 1 addition & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Welcome to your new Bridgetown website! You can update this README file to provi
cd bridgetown-site-folder
bundle install && yarn install
```

> Learn more: [Bridgetown Getting Started Documentation](https://www.bridgetownrb.com/docs/).

## Development
Expand Down
Loading
Loading