Skip to content

Commit

Permalink
more migration
Browse files Browse the repository at this point in the history
  • Loading branch information
alexprudhomme committed Oct 15, 2024
1 parent deb9ff5 commit 7ca7c02
Show file tree
Hide file tree
Showing 15 changed files with 1,196 additions and 661 deletions.
2 changes: 1 addition & 1 deletion .github/actions/e2e-atomic-csp/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
- name: Complementary setup
run: |
pnpm i
pnpm run build --filter @coveo/atomic
pnpm --filter @coveo/atomic run build
shell: bash
- name: Run tests
# TODO KIT-3105
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/e2e-atomic-insight-panel/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
browser: chrome
command-prefix: 'pnpm --filter @coveo/atomic exec cypress-repeat run -n 3 --until-passes --rerun-failed-only --'
config-file: cypress-insight-panel.config.mjs
start: pnpm run start --filter @coveo/atomic
start: pnpm --filter @coveo/atomic run start
wait-on: 'http://localhost:3333/ping'
wait-on-timeout: 600000
install: false
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/e2e-atomic-screenshots/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:
browser: chrome
command-prefix: 'pnpm --filter @coveo/atomic exec cypress-repeat run -n 3 --until-passes --rerun-failed-only --'
config-file: cypress-screenshots.config.mjs
start: pnpm run start --filter @coveo/atomic
start: pnpm --filter @coveo/atomic run start
wait-on: 'http://localhost:3333/ping'
wait-on-timeout: 600000
install: false
Expand Down
5 changes: 3 additions & 2 deletions .github/actions/e2e-atomic/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ runs:
name: Run Cypress
with:
browser: chrome
command-prefix: 'pnpm exec cypress-repeat --filter @coveo/atomic run -n 3 --until-passes --rerun-failed-only --'
command-prefix: 'pnpm exec cypress-repeat run -n 3 --until-passes --rerun-failed-only --'
working-directory: packages/atomic
spec: ${{ inputs.spec }}
start: pnpm start --filter @coveo/atomic
start: pnpm --filter @coveo/atomic start
wait-on: 'http://localhost:3333/ping'
wait-on-timeout: 600000
install: false
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/e2e-headless-ssr-pages-prod/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:
name: Run Cypress
with:
browser: chrome
command-prefix: 'pnpm --filter @coveo/headless-ssr-samples-pages-ro run e2e'
command-prefix: 'pnpm --filter @coveo/headless-ssr-samples-pages-router run e2e'
start: pnpm nx run headless-ssr-samples-pages-router:prod
wait-on: 'http://localhost:3000'
wait-on-timeout: 600000
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/playwright-atomic-hosted-pages/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
working-directory: packages/atomic-hosted-page
shell: bash
- name: Run Playwright tests
run: pnpm dlx playwright test
run: pnpm playwright test
working-directory: packages/atomic-hosted-page
shell: bash
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ runs:
working-directory: packages/samples/headless-commerce-react
shell: bash
- name: Run Playwright tests
run: pnpm dlx playwright test
run: pnpm playwright test
working-directory: packages/samples/headless-commerce-react
shell: bash
14 changes: 0 additions & 14 deletions .github/actions/setup-pnpm/action.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/prbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
with:
node-version-file: '.nvmrc'
- run: enable corepack
- run: pnpm i
- uses: ./.github/actions/setup
- run: pnpm run pr:report
build:
name: 'Build'
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"@cspell/eslint-plugin": "8.12.1",
"@nx/js": "19.5.3",
"@nx/storybook": "19.5.3",
"@nx/vite": "19.5.3",
"@nx/web": "19.5.3",
"@octokit/rest": "20.1.1",
"@rollup/plugin-typescript": "11.1.6",
Expand Down Expand Up @@ -127,7 +126,7 @@
"@stencil/react-output-target@0.5.3": "patches/@stencil__react-output-target@0.5.3.patch",
"@storybook/blocks@8.1.11": "patches/@storybook__blocks@8.1.11.patch",
"@storybook/web-components@8.1.11": "patches/@storybook__web-components@8.1.11.patch",
"coveo.analytics@2.30.38": "patches/coveo.analytics@2.30.38.patch",
"coveo.analytics@2.30.39": "patches/coveo.analytics@2.30.39.patch",
"eslint-plugin-canonical@4.18.0": "patches/eslint-plugin-canonical@4.18.0.patch",
"tailwindcss@3.4.7": "patches/tailwindcss@3.4.7.patch"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This is the same js file as what we load inside the LWC via a static resource.
import {transformMarkdownToHtml} from 'c/quanticUtils';
import {marked} from '../../../../../../node_modules/marked/lib/marked.cjs';
import {marked} from '../../../../../../../../node_modules/marked/lib/marked.cjs';

const removeLineBreaks = (text) => text.replace(/\n/g, '');

Expand Down
6 changes: 3 additions & 3 deletions packages/quantic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"lint:fix:apex": "prettier \"force-app/{,**}/*.{cls,trigger}\" --write",
"build:staticresources": "node copy-static-resources.js",
"build": "nx build",
"dev": "pnpm exec rimraf .localdevserver && pnpm run build:staticresources && pnpm run dev:sfdx",
"dev": "pnpm rimraf .localdevserver && pnpm run build:staticresources && pnpm run dev:sfdx",
"dev:sfdx": "sf project deploy start --source-dir force-app/main && sfdx force:lightning:lwc:start --port 3334",
"test:unit": "lwc-jest",
"test:unit:debug": "lwc-jest --debug",
Expand All @@ -36,8 +36,8 @@
"prebuild:doc": "mkdirp docs/out",
"build:doc": "jsdoc -c jsdoc-config.json",
"publish:sfdx": "../../node_modules/.bin/ts-node scripts/build/create-package.ts --remove-translations",
"promote:sfdx": "pnp run publish:sfdx -- --promote",
"promote:sfdx:ci": "pnp run publish:sfdx -- --promote --ci",
"promote:sfdx": "pnpm run publish:sfdx -- --promote",
"promote:sfdx:ci": "pnpm run publish:sfdx -- --promote --ci",
"publish:npm": "pnpm --filter @coveo/release run npm-publish",
"publish:bump": "pnpm --filter @coveo/release run bump",
"promote:npm:latest": "node ../../scripts/deploy/update-npm-tag.mjs latest",
Expand Down
File renamed without changes.
Loading

0 comments on commit 7ca7c02

Please sign in to comment.