Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e6d6b01
feat: initiate the links addon with a custom field and install it int…
boazpoolman Aug 15, 2024
b224d71
feat: search all content admin route (wip)
boazpoolman Aug 16, 2024
8063ceb
Merge branch 'master' of github.com:pluginpal/strapi-webtools into fe…
boazpoolman Aug 20, 2024
172c2df
chore: tmp disable webtools
boazpoolman Aug 21, 2024
34ce37c
fix: test deploy
boazpoolman Aug 21, 2024
51c897d
chore: update lock files
boazpoolman Aug 21, 2024
da02b30
fix: don't postinstall playground node_modules
boazpoolman Aug 21, 2024
c64e24c
chore: add playground install to test deploy steps
boazpoolman Aug 21, 2024
c5df65c
Revert "chore: update lock files"
boazpoolman Aug 21, 2024
7241095
chore: update lockfile
boazpoolman Aug 21, 2024
b46bf3c
chore: update lockfile
boazpoolman Aug 21, 2024
9a25066
chore: update lockfile
boazpoolman Aug 21, 2024
f619fc7
chore: update lockfile
boazpoolman Aug 21, 2024
43b42d4
fix: issue in lockfile
boazpoolman Aug 21, 2024
8b6f38a
chore: update lockfile
boazpoolman Aug 21, 2024
cdc20c3
chore: update lockfile
boazpoolman Aug 21, 2024
71afc1d
chore: update lockfile
boazpoolman Aug 21, 2024
aa7d551
chore: update Dockerfile
boazpoolman Aug 21, 2024
37d2090
chore: fix test deploy
boazpoolman Aug 21, 2024
dffa0d3
chore: update lockfile
boazpoolman Aug 21, 2024
ec60bc4
fix: test deploy
boazpoolman Aug 21, 2024
034ec60
chore: use yalc file: instead of yalc link:
boazpoolman Aug 21, 2024
d31583e
chore: don't playground:install in the deploy pipeline
boazpoolman Aug 21, 2024
ea73e2c
fix: test deploy
boazpoolman Aug 21, 2024
7ec9ef5
fix: test deploy
boazpoolman Aug 21, 2024
06223f9
fix: change the default yalc store folder to be inside the playground
boazpoolman Aug 21, 2024
bcc407d
chore: update the yalc store to be in the root of the repo
boazpoolman Aug 21, 2024
d91ed6c
fix: test deploy
boazpoolman Aug 21, 2024
35d7368
chore: temp disable webtools
boazpoolman Aug 21, 2024
89fc53f
chore: temp remove the link field from one of the test content types
boazpoolman Aug 21, 2024
28be067
chore: fix test build
boazpoolman Aug 21, 2024
d21dfde
fix: test deploy
boazpoolman Aug 21, 2024
1fbbfda
chore: add link field to the test content type
boazpoolman Aug 21, 2024
f0ca278
chore: allow for different databses (sqlite local, postres on test se…
boazpoolman Aug 21, 2024
b5b03c4
fix: use yalc --link during development
boazpoolman Sep 1, 2024
2be88d5
chore: update lockfiles
boazpoolman Sep 1, 2024
4307954
fix: strapi/strapi dependency managements
boazpoolman Sep 2, 2024
738e0d2
fix: conflicts
boazpoolman Sep 2, 2024
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
Prev Previous commit
Next Next commit
fix: test deploy
  • Loading branch information
boazpoolman committed Aug 21, 2024
commit 34ce37c1ac1bf88af19cca924e6bcdf5664610da
3 changes: 0 additions & 3 deletions .github/workflows/deploy-test-server.yml
Original file line number Diff line number Diff line change
@@ -43,9 +43,6 @@ jobs:
- name: Build the packages
run: yarn run build

- name: Install de playground dependencies
run: yarn playground:install

- name: Build a Docker image of the playground
run: |
cd playground
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
"eslint:fix": "turbo run eslint:fix",
"release:publish": "turbo run build && changeset publish",
"release:prepare": "changeset version && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install",
"playground:install": "cd playground && yarn dlx yalc add --link @pluginpal/webtools-helper-plugin @pluginpal/webtools-core @pluginpal/webtools-addon-sitemap @pluginpal/webtools-addon-links && yarn install",
"playground:install": "cd playground && yarn dlx yalc add @pluginpal/webtools-helper-plugin @pluginpal/webtools-core @pluginpal/webtools-addon-sitemap @pluginpal/webtools-addon-links && yarn install",
"playground:build": "cd playground && yarn build",
"playground:start": "cd playground && yarn start",
"playground:develop": "rm -rf playground/node_modules/.strapi/ && cd playground && yarn develop --watch-admin --bundler=vite",
2 changes: 1 addition & 1 deletion playground/Dockerfile
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ RUN apk update && apk add --no-cache build-base gcc autoconf automake zlib-dev l
WORKDIR /opt/
COPY ./package.json ./yarn.lock ./

WORKDIR /opt/node_modules/
WORKDIR /opt/.yalc/
COPY ./.yalc ./

WORKDIR /opt/
6 changes: 3 additions & 3 deletions playground/config/plugins.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module.exports = {
webtools: {
enabled: false,
enabled: true,
config: {
website_url: 'https://www.pluginpal.io'
}
},

'webtools-addon-sitemap': {
enabled: false,
enabled: true,
},

'webtools-addon-links': {
enabled: false,
enabled: true,
},

// 'webtools-addon-redirects': {
8 changes: 4 additions & 4 deletions playground/package.json
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@
"strapi": "strapi"
},
"dependencies": {
"@pluginpal/webtools-addon-links": "link:.yalc/@pluginpal/webtools-addon-links",
"@pluginpal/webtools-addon-sitemap": "link:.yalc/@pluginpal/webtools-addon-sitemap",
"@pluginpal/webtools-core": "link:.yalc/@pluginpal/webtools-core",
"@pluginpal/webtools-helper-plugin": "link:.yalc/@pluginpal/webtools-helper-plugin",
"@pluginpal/webtools-addon-links": "file:.yalc/@pluginpal/webtools-addon-links",
"@pluginpal/webtools-addon-sitemap": "file:.yalc/@pluginpal/webtools-addon-sitemap",
"@pluginpal/webtools-core": "file:.yalc/@pluginpal/webtools-core",
"@pluginpal/webtools-helper-plugin": "file:.yalc/@pluginpal/webtools-helper-plugin",
"@strapi/plugin-i18n": "^4.25.8",
"@strapi/plugin-users-permissions": "^4.25.8",
"@strapi/strapi": "^4.25.8",
433 changes: 406 additions & 27 deletions playground/yarn.lock

Large diffs are not rendered by default.