diff --git a/javascript/app-framework/package.json b/javascript/app-framework/package.json index ad9195391..7576e17b5 100644 --- a/javascript/app-framework/package.json +++ b/javascript/app-framework/package.json @@ -21,7 +21,9 @@ "scripts": { "clean": "essex clean dist docs", "build": "essex build --docs --skipExportCheck", - "lint": "essex lint --fix --strict", + "fix": "essex fix --strict", + "check": "essex check --strict", + "check-deps": "essex check-deps", "release": "yarn npm publish --tolerate-republish --access public" }, "dependencies": { diff --git a/javascript/react/package.json b/javascript/react/package.json index cf0b0c555..b76df0f36 100644 --- a/javascript/react/package.json +++ b/javascript/react/package.json @@ -29,7 +29,9 @@ "scripts": { "clean": "essex clean dist docs", "build": "essex build --docs --skipExportCheck", - "lint": "essex lint --fix --strict", + "fix": "essex fix --strict", + "check": "essex check --strict", + "check-deps": "essex check-deps", "release": "yarn npm publish --tolerate-republish --access public" }, "dependencies": { diff --git a/javascript/schema/package.json b/javascript/schema/package.json index aeaf14fe6..bd5d618a7 100644 --- a/javascript/schema/package.json +++ b/javascript/schema/package.json @@ -39,7 +39,9 @@ "_transpile": "essex build --docs", "_bundle_schemas": "run-p bundle-codebook bundle-datapackage bundle-datatable bundle-bundle bundle-workflow bundle-tablebundle", "build": "run-p _transpile _bundle_schemas", - "lint": "essex lint --fix --strict", + "fix": "essex fix --strict", + "check": "essex check --strict", + "check-deps": "essex check-deps", "test": "NODE_OPTIONS=--experimental-vm-modules yarn node $(yarn bin jest) --runInBand", "bundle-codebook": "typescript-json-schema tsconfig.json CodebookSchema > ../../schema/codebook.json", "bundle-datapackage": "typescript-json-schema tsconfig.json DataPackageSchema > ../../schema/datapackage.json", diff --git a/javascript/tables/package.json b/javascript/tables/package.json index cd83a655e..266847988 100644 --- a/javascript/tables/package.json +++ b/javascript/tables/package.json @@ -29,6 +29,9 @@ "scripts": { "clean": "essex clean dist docs", "build": "essex build --docs --skipExportCheck", + "fix": "essex fix --strict", + "check": "essex check --strict", + "check-deps": "essex check-deps", "test": "NODE_OPTIONS=--experimental-vm-modules yarn node $(yarn bin jest) --runInBand", "release": "yarn npm publish --tolerate-republish --access public" }, diff --git a/javascript/utilities/package.json b/javascript/utilities/package.json index aa3473aaa..192301dcc 100644 --- a/javascript/utilities/package.json +++ b/javascript/utilities/package.json @@ -29,7 +29,9 @@ "scripts": { "clean": "essex clean dist docs", "build": "essex build --docs --skipExportCheck", - "lint": "essex lint --fix --strict", + "fix": "essex fix --strict", + "check": "essex check --strict", + "check-deps": "essex check-deps", "test": "NODE_OPTIONS=--experimental-vm-modules yarn node $(yarn bin jest) --runInBand", "release": "yarn npm publish --tolerate-republish --access public" }, diff --git a/javascript/webapp/package.json b/javascript/webapp/package.json index 8811f8457..60db07e81 100644 --- a/javascript/webapp/package.json +++ b/javascript/webapp/package.json @@ -26,7 +26,9 @@ "bundle": "essex bundle && shx cp -r public/* build/", "start": "essex serve", "start:webapp": "yarn start", - "lint": "essex lint --fix --strict" + "fix": "essex fix --strict", + "check": "essex check --strict", + "check-deps": "essex check-deps" }, "dependencies": { "@datashaper/app-framework": "workspace:^", diff --git a/package.json b/package.json index 430f0bbfd..f1e5d5771 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,11 @@ "clean": "turbo run clean --parallel", "build": "turbo run build", "bundle": "turbo run bundle", - "lint": "turbo run lint", + "check": "turbo run check", + "check-deps": "turbo run check-deps", + "fix": "turbo run fix", "test": "turbo run test", + "format": "essex prettify", "clean:": "yarn clean", "build:": "yarn build", "bundle:": "yarn bundle", @@ -20,7 +23,6 @@ "test:": "yarn test", "start": "SB_QUIET=true turbo run start --parallel", "deploy": "turbo run deploy", - "prettify": "essex prettify", "ci": "turbo run ci", "is_clean": "git diff-index HEAD --quiet || (git status && exit 1)", "release": "run-s clean _version_cut ci _release_packages _cut_schema _copy_versions", @@ -47,4 +49,4 @@ "javascript/*" ], "packageManager": "yarn@3.3.1" -} +} \ No newline at end of file diff --git a/turbo.json b/turbo.json index 421b18909..b76ba04d7 100644 --- a/turbo.json +++ b/turbo.json @@ -1,6 +1,5 @@ { "$schema": "https://turborepo.org/schema.json", - "baseBranch": "origin/main", "pipeline": { "//#generate:versions": { "dependsOn": [], @@ -10,33 +9,72 @@ ] }, "build": { - "dependsOn": ["//#generate:versions", "^build"], - "outputs": ["dist/**", "docs/**"] + "dependsOn": [ + "//#generate:versions", + "^build" + ], + "outputs": [ + "dist/**", + "docs/**" + ] }, "test": { - "dependsOn": ["build"], + "dependsOn": [ + "build" + ], "outputs": [], "cache": false }, - "lint": { + "check": { + "dependsOn": [], + "outputs": [] + }, + "check-deps": { + "dependsOn": [], + "outputs": [] + }, + "fix": { "dependsOn": [], "outputs": [] }, "bundle": { - "dependsOn": ["^build", "build"], - "outputs": ["build/**", "storybook-static/**"] + "dependsOn": [ + "^build", + "build" + ], + "outputs": [ + "build/**", + "storybook-static/**" + ] }, "ci": { - "dependsOn": ["build", "lint", "test", "bundle"], - "outputs": ["dist/**", "docs/**", "build/**", "storybook-static/**"] + "dependsOn": [ + "build", + "check", + "test", + "bundle" + ], + "outputs": [ + "dist/**", + "docs/**", + "build/**", + "storybook-static/**" + ] }, "prestart": { - "dependsOn": ["^prestart"], - "outputs": ["dist/**"] + "dependsOn": [ + "^prestart" + ], + "outputs": [ + "dist/**" + ] }, "start": { "cache": false, - "dependsOn": ["prestart", "^build"], + "dependsOn": [ + "prestart", + "^build" + ], "outputs": [] }, "clean": { @@ -49,4 +87,4 @@ "cache": false } } -} +} \ No newline at end of file