chore: using pnpm (#2120)
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
"ghcr.io/devcontainers/features/rust:1": {}
|
||||
},
|
||||
"waitFor": "onCreateCommand",
|
||||
"updateContentCommand": "yarn",
|
||||
"updateContentCommand": "pnpm install",
|
||||
"forwardPorts": [3300, 9229],
|
||||
"customizations": {
|
||||
"codespaces": {
|
||||
|
||||
87
.github/workflows/ci.yml
vendored
87
.github/workflows/ci.yml
vendored
@@ -63,20 +63,24 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16.x
|
||||
cache: 'yarn'
|
||||
cache: 'pnpm'
|
||||
registry-url: https://registry.npmjs.org/
|
||||
|
||||
- run: corepack enable
|
||||
|
||||
- name: Install NPM Dependencies
|
||||
run: yarn install --immutable --network-timeout 300000
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
- name: Build Package
|
||||
run: yarn tsm scripts/index.ts --tsc --build --cli --api --set-dist-tag="${{ github.event.inputs.disttag }}"
|
||||
run: pnpm tsm scripts/index.ts --tsc --build --cli --api --set-dist-tag="${{ github.event.inputs.disttag }}"
|
||||
|
||||
- name: Print Package Dist Build
|
||||
run: tree packages/qwik/dist/
|
||||
@@ -99,7 +103,7 @@ jobs:
|
||||
if-no-files-found: error
|
||||
|
||||
- name: Build Eslint rules
|
||||
run: yarn tsm scripts/index.ts --eslint
|
||||
run: pnpm tsm scripts/index.ts --eslint
|
||||
|
||||
- name: Print Eslint rules Dist Build
|
||||
run: tree packages/eslint-plugin-qwik/dist/
|
||||
@@ -126,12 +130,15 @@ jobs:
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7
|
||||
- name: Setup Node
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16.x
|
||||
cache: 'yarn'
|
||||
cache: 'pnpm'
|
||||
registry-url: https://registry.npmjs.org/
|
||||
|
||||
- if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
@@ -164,11 +171,15 @@ jobs:
|
||||
|
||||
- name: Install NPM Dependencies
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
run: yarn install --immutable --network-timeout 300000
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
- uses: jetli/wasm-pack-action@v0.3.0
|
||||
with:
|
||||
version: 'v0.10.3'
|
||||
|
||||
- name: Build WASM
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
run: yarn tsm scripts/index.ts --wasm --set-dist-tag="${{ github.event.inputs.disttag }}"
|
||||
run: pnpm tsm scripts/index.ts --wasm --set-dist-tag="${{ github.event.inputs.disttag }}"
|
||||
|
||||
- name: Print WASM Dist Build
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
@@ -189,18 +200,18 @@ jobs:
|
||||
settings:
|
||||
- host: macos-latest
|
||||
target: x86_64-apple-darwin
|
||||
build: yarn tsm scripts/index.ts --platform-binding
|
||||
build: pnpm tsm scripts/index.ts --platform-binding
|
||||
|
||||
- host: macos-latest
|
||||
target: aarch64-apple-darwin
|
||||
build: |
|
||||
export SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path)
|
||||
export MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version)
|
||||
yarn tsm scripts/index.ts --platform-binding --platform-target=aarch64-apple-darwin
|
||||
pnpm tsm scripts/index.ts --platform-binding --platform-target=aarch64-apple-darwin
|
||||
|
||||
- host: windows-latest
|
||||
target: x86_64-pc-windows-msvc
|
||||
build: yarn tsm scripts/index.ts --platform-binding
|
||||
build: pnpm tsm scripts/index.ts --platform-binding
|
||||
|
||||
name: Build ${{ matrix.settings.target }}
|
||||
runs-on: ${{ matrix.settings.host }}
|
||||
@@ -212,12 +223,16 @@ jobs:
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7
|
||||
|
||||
- name: Setup Node
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16.x
|
||||
cache: 'yarn'
|
||||
cache: 'pnpm'
|
||||
registry-url: https://registry.npmjs.org/
|
||||
|
||||
- if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
@@ -264,7 +279,7 @@ jobs:
|
||||
|
||||
- name: Install NPM Dependencies
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
run: yarn install --immutable --network-timeout 300000
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
- name: Build Platform Binding
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
@@ -345,11 +360,15 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16.x
|
||||
cache: 'yarn'
|
||||
cache: 'pnpm'
|
||||
registry-url: https://registry.npmjs.org/
|
||||
|
||||
- run: corepack enable
|
||||
@@ -373,18 +392,18 @@ jobs:
|
||||
mv dist-dev-eslint-plugin-qwik/* packages/eslint-plugin-qwik/dist/
|
||||
|
||||
- name: Install NPM Dependencies
|
||||
run: yarn install --immutable --network-timeout 300000
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
- name: Dry-Run Publish @builder.io/qwik
|
||||
if: ${{ github.event_name != 'workflow_dispatch' }}
|
||||
run: yarn tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release --dry-run
|
||||
run: pnpm tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release --dry-run
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||
|
||||
- name: Publish @builder.io/qwik
|
||||
if: ${{ github.event_name == 'workflow_dispatch' }}
|
||||
run: yarn tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release
|
||||
run: pnpm tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||
@@ -393,7 +412,7 @@ jobs:
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' && github.event_name == 'push' }}
|
||||
env:
|
||||
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
|
||||
run: yarn run qwik-save-artifacts
|
||||
run: pnpm run qwik-save-artifacts
|
||||
|
||||
############ E2E TEST ############
|
||||
test-e2e:
|
||||
@@ -419,12 +438,16 @@ jobs:
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7
|
||||
|
||||
- name: Setup Node ${{ matrix.settings.node }}
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: ${{ matrix.settings.node }}
|
||||
cache: 'yarn'
|
||||
cache: 'pnpm'
|
||||
registry-url: https://registry.npmjs.org/
|
||||
|
||||
- if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
@@ -447,7 +470,7 @@ jobs:
|
||||
|
||||
- name: Install NPM Dependencies
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
run: yarn install --immutable --network-timeout 300000
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
- name: Install Playwright
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
@@ -455,11 +478,11 @@ jobs:
|
||||
|
||||
- name: Playwright E2E Tests
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
run: yarn run test.e2e.${{ matrix.settings.browser }}
|
||||
run: pnpm run test.e2e.${{ matrix.settings.browser }}
|
||||
|
||||
- name: Validate Create Qwik Cli
|
||||
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
|
||||
run: yarn cli.validate
|
||||
run: pnpm cli.validate
|
||||
|
||||
############ UNIT TEST ############
|
||||
test-unit:
|
||||
@@ -472,20 +495,24 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16.x
|
||||
cache: 'yarn'
|
||||
cache: 'pnpm'
|
||||
registry-url: https://registry.npmjs.org/
|
||||
|
||||
- run: corepack enable
|
||||
|
||||
- name: Install NPM Dependencies
|
||||
run: yarn install --immutable --network-timeout 300000
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
- name: Unit Tests
|
||||
run: yarn run test.unit
|
||||
run: pnpm run test.unit
|
||||
|
||||
########### VALIDATE RUST ############
|
||||
validate-rust:
|
||||
@@ -560,22 +587,26 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16.x
|
||||
cache: 'yarn'
|
||||
cache: 'pnpm'
|
||||
registry-url: https://registry.npmjs.org/
|
||||
|
||||
- run: corepack enable
|
||||
|
||||
- name: Install NPM Dependencies
|
||||
run: yarn install --immutable --network-timeout 300000
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
- name: Prettier Check
|
||||
if: ${{ always() }}
|
||||
run: yarn run lint.prettier
|
||||
run: pnpm run lint.prettier
|
||||
|
||||
- name: ESLint Check
|
||||
if: ${{ always() }}
|
||||
run: yarn run lint.eslint
|
||||
run: pnpm run lint.eslint
|
||||
|
||||
14
.github/workflows/release-qwik-city.yml
vendored
14
.github/workflows/release-qwik-city.yml
vendored
@@ -21,25 +21,29 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: pnpm/action-setup@v2.2.4
|
||||
with:
|
||||
version: 7
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16.x
|
||||
cache: 'yarn'
|
||||
cache: 'pnpm'
|
||||
registry-url: https://registry.npmjs.org/
|
||||
|
||||
- run: corepack enable
|
||||
|
||||
- name: Install NPM Dependencies
|
||||
run: yarn install --immutable --network-timeout 300000
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
- name: Test Qwik City
|
||||
run: cd packages/qwik-city && yarn test
|
||||
run: cd packages/qwik-city && pnpm test
|
||||
|
||||
- name: Build Qwik City
|
||||
run: cd packages/qwik-city && yarn build
|
||||
run: cd packages/qwik-city && pnpm build
|
||||
|
||||
- name: Publish Qwik City
|
||||
run: cd packages/qwik-city && yarn tsm scripts/release.ts --set-dist-tag="${{ github.event.inputs.disttag }}"
|
||||
run: cd packages/qwik-city && pnpm tsm scripts/release.ts --set-dist-tag="${{ github.event.inputs.disttag }}"
|
||||
env:
|
||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
.history
|
||||
.yarn
|
||||
.yarnrc.yml
|
||||
pnpm-lock.yaml
|
||||
.mf
|
||||
dist
|
||||
dist-dev
|
||||
@@ -26,4 +27,4 @@ packages/docs/src/routes/**/*.mdx
|
||||
starters/**/*.js
|
||||
|
||||
# TODO: Figure out why this doesn't pass in CI
|
||||
packages/qwik/src/core/props/props.ts
|
||||
packages/qwik/src/core/props/props.ts
|
||||
785
.yarn/releases/yarn-3.2.0.cjs
vendored
785
.yarn/releases/yarn-3.2.0.cjs
vendored
File diff suppressed because one or more lines are too long
@@ -1,5 +0,0 @@
|
||||
nodeLinker: node-modules
|
||||
|
||||
npmPublishRegistry: "https://registry.npmjs.org"
|
||||
|
||||
yarnPath: .yarn/releases/yarn-3.2.0.cjs
|
||||
@@ -4,5 +4,5 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
||||
ADD . /
|
||||
ENV PATH="/root/.cargo/bin:${PATH}"
|
||||
RUN make install-rust-deps
|
||||
RUN yarn install
|
||||
RUN yarn build
|
||||
RUN pnpm install
|
||||
RUN pnpm build
|
||||
|
||||
43
package.json
43
package.json
@@ -16,20 +16,20 @@
|
||||
"build.watch": "tsm scripts/index.ts --build --qwikcity --watch --dev --platform-binding",
|
||||
"commit": "git-cz",
|
||||
"link.dist": "cd packages/qwik/dist && npm link && cd ../../qwik-city/lib && npm link && cd ../../eslint-plugin-qwik/dist && npm link && cd ../../qwik-react && npm link",
|
||||
"cli": "yarn build.cli && node packages/create-qwik/dist/create-qwik.cjs && tsm scripts/validate-cli.ts --copy-local-qwik-dist",
|
||||
"cli": "pnpm build.cli && node packages/create-qwik/dist/create-qwik.cjs && tsm scripts/validate-cli.ts --copy-local-qwik-dist",
|
||||
"cli.validate": "tsm scripts/validate-cli.ts",
|
||||
"api.update": "tsm scripts/index.ts --tsc --api --dev",
|
||||
"tsc.check": "tsc --noEmit",
|
||||
"tsc.watch": "tsc --noEmit --watch --preserveWatchOutput",
|
||||
"tsc.trace": "tsc -p tsconfig.json --traceResolution > tsc.log",
|
||||
"start": "concurrently \"npm:build.watch\" \"npm:test.watch\" \"npm:tsc.watch\" -n build,test,tsc -c green,magenta,cyan",
|
||||
"release.prepare": "yarn lint && yarn test.unit && tsm scripts/index.ts --tsc --build --api --eslint --platform-binding --wasm --prepare-release",
|
||||
"test": "yarn build.full && yarn test.unit && yarn test.e2e",
|
||||
"release.prepare": "pnpm lint && pnpm test.unit && tsm scripts/index.ts --tsc --build --api --eslint --platform-binding --wasm --prepare-release",
|
||||
"test": "pnpm build.full && pnpm test.unit && pnpm test.e2e",
|
||||
"test.unit": "tsm node_modules/uvu/bin.js packages unit.ts --tsmconfig tsm.cjs",
|
||||
"test.unit.debug": "tsm --inspect-brk node_modules/uvu/bin.js packages unit.ts --tsmconfig tsm.cjs",
|
||||
"test.watch": "watchlist packages unit.ts -- yarn test.unit",
|
||||
"test.watch": "watchlist packages unit.ts -- pnpm test.unit",
|
||||
"test.rust": "make test",
|
||||
"test.e2e": "yarn test.e2e.chromium && yarn test.e2e.firefox && yarn test.e2e.webkit",
|
||||
"test.e2e": "pnpm test.e2e.chromium && pnpm test.e2e.firefox && pnpm test.e2e.webkit",
|
||||
"test.e2e.chromium": "playwright test starters --browser=chromium --config starters/playwright.config.ts",
|
||||
"test.e2e.chromium.debug": "PWDEBUG=1 playwright test starters --browser=chromium --config starters/playwright.config.ts",
|
||||
"test.e2e.firefox": "playwright test starters --browser=firefox --config starters/playwright.config.ts",
|
||||
@@ -37,20 +37,18 @@
|
||||
"serve": "tsm --inspect starters/dev-server.ts 3300",
|
||||
"serve.debug": "tsm --inspect-brk starters/dev-server.ts 3300",
|
||||
"docs.sync": "tsm scripts/docs_sync/index.ts",
|
||||
"lint": "yarn lint.eslint && yarn lint.prettier && yarn lint.rust",
|
||||
"lint": "pnpm lint.eslint && pnpm lint.prettier && pnpm lint.rust",
|
||||
"lint.eslint": "eslint --cache \"**/*.ts*\"",
|
||||
"lint.rust": "make lint",
|
||||
"lint.prettier": "prettier --check .",
|
||||
"prettier.fix": "prettier --write .",
|
||||
"fmt": "yarn prettier.fix",
|
||||
"fmt": "pnpm prettier.fix",
|
||||
"qwik-save-artifacts": "tsm ./scripts/qwik-save-artifacts.ts",
|
||||
"preinstall": "yarn node scripts/tools/preinstall-script.js"
|
||||
"preinstall": "npx only-allow pnpm"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@builder.io/partytown": "0.7.1",
|
||||
"@builder.io/qwik-dom": "2.1.19",
|
||||
"@microsoft/api-extractor": "7.33.6",
|
||||
"@mui/material": "^5.10.13",
|
||||
"@napi-rs/cli": "2.12.0",
|
||||
"@napi-rs/triples": "1.1.0",
|
||||
"@node-rs/helper": "1.3.3",
|
||||
@@ -72,6 +70,7 @@
|
||||
"@typescript-eslint/utils": "5.42.1",
|
||||
"all-contributors-cli": "6.24.0",
|
||||
"brotli": "1.3.3",
|
||||
"create-qwik": "workspace:*",
|
||||
"commitizen": "4.2.5",
|
||||
"concurrently": "7.5.0",
|
||||
"cross-spawn": "^7.0.3",
|
||||
@@ -89,27 +88,18 @@
|
||||
"rollup": "2.79.1",
|
||||
"semver": "7.3.8",
|
||||
"snoop": "^1.0.4",
|
||||
"tailwindcss": "3.2.4",
|
||||
"terser": "5.15.1",
|
||||
"todomvc-app-css": "2.4.2",
|
||||
"todomvc-common": "1.0.5",
|
||||
"tsm": "2.2.2",
|
||||
"typescript": "4.8.4",
|
||||
"uvu": "^0.5.6",
|
||||
"vite": "3.2.3",
|
||||
"ora": "^6.1.2",
|
||||
"vite-tsconfig-paths": "3.5.2",
|
||||
"wasm-pack": "0.10.3",
|
||||
"watchlist": "^0.3.1",
|
||||
"which-pm-runs": "^1.1.0"
|
||||
"which-pm-runs": "^1.1.0",
|
||||
"@types/prompts": "2.0.14",
|
||||
"prompts": "2.4.2"
|
||||
},
|
||||
"workspaces": [
|
||||
"packages/docs",
|
||||
"packages/create-qwik",
|
||||
"packages/qwik",
|
||||
"packages/qwik-city",
|
||||
"packages/qwik-react",
|
||||
"packages/eslint-plugin-qwik"
|
||||
],
|
||||
"contributors": [
|
||||
{
|
||||
"name": "Miško Hevery",
|
||||
@@ -127,9 +117,12 @@
|
||||
"url": "https://twitter.com/manucorporat"
|
||||
}
|
||||
],
|
||||
"packageManager": "yarn@3.2.0",
|
||||
"packageManager": "pnpm@7.15.0",
|
||||
"engines": {
|
||||
"node": ">=16"
|
||||
"node": ">=16",
|
||||
"npm": "please-use-pnpm",
|
||||
"yarn": "please-use-pnpm",
|
||||
"pnpm": ">=7"
|
||||
},
|
||||
"config": {
|
||||
"commitizen": {
|
||||
|
||||
@@ -68,7 +68,7 @@ export function logCreateAppResult(result: CreateAppResult, ranInstall: boolean)
|
||||
console.log(` ${pkgManager} start`);
|
||||
console.log(``);
|
||||
|
||||
const qwikAdd = pkgManager === 'yarn' ? 'yarn qwik add' : `${pkgManager} run qwik add`;
|
||||
const qwikAdd = pkgManager !== 'npm' ? `${pkgManager} qwik add` : `npm run qwik add`;
|
||||
console.log(`🔌 ${color.cyan('Integrations? Add Netlify, Cloudflare, Tailwind...')}`);
|
||||
console.log(` ${qwikAdd}`);
|
||||
console.log(``);
|
||||
|
||||
@@ -15,26 +15,27 @@
|
||||
"fmt.check": "prettier --check .",
|
||||
"preview": "qwik build preview && vite preview --open",
|
||||
"serve": "wrangler pages dev ./dist",
|
||||
"start": "yarn dev"
|
||||
"start": "pnpm dev"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@algolia/autocomplete-core": "^1.7.3",
|
||||
"@algolia/client-search": "^4.14.2",
|
||||
"@builder.io/partytown": "^0.7.1",
|
||||
"@algolia/autocomplete-core": "1.7.3",
|
||||
"@algolia/autocomplete-shared": "1.7.3",
|
||||
"@algolia/client-search": "4.14.2",
|
||||
"@builder.io/partytown": "0.7.1",
|
||||
"@builder.io/qwik": "0.13.3",
|
||||
"@builder.io/qwik-city": "0.0.122",
|
||||
"@builder.io/sdk-qwik": "^0.0.34",
|
||||
"@docsearch/css": "^3.3.0",
|
||||
"algoliasearch": "^4.14.2",
|
||||
"@builder.io/sdk-qwik": "0.0.34",
|
||||
"@docsearch/css": "3.3.0",
|
||||
"algoliasearch": "4.14.2",
|
||||
"autoprefixer": "10.4.13",
|
||||
"fflate": "^0.7.4",
|
||||
"gray-matter": "^4.0.3",
|
||||
"fflate": "0.7.4",
|
||||
"gray-matter": "4.0.3",
|
||||
"node-fetch": "3.3.0",
|
||||
"postcss": "8.4.19",
|
||||
"prism-themes": "1.9.0",
|
||||
"prismjs": "^1.29.0",
|
||||
"prismjs": "1.29.0",
|
||||
"tailwindcss": "3.2.4",
|
||||
"tsm": "^2.2.2",
|
||||
"tsm": "2.2.2",
|
||||
"typescript": "4.8.4",
|
||||
"uvu": "0.5.6",
|
||||
"vite": "3.2.3",
|
||||
|
||||
@@ -59,13 +59,13 @@
|
||||
"start": "cd runtime && node --inspect ../../../node_modules/vite/bin/vite.js",
|
||||
"dev.ssr": "cd runtime && node --inspect ../../../node_modules/vite/bin/vite.js --mode ssr",
|
||||
"dev.debug": "cd runtime && node --inspect-brk ../../../node_modules/vite/bin/vite.js --mode ssr --force",
|
||||
"build": "yarn build.client && yarn build.server",
|
||||
"build": "pnpm build.client && pnpm build.server",
|
||||
"build.client": "cd runtime && vite build -c vite.app.config.ts",
|
||||
"build.server": "cd runtime && vite build -c vite.express.config.ts",
|
||||
"build.runtime": "cd runtime && vite build --mode lib -c vite.lib.config.ts",
|
||||
"serve": "node --inspect runtime/server/entry.express",
|
||||
"serve.debug": "node --inspect-brk runtime/server/entry.express",
|
||||
"test": "yarn test.unit && yarn test.e2e.mpa",
|
||||
"test": "pnpm test.unit && pnpm test.e2e.mpa",
|
||||
"test.unit": "tsm ../../node_modules/.bin/uvu . unit.ts --tsmconfig tsm.cjs",
|
||||
"test.e2e.mpa": "mode=mpa node ../../node_modules/.bin/playwright test runtime/src/app/tests --config runtime/playwright.config.ts",
|
||||
"test.e2e.spa": "mode=spa node ../../node_modules/.bin/playwright test runtime/src/app/tests --config runtime/playwright.config.ts"
|
||||
@@ -80,8 +80,8 @@
|
||||
"@builder.io/qwik": "workspace:*",
|
||||
"@microsoft/api-extractor": "7.33.6",
|
||||
"@netlify/edge-functions": "^2.0.0",
|
||||
"@types/github-slugger": "2.0.0",
|
||||
"@types/marked": "4.0.7",
|
||||
"@types/mdast": "^3.0.10",
|
||||
"@types/node": "latest",
|
||||
"@types/refractor": "3.0.2",
|
||||
"estree-util-value-to-estree": "2.1.0",
|
||||
@@ -89,6 +89,7 @@
|
||||
"hast-util-heading-rank": "2.1.0",
|
||||
"hast-util-to-string": "2.0.0",
|
||||
"marked": "4.2.2",
|
||||
"mdast-util-mdx": "^2.0.0",
|
||||
"refractor": "4.8.0",
|
||||
"rehype-autolink-headings": "6.1.1",
|
||||
"remark-frontmatter": "4.0.1",
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
/** @jsxImportSource react */
|
||||
|
||||
import { qwikify$ } from '../react/qwikify';
|
||||
import { Button } from '@mui/material';
|
||||
|
||||
export const App = qwikify$(() => {
|
||||
return (
|
||||
<>
|
||||
<Button variant="contained">Hola</Button>
|
||||
<div>hola</div>
|
||||
</>
|
||||
);
|
||||
});
|
||||
|
||||
@@ -113,6 +113,10 @@
|
||||
"testing/index.d.ts",
|
||||
"testing/package.json"
|
||||
],
|
||||
"devDependencies": {
|
||||
"@builder.io/qwik-dom": "2.1.19",
|
||||
"kleur": "4.1.5"
|
||||
},
|
||||
"contributors": [
|
||||
{
|
||||
"name": "Miško Hevery",
|
||||
|
||||
@@ -108,8 +108,8 @@ async function mergeReadmes(fileUpdates: FsUpdates, srcPath: string, destPath: s
|
||||
}
|
||||
|
||||
const pkgManager = getPackageManager();
|
||||
if (pkgManager === 'yarn') {
|
||||
destContent = destContent.replace(/npm run/g, 'yarn');
|
||||
if (pkgManager !== 'npm') {
|
||||
destContent = destContent.replace(/npm run/g, pkgManager);
|
||||
}
|
||||
|
||||
fileUpdates.files.push({
|
||||
|
||||
@@ -65,7 +65,7 @@ export function getPackageManager() {
|
||||
|
||||
export function pmRunCmd() {
|
||||
const pm = getPackageManager();
|
||||
if (pm === 'yarn') {
|
||||
if (pm !== 'npm') {
|
||||
return pm;
|
||||
}
|
||||
return `${pm} run`;
|
||||
|
||||
@@ -16,32 +16,31 @@ export interface FunctionComponent<P = Record<string, any>> {
|
||||
}
|
||||
|
||||
// @public (undocumented)
|
||||
const jsx: <T extends string | FunctionComponent<any>>(type: T, props: T extends FunctionComponent<infer PROPS> ? PROPS : Record<string, any>, key?: string | number | null) => JSXNode<T>;
|
||||
export { jsx }
|
||||
export { jsx as jsxs }
|
||||
|
||||
// @public (undocumented)
|
||||
namespace JSX_2 {
|
||||
export namespace JSX {
|
||||
// (undocumented)
|
||||
interface Element extends JSXNode {
|
||||
export interface Element extends JSXNode {
|
||||
}
|
||||
// (undocumented)
|
||||
interface ElementChildrenAttribute {
|
||||
export interface ElementChildrenAttribute {
|
||||
// (undocumented)
|
||||
children: any;
|
||||
}
|
||||
// Warning: (ae-forgotten-export) The symbol "QwikIntrinsicAttributes" needs to be exported by the entry point jsx-runtime.d.ts
|
||||
//
|
||||
// (undocumented)
|
||||
interface IntrinsicAttributes extends QwikIntrinsicAttributes {
|
||||
export interface IntrinsicAttributes extends QwikIntrinsicAttributes {
|
||||
}
|
||||
// Warning: (ae-forgotten-export) The symbol "QwikIntrinsicElements" needs to be exported by the entry point jsx-runtime.d.ts
|
||||
//
|
||||
// (undocumented)
|
||||
interface IntrinsicElements extends QwikIntrinsicElements {
|
||||
export interface IntrinsicElements extends QwikIntrinsicElements {
|
||||
}
|
||||
}
|
||||
export { JSX_2 as JSX }
|
||||
|
||||
// @public (undocumented)
|
||||
const jsx: <T extends string | FunctionComponent<any>>(type: T, props: T extends FunctionComponent<infer PROPS> ? PROPS : Record<string, any>, key?: string | number | null) => JSXNode<T>;
|
||||
export { jsx }
|
||||
export { jsx as jsxs }
|
||||
|
||||
// Warning: (ae-forgotten-export) The symbol "JsxDevOpts" needs to be exported by the entry point jsx-runtime.d.ts
|
||||
//
|
||||
|
||||
52
packages/qwik/src/wasm/Cargo.lock
generated
52
packages/qwik/src/wasm/Cargo.lock
generated
@@ -1061,9 +1061,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_common"
|
||||
version = "0.29.13"
|
||||
version = "0.29.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "953e1f014688eadbbd3e9131a525e8922c552540bb02b0bb6d9fdcb1375bccc4"
|
||||
checksum = "4bde01c52376971bc6839c42e1a71dec9526ac7acfbfcf1eb3e606e5aa1b2de0"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"ast_node",
|
||||
@@ -1114,9 +1114,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_ast"
|
||||
version = "0.94.17"
|
||||
version = "0.94.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc39246540303a9058283e6ef691a276c34afd8331e6873fb3e6fb7803eb77eb"
|
||||
checksum = "f54bd55f94f02afe98be444e1808e068fa3dca0a113d0c38748d3fdd7a380c2b"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"is-macro",
|
||||
@@ -1131,9 +1131,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_codegen"
|
||||
version = "0.127.28"
|
||||
version = "0.127.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72a5495203741e7e8445b23bbb330cec6200f764460bd8a9d8d30271018950da"
|
||||
checksum = "e807c7271cc05ce3853ce7937776b89730463a39a98729f83bef76bfb6a99048"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"num-bigint",
|
||||
@@ -1163,9 +1163,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_parser"
|
||||
version = "0.122.23"
|
||||
version = "0.122.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6472a516d3e7f30277650353f5bdce431c273e43ba25ee918e8d0a5a0a9868eb"
|
||||
checksum = "0bac20cd9f38112de7572150bc3ef24d99eed7c64d03f73f9c87df3bb497ca94"
|
||||
dependencies = [
|
||||
"either",
|
||||
"enum_kind",
|
||||
@@ -1182,9 +1182,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_transforms"
|
||||
version = "0.198.35"
|
||||
version = "0.198.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "27e95ca6fb070f75aec898f2c8cb16d4053975592a05eee219b58441b1d74b5b"
|
||||
checksum = "e996295f5d10ad35e6fb3af099eb0add4cd2c49ed49cd4f8b8096adf0892348c"
|
||||
dependencies = [
|
||||
"swc_atoms",
|
||||
"swc_common",
|
||||
@@ -1199,9 +1199,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_transforms_base"
|
||||
version = "0.111.40"
|
||||
version = "0.111.47"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89e95ec22d153e3492283d4577ec14908c3f8d67b6fcbefa89fcc42a86a9975c"
|
||||
checksum = "ab4cc244e5dd406d5a068c2c28438ba1319c6dc463dfe0889291d1cc3069e681"
|
||||
dependencies = [
|
||||
"better_scoped_tls",
|
||||
"bitflags",
|
||||
@@ -1234,9 +1234,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_transforms_optimization"
|
||||
version = "0.167.35"
|
||||
version = "0.167.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9085d858ec909a718a28aa770cd3286ef8039656bc7ac78d34c0d50a04cda074"
|
||||
checksum = "c371d6f12ee3971063692241a51f9c4674d72a585757db2d785435133a5fb8db"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"dashmap",
|
||||
@@ -1259,9 +1259,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_transforms_react"
|
||||
version = "0.155.29"
|
||||
version = "0.155.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d7b61a42604a23ef26ac16e40eed5a6153c84161a93a31e429a95545c30ef9"
|
||||
checksum = "a60afba119a0adaef9917e958b7b1af2da42772af351964cc6ba46ba7e51d911"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"base64",
|
||||
@@ -1285,9 +1285,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_transforms_typescript"
|
||||
version = "0.159.31"
|
||||
version = "0.159.42"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9f6182d2328a30cdc456843e91ae37092d8af21710396737d50b9cafe0b50c3"
|
||||
checksum = "735911d60dd7c344774f897dbfd22792c4c54263bb90e6c822bff8042e803448"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"swc_atoms",
|
||||
@@ -1301,9 +1301,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_utils"
|
||||
version = "0.105.28"
|
||||
version = "0.105.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ffaaa56fd2d1f418b332740e618770e00adc2ceda3adf2bdbd3fb8dc1b0f89a7"
|
||||
checksum = "baaee0747f8c8d32a7d55f6054e915c7a0eae13fc20127dd9ab52bc1e2f2c785"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"num_cpus",
|
||||
@@ -1318,9 +1318,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecma_visit"
|
||||
version = "0.80.17"
|
||||
version = "0.80.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb35536ee61f90c73fd22500911ca2edd11b1ccaad79d01b296011545a339115"
|
||||
checksum = "d7b42489b19f3451b65c01ed4a7926e44fab294ed9bfa8489634e58ecc96df88"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"swc_atoms",
|
||||
@@ -1332,9 +1332,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_ecmascript"
|
||||
version = "0.205.66"
|
||||
version = "0.205.77"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8aec0d8275edf06d6a87d158cd3b469e5600ad2ea49dd414ea9137bebe9bc5b8"
|
||||
checksum = "71cd51ebf646ff98fe317898d6acc09c44f344617477ce22b40cabd1ec5a22fe"
|
||||
dependencies = [
|
||||
"swc_ecma_ast",
|
||||
"swc_ecma_codegen",
|
||||
@@ -1358,9 +1358,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swc_fast_graph"
|
||||
version = "0.17.14"
|
||||
version = "0.17.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5448dee060201d38e4019496d56bce897ef69cfa91cae294ac8d8b132c0cc2e"
|
||||
checksum = "fd95667b47445a6aec7994c6701ade4e250632d38a1a8676c633b99e09897d78"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"indexmap",
|
||||
|
||||
6724
pnpm-lock.yaml
generated
Normal file
6724
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
2
pnpm-workspace.yaml
Normal file
2
pnpm-workspace.yaml
Normal file
@@ -0,0 +1,2 @@
|
||||
packages:
|
||||
- 'packages/*'
|
||||
@@ -150,7 +150,7 @@ function createTypesApi(config: BuildConfig, inPath: string, outPath: string, co
|
||||
});
|
||||
if (!result.succeeded) {
|
||||
panic(
|
||||
`Use "yarn api.update" to automatically update the .md files if the api changes were expected`
|
||||
`Use "pnpm api.update" to automatically update the .md files if the api changes were expected`
|
||||
);
|
||||
}
|
||||
const srcPath = result.extractorConfig.untrimmedFilePath;
|
||||
|
||||
@@ -13,7 +13,7 @@ export async function buildWasmBinding(config: BuildConfig) {
|
||||
|
||||
async function buildForTarget(env = {}) {
|
||||
const cmd = `wasm-pack`;
|
||||
const args = [`build`, '--target', 'web', `--out-dir`, tmpBuildDir];
|
||||
const args = [`build`, '--target', 'web', `--out-dir`, tmpBuildDir, srcWasmDir];
|
||||
if (!config.dev) {
|
||||
args.push(`--release`);
|
||||
}
|
||||
@@ -21,11 +21,11 @@ export async function buildWasmBinding(config: BuildConfig) {
|
||||
await new Promise((resolve, reject) => {
|
||||
const child = spawn(cmd, args, {
|
||||
stdio: 'inherit',
|
||||
shell: true,
|
||||
env: {
|
||||
...process.env,
|
||||
...env,
|
||||
},
|
||||
cwd: srcWasmDir,
|
||||
});
|
||||
child.on('error', reject);
|
||||
|
||||
|
||||
@@ -219,4 +219,5 @@ const IGNORE: { [path: string]: boolean } = {
|
||||
'starter.tsconfig.json': true,
|
||||
'tsconfig.tsbuildinfo': true,
|
||||
'yarn.lock': true,
|
||||
'pnpm-lock.yaml': true,
|
||||
};
|
||||
|
||||
@@ -140,7 +140,7 @@ export async function buildQwikCity(config: BuildConfig) {
|
||||
}
|
||||
|
||||
async function buildRuntime(input: string) {
|
||||
const result = await execa('yarn', ['build.runtime'], {
|
||||
const result = await execa('pnpm', ['build.runtime'], {
|
||||
stdout: 'inherit',
|
||||
cwd: input,
|
||||
});
|
||||
|
||||
@@ -7,7 +7,7 @@ const PACKAGE = 'qwik-react';
|
||||
export async function buildQwikReact(config: BuildConfig) {
|
||||
const input = join(config.packagesDir, PACKAGE);
|
||||
|
||||
const result = await execa('yarn', ['build'], {
|
||||
const result = await execa('pnpm', ['build'], {
|
||||
stdout: 'inherit',
|
||||
cwd: input,
|
||||
});
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* Do NOT allow using `npm` as package manager.
|
||||
*/
|
||||
if (process.env.npm_execpath.indexOf('yarn') === -1) {
|
||||
console.error('You must use Yarn to install dependencies:');
|
||||
console.error(' $ yarn install');
|
||||
if (process.env.npm_execpath.indexOf('pnpm') === -1) {
|
||||
console.error('You must use pnpm to install dependencies:');
|
||||
console.error(' $ pnpm install');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
@@ -355,4 +355,5 @@ const IGNORE: { [path: string]: boolean } = {
|
||||
'starter.tsconfig.json': true,
|
||||
'tsconfig.tsbuildinfo': true,
|
||||
'yarn.lock': true,
|
||||
'pnpm-lock.yaml': true,
|
||||
};
|
||||
|
||||
1
starters/.gitignore
vendored
1
starters/.gitignore
vendored
@@ -1,5 +1,6 @@
|
||||
package-lock.json
|
||||
yarn.lock
|
||||
pnpm-lock.yaml
|
||||
videos/
|
||||
build
|
||||
dist
|
||||
@@ -24,7 +24,7 @@ const config: PlaywrightTestConfig = {
|
||||
testIgnore: /.*example.spec.tsx/,
|
||||
retries: 3,
|
||||
webServer: {
|
||||
command: 'yarn tsm ./dev-server.ts 3301',
|
||||
command: 'pnpm tsm ./starters/dev-server.ts 3301',
|
||||
port: 3301,
|
||||
reuseExistingServer: !process.env.CI,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user