diff --git a/.github/workflows/pr.components.yml b/.github/workflows/pr.components.yml index aa3c17694..1eb7739f1 100644 --- a/.github/workflows/pr.components.yml +++ b/.github/workflows/pr.components.yml @@ -21,13 +21,13 @@ jobs: run: yarn install - name: Lint components - run: yarn components:lint + run: yarn lint working-directory: packages/components - - name: Compile components - run: yarn components:compile + - name: Build components + run: yarn build working-directory: packages/components - name: Test components - run: yarn components:test + run: yarn test working-directory: packages/components - name: Lint all diff --git a/package.json b/package.json index 829a88e2a..91f7ca82e 100644 --- a/package.json +++ b/package.json @@ -13,14 +13,15 @@ "node": ">=12.19.0 <17.0.0" }, "scripts": { - "lint": "yarn workspaces foreach -pt --parallel --jobs 10 --verbose run lint", - "test": "yarn workspaces foreach -pt --parallel --jobs 10 --verbose run test", + "lint": "yarn workspaces foreach -pt --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run lint", + "test": "yarn workspaces foreach -pt --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run test", "clean": "lerna run clean", - "build:all": "yarn workspaces foreach -pt --verbose run build", - "build:web": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/web run build", - "build:desktop": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/desktop run build", - "build:mobile": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/mobile run build", - "build:web-server": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/web-server run build", + "build:all": "yarn workspaces foreach -pt --verbose --exclude @standardnotes/components-meta run build", + "build:components": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/components-meta run build", + "build:web": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/web --exclude @standardnotes/components-meta run build", + "build:desktop": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/desktop --exclude @standardnotes/components-meta run build", + "build:mobile": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/mobile --exclude @standardnotes/components-meta run build", + "build:web-server": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/web-server --exclude @standardnotes/components-meta run build", "start:server:web": "lerna run start --scope=@standardnotes/web-server", "start:server:web:localhost": "lerna run start:no-binding --scope=@standardnotes/web-server", "prepare": "husky install", diff --git a/packages/components/package.json b/packages/components/package.json index 902ecaa08..598bdd9ee 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -10,11 +10,10 @@ ] }, "scripts": { - "build": "tsc --project tsconfig.json", - "components:clean": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:clean", - "components:lint": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:lint", - "components:test": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:test", - "components:compile": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:compile", + "clean": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:clean", + "lint": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:lint", + "test": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:test", + "build": "tsc --project tsconfig.json && yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:compile", "package": "node scripts/package.mjs", "version": "./scripts/VERSION.sh" }, @@ -22,6 +21,7 @@ "@standardnotes/deterministic-zip": "^1.2.0", "@standardnotes/eslint-config-extensions": "^1.0.4", "@standardnotes/features": "^1.45.1", + "@standardnotes/styles": "workspace:*", "copy-webpack-plugin": "^11.0.0", "mini-css-extract-plugin": "^2.6.0", "minimatch": "^5.1.0", diff --git a/packages/components/scripts/VERSION.sh b/packages/components/scripts/VERSION.sh index 928a2bc12..994ee1cc4 100755 --- a/packages/components/scripts/VERSION.sh +++ b/packages/components/scripts/VERSION.sh @@ -1,8 +1,8 @@ #!/bin/bash -echo 'Compiling components from' $(pwd) +echo 'Building components from' $(pwd) -yarn components:clean && yarn components:compile +yarn clean && yarn build echo "Packaging component assets and zips..." diff --git a/packages/components/src/packages/org.standardnotes.code-editor/package.json b/packages/components/src/packages/org.standardnotes.code-editor/package.json index c84eaef22..120b1848b 100644 --- a/packages/components/src/packages/org.standardnotes.code-editor/package.json +++ b/packages/components/src/packages/org.standardnotes.code-editor/package.json @@ -9,7 +9,7 @@ "scripts": { "start": "http-server . --cors -p8001 & webpack --progress --config webpack.dev.js", "components:compile": "webpack --config webpack.prod.js", - "skip:components:lint": "eslint src --ext .js", + "skip:components:lint": "eslint ./src --ext .js", "components:lint:fix": "yarn lint --fix", "components:clean": "rm -rf ./vendor" }, diff --git a/yarn.lock b/yarn.lock index 7526f5742..9bc58c9f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5059,6 +5059,7 @@ __metadata: "@standardnotes/deterministic-zip": ^1.2.0 "@standardnotes/eslint-config-extensions": ^1.0.4 "@standardnotes/features": ^1.45.1 + "@standardnotes/styles": "workspace:*" copy-webpack-plugin: ^11.0.0 mini-css-extract-plugin: ^2.6.0 minimatch: ^5.1.0