diff --git a/framework/core/.gitattributes b/framework/core/.gitattributes index ca0f40972..b9a08e27d 100644 --- a/framework/core/.gitattributes +++ b/framework/core/.gitattributes @@ -14,5 +14,6 @@ js/dist/* -diff js/dist/* linguist-generated js/dist-typings/* linguist-generated js/yarn.lock -diff +js/package-lock.json -diff * text=auto eol=lf diff --git a/framework/core/.github/workflows/backend.yml b/framework/core/.github/workflows/backend.yml index 8c4082b3f..be6cea247 100644 --- a/framework/core/.github/workflows/backend.yml +++ b/framework/core/.github/workflows/backend.yml @@ -12,4 +12,4 @@ jobs: with: enable_backend_testing: true - backend_directory: . \ No newline at end of file + backend_directory: . diff --git a/framework/core/.github/workflows/frontend.yml b/framework/core/.github/workflows/frontend.yml index b2c8373c4..e12159f2d 100644 --- a/framework/core/.github/workflows/frontend.yml +++ b/framework/core/.github/workflows/frontend.yml @@ -15,7 +15,9 @@ jobs: enable_typescript: true frontend_directory: ./js + backend_directory: . + js_package_manager: yarn main_git_branch: master secrets: - bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }} \ No newline at end of file + bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }} diff --git a/framework/core/js/package.json b/framework/core/js/package.json index 50eb67fd1..872644beb 100644 --- a/framework/core/js/package.json +++ b/framework/core/js/package.json @@ -39,13 +39,14 @@ "scripts": { "dev": "webpack --mode development --watch", "build": "webpack --mode production", - "analyze": "cross-env ANALYZER=true yarn build", + "analyze": "cross-env ANALYZER=true yarn run build", "format": "prettier --write src", "format-check": "prettier --check src", "clean-typings": "npx rimraf dist-typings && mkdir dist-typings", - "build-typings": "npm run clean-typings && tsc && [ -e src/@types ] && cp -r src/@types dist-typings/@types", + "build-typings": "yarn run clean-typings && tsc && [ -e src/@types ] && cp -r src/@types dist-typings/@types", "check-typings": "tsc --noEmit --emitDeclarationOnly false", - "check-typings-coverage": "typescript-coverage-report" + "check-typings-coverage": "typescript-coverage-report", + "ci": "yarn install --immutable --immutable-cache" }, "packageManager": "yarn@3.1.1" } diff --git a/framework/core/tests/phpunit.integration.xml b/framework/core/tests/phpunit.integration.xml index 23afc237d..90fbbff37 100644 --- a/framework/core/tests/phpunit.integration.xml +++ b/framework/core/tests/phpunit.integration.xml @@ -19,6 +19,7 @@ ./integration + ./integration/tmp