diff --git a/e2e-tests/tsconfig.json b/e2e-tests/tsconfig.json index 84451d4eb..36daff0ad 100644 --- a/e2e-tests/tsconfig.json +++ b/e2e-tests/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/gts/tsconfig-google.json", + "extends": "../node_modules/gts/tsconfig-google.json", "compilerOptions": { "rootDir": ".", "outDir": "build", diff --git a/package.json b/package.json index f8250a90e..9dca9f484 100644 --- a/package.json +++ b/package.json @@ -3,15 +3,16 @@ "version": "0.0.1", "description": "Root package for Ground hosted components", "scripts": { - "clean-all": "nx run-many -t clean", - "build-all": "nx run-many -t build", + "clean-all": "npm run clean --workspaces --if-present", + "ci-all": "npm ci && npm ci --workspaces", + "build-all": "npm run build --workspaces --if-present", "deploy": "firebase login && firebase deploy --project $npm_config_project", - "build-all-and-deploy": "nx run-many -t build && npm run deploy", - "build-all-and-start-local": "nx run-many -t build --config=local --project=local && npm run start:local", - "watch:local": "nx run functions:watch > functions.log 2>&1 & nx run web:watch --config=local --project=local > web.log 2>&1", - "start:local": "firebase emulators:exec 'npm run watch:local' --project local --ui --config firebase.local.json --import data/local", - "export:local": "firebase emulators:export data/local --project local --only firestore", - "start-and-export:test": "firebase emulators:exec 'npm run watch:local' --project local --ui --config firebase.local.json --import data/test --export-on-exit data/test", + "build-all-and-deploy": "npm run build-all --config=local && npm run deploy", + "build-all-and-start-local": "npm run build-all --config=local && npm run start:local", + "watch:local": "npm run watch --workspace functions > functions.log 2>&1 & npm run watch --config=local --project=local --workspace web > web.log 2>&1", + "start:local": "firebase emulators:exec 'npm run watch:local' --project demo-local --ui --config firebase.local.json --import data/local", + "export:local": "firebase emulators:export data/local --project demo-local --only firestore", + "start-and-export:test": "firebase emulators:exec 'npm run watch:local' --project demo-local --ui --config firebase.local.json --import data/test --export-on-exit data/test", "test:e2e:create": "WAIT_ON_INTERVAL=30000 start-server-and-test start-and-export:test '5000|http://localhost:4000/firestore' 'npm run test:create --prefix=e2e-tests'", "test:e2e:create:debug": "WAIT_ON_INTERVAL=30000 start-server-and-test start-and-export:test '5000|http://localhost:4000/firestore' 'npm run test:create:debug --prefix=e2e-tests'", "test:e2e:verify": "WAIT_ON_INTERVAL=30000 start-server-and-test start-and-export:test '5000|http://localhost:4000/firestore' 'npm run test:verify --prefix=e2e-tests'", diff --git a/web/tsconfig.json b/web/tsconfig.json index 9b0073aa6..94f97396b 100644 --- a/web/tsconfig.json +++ b/web/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/gts/tsconfig-google.json", + "extends": "../node_modules/gts/tsconfig-google.json", "compilerOptions": { "baseUrl": "src", "esModuleInterop": true,