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

Convert to a V2 addon #1246

Open
wants to merge 91 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
1df121f
refactor: add v2 addon blueprint output
abeforgit Jan 23, 2025
a3d9c95
refactor: make v2 addon build
abeforgit Jan 23, 2025
1020650
refactor: add devdeps to test app
abeforgit Jan 23, 2025
0bf1331
WIP: add all app code to test-app
abeforgit Jan 23, 2025
2afb31a
WIP: add all addon deps
abeforgit Jan 23, 2025
dd721c5
WIP: add all addon files
abeforgit Jan 23, 2025
6ffbbb0
WIP: replace @lblod/ember-rdfa-editor with #root
abeforgit Jan 23, 2025
11edc59
v2: make it build by adjusting all the imports
abeforgit Jan 23, 2025
cd46fb3
v2: make basic imports work in the test-app
abeforgit Jan 23, 2025
129c6ad
refactor(v2)!: make graphy work, fix some app build errors
abeforgit Jan 23, 2025
aa193d0
fix(v2): make sure all type imports are really type imports
abeforgit Jan 23, 2025
08c5b4c
fix(v2): rename test-app in relevant files
abeforgit Jan 24, 2025
f4e4cb2
fix(v2): fix some more imports to make it run
abeforgit Jan 24, 2025
f983480
fix(v2): add styling
abeforgit Jan 24, 2025
bbdac40
fix(v2): use explicit reexports in index file
abeforgit Jan 25, 2025
fc569fb
fix(v2): resolve rollup import warnings
abeforgit Jan 25, 2025
bc0c5ed
fix(v2): avoid and disallow imports from src/index.ts
abeforgit Jan 25, 2025
2462625
fix(v2): resolve some circular deps
abeforgit Jan 25, 2025
3a756e2
fix(v2): resolve another circular dep
abeforgit Jan 25, 2025
aba68bc
fix(v2): resolve some more circular deps
abeforgit Jan 25, 2025
a4392a7
fix(v2): more circular deps
abeforgit Jan 26, 2025
66bbb8a
fix(v2): circular deps
abeforgit Jan 26, 2025
be01eba
fix(v2): circular deps
abeforgit Jan 26, 2025
80633ee
fix(v2): circular deps
abeforgit Jan 26, 2025
3cbd102
fix(v2): fix final circ dep and make build error on circ deps
abeforgit Jan 26, 2025
c7b2c9c
fix(v2): remove unused imports
abeforgit Jan 26, 2025
39e9788
fix(v2): add types to type imports
abeforgit Jan 26, 2025
6ae9917
fix(v2): add missing ember-intl peerdep
abeforgit Jan 26, 2025
2d8e411
refactor: remove commented out code
abeforgit Jan 26, 2025
3b77ffb
fix(v2): add type imports
abeforgit Jan 26, 2025
0810334
refactor: remove blueprints
abeforgit Jan 26, 2025
f8d1bd2
refactor: move v2 addon into toplevel
abeforgit Jan 26, 2025
cf46175
fix(v2): remove unecessary commonjs plugin
abeforgit Jan 26, 2025
6edcbaa
fix(v2): make tests run properly
abeforgit Jan 26, 2025
bb6140e
fix(v2): enable sourcemaps
abeforgit Jan 26, 2025
13fa717
fix(v2): explicitly add type import
abeforgit Jan 26, 2025
24bdc20
fix(v2): fix html parser
abeforgit Jan 26, 2025
ca97155
fix(lint): run lint:fix
abeforgit Jan 26, 2025
011844c
fix(formatting): run prettier
abeforgit Jan 26, 2025
489749f
fix(v2): downgrade typescript-eslint to make eslint work again
abeforgit Jan 26, 2025
900ff7b
fix(v2): fix some linting errors
abeforgit Jan 26, 2025
9c98860
fix(lint): fix all non-template lint errors
abeforgit Jan 26, 2025
9d3b4f7
refactor(v2): remove editor-v2 dir
abeforgit Jan 27, 2025
c0a2e8c
fix(v2) remove duplicate hacks folder
abeforgit Jan 27, 2025
b60cd7c
fix(v2): move translation files
abeforgit Jan 27, 2025
899c51b
fix(v2): convert last linter errors to todos
abeforgit Jan 28, 2025
fc2daf8
fix(v2): make the importing typescript aware of where to look
abeforgit Jan 28, 2025
d6475fc
fix(types): fix some test-app type errors
abeforgit Jan 28, 2025
dabf6bc
fix(types): fix some more types
abeforgit Jan 28, 2025
8178c96
fix(v2): change typechecking of test-app to glint
abeforgit Jan 28, 2025
291a471
fix(v2): fix final linting errors
abeforgit Jan 28, 2025
bf43a47
fix(v2): make the ember source patch work again
abeforgit Jan 28, 2025
c50daba
fix(v2): add back the pm devtools
abeforgit Jan 28, 2025
ac6bb6d
fix(v2): add back the changesets cli
abeforgit Jan 28, 2025
0182b08
fix(docker): make docker build work again
abeforgit Jan 28, 2025
4da3079
fix(ci): update CI files and move to node 22
abeforgit Jan 28, 2025
047fd7f
Merge branch 'master' into internal/v2-addon
abeforgit Jan 28, 2025
734b38c
fix(ci): run the correct scripts
abeforgit Jan 28, 2025
4964192
fix(ci): re-enable e2e tests
abeforgit Jan 28, 2025
8cec9c3
fix(ci): build addon before testing
abeforgit Jan 28, 2025
04cc5ff
fix(v2): use the filter correctly in the install scripts
abeforgit Jan 28, 2025
17fcb9e
fix(ci): remove redundant build step
abeforgit Jan 28, 2025
7070527
fix(ci): pin pnpm to 10.0.0
abeforgit Jan 28, 2025
2473b81
feat(lint): add prettier command and run it
abeforgit Jan 28, 2025
945a277
fix(test): resolve e2e test imports
abeforgit Jan 28, 2025
4b18774
fix(ci): update playwright docker image
abeforgit Jan 28, 2025
64d38da
fix(ci): pin dockerfile pnpm version
abeforgit Jan 28, 2025
f1c5991
fix(ci): move playwright config file
abeforgit Jan 28, 2025
7e5dbe7
fix(ci): fix release-commit script to use pnpm
abeforgit Jan 28, 2025
391070d
feat(ci): optimize the verification a bit
abeforgit Jan 29, 2025
a89d104
feat(ci): optimize docker build and e2e tests a bit
abeforgit Jan 29, 2025
758b07e
feat(ci): move token setting into woodpecker step
abeforgit Jan 29, 2025
4dd639a
Merge branch 'master' into internal/v2-addon
abeforgit Feb 3, 2025
43d5fbe
fix(ci): route commands to appropriate package
abeforgit Feb 3, 2025
ec6ede8
WIP: try to fix the peerdeps
abeforgit Feb 3, 2025
e821b83
fix(build): make embroider build work
abeforgit Feb 4, 2025
adaf871
fix(ci): get e2e test working
abeforgit Feb 4, 2025
4050198
fix(lint): run prettier
abeforgit Feb 4, 2025
c30ff7c
fix(ci): fix lint step
abeforgit Feb 4, 2025
8140d8e
fix(build): patch embroider so it correctly passes rollup options
abeforgit Feb 6, 2025
4433309
fix(build): make a rollup plugin to bundle graphy
abeforgit Feb 6, 2025
291937c
fix(test-app): remove the unnecessary webpack configs
abeforgit Feb 6, 2025
2462463
fix(lint): remove unneeded eslint comment
abeforgit Feb 6, 2025
1a973bf
fix(ci): repair release-commit pipeline
abeforgit Feb 6, 2025
d44567c
refactor(build): pin the embroider patch
abeforgit Feb 6, 2025
9d07b37
refactor(dx): add some convenience scripts
abeforgit Feb 6, 2025
6dfa56e
fix(build): widen powerselect peerdep
abeforgit Feb 6, 2025
52a8311
fix(compat): export sass files as well
abeforgit Feb 6, 2025
325987b
fix(build): silence the sass deprecations
abeforgit Feb 6, 2025
3641be5
fix(styles): modify sass output to support classic way of importing
abeforgit Feb 7, 2025
5e3a4ae
fix(sass): move to use instead of import
abeforgit Feb 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .changeset/nine-chicken-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@lblod/ember-rdfa-editor': major
'test-app': major
---

Convert to a v2 addon
95 changes: 0 additions & 95 deletions .eslintrc.js

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/dist/
/declarations/
/tmp/
vendor/

# dependencies
/bower_components/
Expand Down
24 changes: 24 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
####################
# super strict mode
####################
auto-install-peers=false
strict-peer-dependents=true
resolve-peers-from-workspace-root=false

################
# Optimizations
################
# Less strict, but required for tooling to not barf on duplicate peer trees when using ember-try.
# (many libraries declare the same peers, which resolve to the same
# versions)
dedupe-peer-dependents=true
public-hoist-pattern[]=ember-source

################
# Compatibility
################
# highest is what everyone is used to, but
# not ensuring folks are actually compatible with declared ranges.
resolution-mode=highest
dedupe-injected-deps=true
dedupe-direct-deps=true
File renamed without changes.
4 changes: 2 additions & 2 deletions .woodpecker/.changeset.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
steps:
changeset:
image: danlynn/ember-cli:4.12.1
image: danlynn/ember-cli:6.1.0
commands:
- git fetch origin master
- git diff -wb --name-only origin/master..HEAD | grep "\.changeset/.*\.md"
when:
- evaluate: 'CI_PIPELINE_EVENT == "pull_request" && not (CI_COMMIT_PULL_REQUEST_LABELS contains "dependabot")'
- evaluate: 'CI_PIPELINE_EVENT == "pull_request" && not (CI_COMMIT_PULL_REQUEST_LABELS contains "dependabot")'
7 changes: 4 additions & 3 deletions .woodpecker/.e2e.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
steps:
e2e:
# this image must be the same as in `scripts/e2e.sh`
image: mcr.microsoft.com/playwright:v1.45.0-jammy
image: mcr.microsoft.com/playwright:v1.50.0-jammy
commands:
- corepack enable
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
- npm i -g [email protected]
- pnpm i --frozen-lockfile
- pnpm e2e:run
- pnpm build
- pnpm i -f
- pnpm --filter test-app e2e:run
# Ideally we would also run the visual regression tests, but we need to fix the update process
# for them first
# - pnpm playwright test
Expand Down
26 changes: 13 additions & 13 deletions .woodpecker/.release-commit.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
steps:
install:
image: node:20-slim
version:
image: node:22-slim
directory: packages/ember-rdfa-editor
commands:
- npm version --no-git-tag-version $(npm pkg get version | sed 's/"//g')-dev.${CI_COMMIT_SHA}
publish:
image: node:22-slim
commands:
- corepack enable
- npm config set ignore-scripts true
- cat .npmrc
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
- npm i -g [email protected]
- pnpm config --location project set '//registry.npmjs.org/:_authToken' $NPM_ACCESS_TOKEN
- pnpm i --frozen-lockfile
version:
image: node:20-slim
commands:
- npm version --no-git-tag-version $(npm pkg get version | sed 's/"//g')-dev.${CI_COMMIT_SHA}
release:
image: plugins/npm
settings:
token:
from_secret: npm_access_token
tag: dev
- pnpm build
- pnpm publish packages/ember-rdfa-editor --access public --tag next --no-git-checks
secrets: [npm_access_token]
when:
- event: push
2 changes: 1 addition & 1 deletion .woodpecker/.release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
steps:
install:
image: node:20-slim
image: node:22-slim
commands:
- corepack enable
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
Expand Down
3 changes: 1 addition & 2 deletions .woodpecker/.test-compat-4.12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ steps:
test-compat:
image: danlynn/ember-cli:5.12.0-node_20.18
commands:
- corepack enable
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
- npm i -g [email protected]
- pnpm i --frozen-lockfile
- pnpm exec ember try:one ember-lts-4.12 --skip-cleanup=true
- pnpm --filter test-app exec ember try:one ember-lts-4.12 --skip-cleanup=true
when:
event:
- pull_request
3 changes: 1 addition & 2 deletions .woodpecker/.test-compat-embroider-optimized.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ steps:
test-compat:
image: danlynn/ember-cli:5.12.0-node_20.18
commands:
- corepack enable
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
- npm i -g [email protected]
- pnpm i --frozen-lockfile
- pnpm exec ember try:one embroider-optimized --skip-cleanup=true
- pnpm --filter test-app exec ember try:one embroider-optimized --skip-cleanup=true
when:
event:
- pull_request
3 changes: 1 addition & 2 deletions .woodpecker/.test-compat-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ steps:
test-compat:
image: danlynn/ember-cli:5.12.0-node_20.18
commands:
- corepack enable
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
- npm i -g [email protected]
- pnpm i --frozen-lockfile
- pnpm exec ember try:one ember-release --skip-cleanup=true
- pnpm --filter test-app exec ember try:one ember-release --skip-cleanup=true
when:
event:
- pull_request
28 changes: 12 additions & 16 deletions .woodpecker/.verify-pr.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
steps:
install:
image: node:20-slim
image: node:22-slim
commands:
- corepack enable
- npm config set ignore-scripts true
# pinning to 10.0.0 because of https://github.com/nodejs/corepack/issues/612
# corepack use also runs an install
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
- npm i -g [email protected]
- corepack enable
- pnpm i --frozen-lockfile
- pnpm build
# resync injected addon build
- pnpm i -f
lint:
image: node:20-slim
image: node:22-slim
group: lint
commands:
- corepack enable
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
- npm i -g [email protected]
- pnpm lint
test:
image: danlynn/ember-cli:5.12.0-node_20.18
commands:
- corepack enable
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
- npm i -g [email protected]
- pnpm test:ember
prepack:
image: node:20-slim
image: danlynn/ember-cli:6.1.0
group: lint
commands:
- corepack enable
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
- npm i -g [email protected]
- pnpm prepack
- pnpm test
when:
event:
- pull_request
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM node:20-slim AS builder
FROM node:22-slim AS builder

LABEL maintainer="[email protected]"

RUN corepack enable
# installing the latest corepack manually because of https://github.com/nodejs/corepack/issues/612
RUN npm i -g [email protected]
WORKDIR /app
COPY package.json pnpm-lock.yaml ./
COPY patches ./patches/
COPY public ./public/
RUN pnpm i --frozen-lockfile
COPY . .
RUN npm config set ignore-scripts true
RUN corepack enable
RUN corepack use [email protected]
RUN pnpm build
RUN pnpm build:test-app

FROM semtech/static-file-service:0.2.0
COPY --from=builder /app/dist /data
COPY --from=builder /app/test-app/dist /data
7 changes: 0 additions & 7 deletions addon/commands/_private/rdfa-commands/index.ts

This file was deleted.

18 changes: 0 additions & 18 deletions addon/commands/index.ts

This file was deleted.

21 changes: 0 additions & 21 deletions addon/components/au-native-toggle.hbs

This file was deleted.

3 changes: 0 additions & 3 deletions addon/components/editor.hbs

This file was deleted.

9 changes: 0 additions & 9 deletions addon/components/plugins/formatting/formatting-toggle.hbs

This file was deleted.

Loading