From f33e5db84e283310192cd44aeb3cac24e9691354 Mon Sep 17 00:00:00 2001 From: Mo Date: Wed, 15 Jun 2022 10:11:05 -0500 Subject: [PATCH] chore: components workflow --- .github/workflows/pr.components.yml | 20 ++++++++++++++----- .github/workflows/version-bump.yml | 2 +- package.json | 1 - .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- packages/components/package.json | 7 ++++--- .../package.json | 6 +++--- .../package.json | 6 +++--- .../package.json | 6 +++--- .../package.json | 8 ++++---- .../webpack.config.js | 10 ---------- .../package.json | 2 +- .../package.json | 4 ++-- .../package.json | 2 +- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 6 +++--- .../package.json | 6 +++--- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 6 +++--- 34 files changed, 74 insertions(+), 74 deletions(-) diff --git a/.github/workflows/pr.components.yml b/.github/workflows/pr.components.yml index a20055ea9..ce0a1292f 100644 --- a/.github/workflows/pr.components.yml +++ b/.github/workflows/pr.components.yml @@ -11,18 +11,28 @@ on: jobs: test: runs-on: ubuntu-latest + defaults: + run: + working-directory: packages/components steps: - name: Checkout code uses: actions/checkout@v2 - name: Set up Ruby uses: ruby/setup-ruby@v1 + - name: Install dependencies run: yarn install - - name: ESLint - run: yarn lint + + - name: Lint components + run: yarn components:lint - name: Compile components - run: yarn compile:components - - name: Build + run: yarn components:compile + - name: Test components + run: yarn components:test + + - name: Lint all + run: yarn lint + - name: Build all run: yarn build:all - - name: Test + - name: Test all run: yarn test diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 5cc374481..f6a8dc6f8 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -33,7 +33,7 @@ jobs: run: yarn install - name: Compile Components - run: yarn compile:components + run: yarn components:clean && yarn components:compile - name: Commit Components run: | node packages/components/scripts/package-components.mjs diff --git a/package.json b/package.json index df58917e1..48abcce0b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "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", - "compile:components": "yarn workspace @standardnotes/components-meta run compile", "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/dist/org.standardnotes.advanced-checklist/package.json b/packages/components/dist/org.standardnotes.advanced-checklist/package.json index c368eaedf..3b5cf8738 100644 --- a/packages/components/dist/org.standardnotes.advanced-checklist/package.json +++ b/packages/components/dist/org.standardnotes.advanced-checklist/package.json @@ -22,14 +22,14 @@ "deploy-build": "yarn run predeploy && gh-pages -b build -d build", "deploy-dev": "yarn run predeploy && gh-pages -b dev -d build", "deploy-stable": "yarn run predeploy && gh-pages -b gh-pages -d build", - "custom:test": "react-scripts test --watchAll=false", + "components:test": "react-scripts test --watchAll=false", "test:coverage": "npm run test -- --coverage --watchAll", "eject": "react-scripts eject", "serve": "serve -s -p 3000 build", "server-public": "http-server -p 3000 --cors", "server-root": "http-server ./ -p 3000 --cors", "server": "http-server ./build -p 3000 --cors", - "compile:lint": "prettier --write 'src/**/*.{html,css,scss,js,jsx,ts,tsx,json}' README.md" + "components:lint": "prettier --write 'src/**/*.{html,css,scss,js,jsx,ts,tsx,json}' README.md" }, "eslintConfig": { "extends": [ diff --git a/packages/components/dist/org.standardnotes.advanced-markdown-editor/package.json b/packages/components/dist/org.standardnotes.advanced-markdown-editor/package.json index da0b9091a..0d8030f34 100644 --- a/packages/components/dist/org.standardnotes.advanced-markdown-editor/package.json +++ b/packages/components/dist/org.standardnotes.advanced-markdown-editor/package.json @@ -12,8 +12,8 @@ "scripts": { "start": "webpack serve --config webpack.dev.js --progress --hot", "compile": "webpack --config webpack.prod.js", - "custom:lint": "eslint src --ext .js", - "custom:lint:fix": "yarn lint --fix" + "components:lint": "eslint src --ext .js", + "components:lint:fix": "yarn lint --fix" }, "devDependencies": { "@babel/cli": "^7.13.10", diff --git a/packages/components/dist/org.standardnotes.bold-editor/package.json b/packages/components/dist/org.standardnotes.bold-editor/package.json index f23bd0f01..8024ee86b 100644 --- a/packages/components/dist/org.standardnotes.bold-editor/package.json +++ b/packages/components/dist/org.standardnotes.bold-editor/package.json @@ -4,8 +4,8 @@ "version": "1.3.5", "main": "dist/dist.js", "scripts": { - "custom:lint": "eslint app/ --ext .js", - "custom:lint:fix": "yarn lint --fix", + "components:lint": "eslint app/ --ext .js", + "components:lint:fix": "yarn lint --fix", "compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot" }, diff --git a/packages/components/dist/org.standardnotes.code-editor/package.json b/packages/components/dist/org.standardnotes.code-editor/package.json index b9f8f045f..802fcc119 100644 --- a/packages/components/dist/org.standardnotes.code-editor/package.json +++ b/packages/components/dist/org.standardnotes.code-editor/package.json @@ -9,8 +9,8 @@ "scripts": { "start": "http-server . --cors -p8001 & webpack --progress --config webpack.dev.js", "compile": "webpack --config webpack.prod.js", - "custom:lint": "eslint src --ext .js", - "custom:lint:fix": "yarn lint --fix" + "components:lint": "eslint src --ext .js", + "components:lint:fix": "yarn lint --fix" }, "devDependencies": { "@babel/cli": "^7.12.10", diff --git a/packages/components/dist/org.standardnotes.markdown-visual-editor/package.json b/packages/components/dist/org.standardnotes.markdown-visual-editor/package.json index f1aba615d..fb7c8a544 100644 --- a/packages/components/dist/org.standardnotes.markdown-visual-editor/package.json +++ b/packages/components/dist/org.standardnotes.markdown-visual-editor/package.json @@ -17,7 +17,7 @@ "start": "react-scripts start", "compile": "react-scripts build", "eject": "react-scripts eject", - "compile:lint": "prettier --write 'src/**/*.{html,css,scss,js,jsx,ts,tsx,json}' README.md" + "components:lint": "prettier --write 'src/**/*.{html,css,scss,js,jsx,ts,tsx,json}' README.md" }, "devDependencies": { "@codemirror/lang-markdown": "^0.19.6", diff --git a/packages/components/dist/org.standardnotes.plus-editor/package.json b/packages/components/dist/org.standardnotes.plus-editor/package.json index f653379a7..00d1fc452 100644 --- a/packages/components/dist/org.standardnotes.plus-editor/package.json +++ b/packages/components/dist/org.standardnotes.plus-editor/package.json @@ -6,7 +6,7 @@ "main": "dist/dist.js", "author": "Standard Notes ", "scripts": { - "custom:lint": "eslint --ext .js .", + "components:lint": "eslint --ext .js .", "compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot" }, diff --git a/packages/components/dist/org.standardnotes.simple-markdown-editor/package.json b/packages/components/dist/org.standardnotes.simple-markdown-editor/package.json index ca10d67f5..52e486428 100644 --- a/packages/components/dist/org.standardnotes.simple-markdown-editor/package.json +++ b/packages/components/dist/org.standardnotes.simple-markdown-editor/package.json @@ -4,7 +4,7 @@ "version": "1.4.2", "main": "dist/dist.js", "scripts": { - "custom:lint": "eslint --cache --ext .jsx,.js --format=node_modules/eslint-formatter-pretty .", + "components:lint": "eslint --cache --ext .jsx,.js --format=node_modules/eslint-formatter-pretty .", "compile": "webpack", "start": "webpack-dev-server --devtool eval --progress --port 8001 --hot --content-base app", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1" diff --git a/packages/components/dist/org.standardnotes.simple-task-editor/package.json b/packages/components/dist/org.standardnotes.simple-task-editor/package.json index 34e146a26..d8cdc1a2c 100644 --- a/packages/components/dist/org.standardnotes.simple-task-editor/package.json +++ b/packages/components/dist/org.standardnotes.simple-task-editor/package.json @@ -6,8 +6,8 @@ "scripts": { "compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot", - "custom:lint": "eslint app/ --ext .js", - "custom:lint:fix": "yarn lint --fix" + "components:lint": "eslint app/ --ext .js", + "components:lint:fix": "yarn lint --fix" }, "sn": { "main": "dist/index.html" diff --git a/packages/components/dist/org.standardnotes.standard-sheets/package.json b/packages/components/dist/org.standardnotes.standard-sheets/package.json index 192aa52d7..c9ba7e176 100644 --- a/packages/components/dist/org.standardnotes.standard-sheets/package.json +++ b/packages/components/dist/org.standardnotes.standard-sheets/package.json @@ -4,8 +4,8 @@ "version": "1.4.4", "main": "dist/dist.js", "scripts": { - "custom:lint": "eslint app/ --ext .js", - "custom:lint:fix": "npm run lint -- --fix", + "components:lint": "eslint app/ --ext .js", + "components:lint:fix": "npm run lint -- --fix", "compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1" diff --git a/packages/components/dist/org.standardnotes.token-vault/package.json b/packages/components/dist/org.standardnotes.token-vault/package.json index a1bffd554..846a59647 100644 --- a/packages/components/dist/org.standardnotes.token-vault/package.json +++ b/packages/components/dist/org.standardnotes.token-vault/package.json @@ -5,8 +5,8 @@ "scripts": { "compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot", - "custom:lint": "eslint app/ --ext .js", - "custom:lint:fix": "yarn lint --fix" + "components:lint": "eslint app/ --ext .js", + "components:lint:fix": "yarn lint --fix" }, "sn": { "main": "dist/index.html" diff --git a/packages/components/package.json b/packages/components/package.json index 4909badbd..3d8428742 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -9,9 +9,10 @@ ] }, "scripts": { - "compile": "yarn compile:lint && yarn compile:all", - "compile:lint": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run lint", - "compile:all": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run compile" + "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" }, "devDependencies": { "@standardnotes/deterministic-zip": "^1.2.0", diff --git a/packages/components/src/org.standardnotes.advanced-checklist/package.json b/packages/components/src/org.standardnotes.advanced-checklist/package.json index 5b293aa82..23b8048eb 100644 --- a/packages/components/src/org.standardnotes.advanced-checklist/package.json +++ b/packages/components/src/org.standardnotes.advanced-checklist/package.json @@ -15,21 +15,21 @@ "scripts": { "analyze": "source-map-explorer 'build/static/js/*.js'", "start": "react-app-rewired start", - "compile": "react-app-rewired build", "prepublishOnly": "npm run build", "clean-deploy-cache": "rm -rf node_modules/.cache/gh-pages", "predeploy": "yarn run pretty && yarn run build && yarn clean-deploy-cache", "deploy-build": "yarn run predeploy && gh-pages -b build -d build", "deploy-dev": "yarn run predeploy && gh-pages -b dev -d build", "deploy-stable": "yarn run predeploy && gh-pages -b gh-pages -d build", - "custom:test": "react-app-rewired test --watchAll=false", "test:coverage": "npm run test -- --coverage --watchAll", "eject": "react-scripts eject", "serve": "serve -s -p 3000 build", "server-public": "http-server -p 3000 --cors", "server-root": "http-server ./ -p 3000 --cors", "server": "http-server ./build -p 3000 --cors", - "compile:lint": "prettier --write 'src/**/*.{html,css,scss,js,jsx,ts,tsx,json}' README.md" + "components:compile": "react-app-rewired build", + "components:test": "react-app-rewired test --watchAll=false", + "components:lint": "prettier --write 'src/**/*.{html,css,scss,js,jsx,ts,tsx,json}' README.md" }, "eslintConfig": { "extends": [ diff --git a/packages/components/src/org.standardnotes.advanced-markdown-editor/package.json b/packages/components/src/org.standardnotes.advanced-markdown-editor/package.json index da0b9091a..c5a8cc1da 100644 --- a/packages/components/src/org.standardnotes.advanced-markdown-editor/package.json +++ b/packages/components/src/org.standardnotes.advanced-markdown-editor/package.json @@ -11,9 +11,9 @@ }, "scripts": { "start": "webpack serve --config webpack.dev.js --progress --hot", - "compile": "webpack --config webpack.prod.js", - "custom:lint": "eslint src --ext .js", - "custom:lint:fix": "yarn lint --fix" + "components:compile": "webpack --config webpack.prod.js", + "components:lint": "eslint src --ext .js", + "components:lint:fix": "yarn lint --fix" }, "devDependencies": { "@babel/cli": "^7.13.10", diff --git a/packages/components/src/org.standardnotes.bold-editor/package.json b/packages/components/src/org.standardnotes.bold-editor/package.json index f23bd0f01..eef624d7e 100644 --- a/packages/components/src/org.standardnotes.bold-editor/package.json +++ b/packages/components/src/org.standardnotes.bold-editor/package.json @@ -4,9 +4,9 @@ "version": "1.3.5", "main": "dist/dist.js", "scripts": { - "custom:lint": "eslint app/ --ext .js", - "custom:lint:fix": "yarn lint --fix", - "compile": "webpack --config webpack.prod.js", + "components:lint": "eslint app/ --ext .js", + "components:lint:fix": "yarn lint --fix", + "components:compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot" }, "sn": { diff --git a/packages/components/src/org.standardnotes.code-editor/package.json b/packages/components/src/org.standardnotes.code-editor/package.json index b9f8f045f..75a6c8e3a 100644 --- a/packages/components/src/org.standardnotes.code-editor/package.json +++ b/packages/components/src/org.standardnotes.code-editor/package.json @@ -8,9 +8,10 @@ "license": "AGPL-3.0", "scripts": { "start": "http-server . --cors -p8001 & webpack --progress --config webpack.dev.js", - "compile": "webpack --config webpack.prod.js", - "custom:lint": "eslint src --ext .js", - "custom:lint:fix": "yarn lint --fix" + "components:compile": "webpack --config webpack.prod.js", + "components:lint": "eslint src --ext .js", + "components:lint:fix": "yarn lint --fix", + "components:clean": "rm -rf ./vendor" }, "devDependencies": { "@babel/cli": "^7.12.10", @@ -23,7 +24,6 @@ "eslint": "*", "http-server": "^0.12.3", "mini-css-extract-plugin": "^1.3.5", - "remove-files-webpack-plugin": "^1.4.4", "sass": "*", "sass-loader": "^10.1.1", "sn-stylekit": "^2.1.1", diff --git a/packages/components/src/org.standardnotes.code-editor/webpack.config.js b/packages/components/src/org.standardnotes.code-editor/webpack.config.js index e8c2e90fa..de83d15c1 100644 --- a/packages/components/src/org.standardnotes.code-editor/webpack.config.js +++ b/packages/components/src/org.standardnotes.code-editor/webpack.config.js @@ -1,7 +1,6 @@ const path = require('path') const CopyPlugin = require('copy-webpack-plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin') -const RemovePlugin = require('remove-files-webpack-plugin') module.exports = { entry: [path.resolve(__dirname, 'src', 'main.js'), path.resolve(__dirname, 'src', 'main.scss')], @@ -49,14 +48,5 @@ module.exports = { filename: '[name].css', chunkFilename: '[id].css', }), - new RemovePlugin({ - /** - * Before compilation, remove existing `./vendor` folder. - * It will be re-created later by the CopyPlugin. - */ - before: { - include: ['./vendor'], - }, - }), ], } diff --git a/packages/components/src/org.standardnotes.fancy-markdown-editor/package.json b/packages/components/src/org.standardnotes.fancy-markdown-editor/package.json index db0eb7222..5b116f1d6 100644 --- a/packages/components/src/org.standardnotes.fancy-markdown-editor/package.json +++ b/packages/components/src/org.standardnotes.fancy-markdown-editor/package.json @@ -5,7 +5,7 @@ "description": "", "main": "index.js", "scripts": { - "compile": "grunt" + "components:compile": "grunt" }, "author": "Standard Notes", "devDependencies": { diff --git a/packages/components/src/org.standardnotes.markdown-visual-editor/package.json b/packages/components/src/org.standardnotes.markdown-visual-editor/package.json index c6959a118..e87bfe8e7 100644 --- a/packages/components/src/org.standardnotes.markdown-visual-editor/package.json +++ b/packages/components/src/org.standardnotes.markdown-visual-editor/package.json @@ -15,9 +15,9 @@ "scripts": { "analyze": "source-map-explorer 'build/static/js/*.js'", "start": "react-app-rewired start", - "compile": "react-app-rewired build", + "components:compile": "react-app-rewired build", "eject": "react-scripts eject", - "compile:lint": "prettier --write 'src/**/*.{html,css,scss,js,jsx,ts,tsx,json}' README.md" + "components:lint": "prettier --write 'src/**/*.{html,css,scss,js,jsx,ts,tsx,json}' README.md" }, "devDependencies": { "@codemirror/lang-markdown": "^0.19.6", diff --git a/packages/components/src/org.standardnotes.minimal-markdown-editor/package.json b/packages/components/src/org.standardnotes.minimal-markdown-editor/package.json index 44247ec47..f811386d3 100644 --- a/packages/components/src/org.standardnotes.minimal-markdown-editor/package.json +++ b/packages/components/src/org.standardnotes.minimal-markdown-editor/package.json @@ -6,7 +6,7 @@ "main": "dist/dist.js", "author": "Standard Notes ", "scripts": { - "compile": "grunt" + "components:compile": "grunt" }, "devDependencies": { "@babel/core": "^7.11.1", diff --git a/packages/components/src/org.standardnotes.plus-editor/package.json b/packages/components/src/org.standardnotes.plus-editor/package.json index f653379a7..e22cfcf4a 100644 --- a/packages/components/src/org.standardnotes.plus-editor/package.json +++ b/packages/components/src/org.standardnotes.plus-editor/package.json @@ -6,8 +6,8 @@ "main": "dist/dist.js", "author": "Standard Notes ", "scripts": { - "custom:lint": "eslint --ext .js .", - "compile": "webpack --config webpack.prod.js", + "components:lint": "eslint --ext .js .", + "components:compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot" }, "sn": { diff --git a/packages/components/src/org.standardnotes.simple-markdown-editor/package.json b/packages/components/src/org.standardnotes.simple-markdown-editor/package.json index ca10d67f5..3656a62fe 100644 --- a/packages/components/src/org.standardnotes.simple-markdown-editor/package.json +++ b/packages/components/src/org.standardnotes.simple-markdown-editor/package.json @@ -4,8 +4,8 @@ "version": "1.4.2", "main": "dist/dist.js", "scripts": { - "custom:lint": "eslint --cache --ext .jsx,.js --format=node_modules/eslint-formatter-pretty .", - "compile": "webpack", + "components:lint": "eslint --cache --ext .jsx,.js --format=node_modules/eslint-formatter-pretty .", + "components:compile": "webpack", "start": "webpack-dev-server --devtool eval --progress --port 8001 --hot --content-base app", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1" }, diff --git a/packages/components/src/org.standardnotes.simple-task-editor/package.json b/packages/components/src/org.standardnotes.simple-task-editor/package.json index 34e146a26..5e96410cc 100644 --- a/packages/components/src/org.standardnotes.simple-task-editor/package.json +++ b/packages/components/src/org.standardnotes.simple-task-editor/package.json @@ -4,10 +4,10 @@ "version": "1.3.10", "main": "dist/dist.js", "scripts": { - "compile": "webpack --config webpack.prod.js", + "components:compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot", - "custom:lint": "eslint app/ --ext .js", - "custom:lint:fix": "yarn lint --fix" + "components:lint": "eslint app/ --ext .js", + "components:lint:fix": "yarn lint --fix" }, "sn": { "main": "dist/index.html" diff --git a/packages/components/src/org.standardnotes.standard-sheets/package.json b/packages/components/src/org.standardnotes.standard-sheets/package.json index 192aa52d7..59963f7a2 100644 --- a/packages/components/src/org.standardnotes.standard-sheets/package.json +++ b/packages/components/src/org.standardnotes.standard-sheets/package.json @@ -4,9 +4,9 @@ "version": "1.4.4", "main": "dist/dist.js", "scripts": { - "custom:lint": "eslint app/ --ext .js", - "custom:lint:fix": "npm run lint -- --fix", - "compile": "webpack --config webpack.prod.js", + "components:lint": "eslint app/ --ext .js", + "components:lint:fix": "npm run lint -- --fix", + "components:compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1" }, diff --git a/packages/components/src/org.standardnotes.theme-autobiography/package.json b/packages/components/src/org.standardnotes.theme-autobiography/package.json index d5546f440..f66d3753f 100644 --- a/packages/components/src/org.standardnotes.theme-autobiography/package.json +++ b/packages/components/src/org.standardnotes.theme-autobiography/package.json @@ -7,6 +7,6 @@ "main": "dist/dist.css" }, "scripts": { - "compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" + "components:compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" } } diff --git a/packages/components/src/org.standardnotes.theme-dynamic/package.json b/packages/components/src/org.standardnotes.theme-dynamic/package.json index 1a6d1ea18..facb8c32a 100644 --- a/packages/components/src/org.standardnotes.theme-dynamic/package.json +++ b/packages/components/src/org.standardnotes.theme-dynamic/package.json @@ -7,6 +7,6 @@ "main": "dist/dist.css" }, "scripts": { - "compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" + "components:compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" } } diff --git a/packages/components/src/org.standardnotes.theme-focus/package.json b/packages/components/src/org.standardnotes.theme-focus/package.json index 690cdbedf..12558e398 100644 --- a/packages/components/src/org.standardnotes.theme-focus/package.json +++ b/packages/components/src/org.standardnotes.theme-focus/package.json @@ -7,6 +7,6 @@ "main": "dist/dist.css" }, "scripts": { - "compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" + "components:compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" } } diff --git a/packages/components/src/org.standardnotes.theme-futura/package.json b/packages/components/src/org.standardnotes.theme-futura/package.json index 98c9429cc..7031b6c60 100644 --- a/packages/components/src/org.standardnotes.theme-futura/package.json +++ b/packages/components/src/org.standardnotes.theme-futura/package.json @@ -7,6 +7,6 @@ "main": "dist/dist.css" }, "scripts": { - "compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" + "components:compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" } } diff --git a/packages/components/src/org.standardnotes.theme-midnight/package.json b/packages/components/src/org.standardnotes.theme-midnight/package.json index fcf353fd9..91b3f840c 100644 --- a/packages/components/src/org.standardnotes.theme-midnight/package.json +++ b/packages/components/src/org.standardnotes.theme-midnight/package.json @@ -7,6 +7,6 @@ "main": "dist/dist.css" }, "scripts": { - "compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" + "components:compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" } } diff --git a/packages/components/src/org.standardnotes.theme-solarized-dark/package.json b/packages/components/src/org.standardnotes.theme-solarized-dark/package.json index a21e8e688..29ee62615 100644 --- a/packages/components/src/org.standardnotes.theme-solarized-dark/package.json +++ b/packages/components/src/org.standardnotes.theme-solarized-dark/package.json @@ -7,6 +7,6 @@ "main": "dist/dist.css" }, "scripts": { - "compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" + "components:compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" } } diff --git a/packages/components/src/org.standardnotes.theme-titanium/package.json b/packages/components/src/org.standardnotes.theme-titanium/package.json index f63ac45a6..7674d50d4 100644 --- a/packages/components/src/org.standardnotes.theme-titanium/package.json +++ b/packages/components/src/org.standardnotes.theme-titanium/package.json @@ -7,6 +7,6 @@ "main": "dist/dist.css" }, "scripts": { - "compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" + "components:compile": "webpack --entry ./src/main.scss --config ./../../theme.webpack.config.js" } } diff --git a/packages/components/src/org.standardnotes.token-vault/package.json b/packages/components/src/org.standardnotes.token-vault/package.json index a1bffd554..183417c68 100644 --- a/packages/components/src/org.standardnotes.token-vault/package.json +++ b/packages/components/src/org.standardnotes.token-vault/package.json @@ -3,10 +3,10 @@ "version": "2.0.10", "main": "dist/dist.js", "scripts": { - "compile": "webpack --config webpack.prod.js", + "components:compile": "webpack --config webpack.prod.js", "start": "webpack serve --config webpack.dev.js --progress --hot", - "custom:lint": "eslint app/ --ext .js", - "custom:lint:fix": "yarn lint --fix" + "components:lint": "eslint app/ --ext .js", + "components:lint:fix": "yarn lint --fix" }, "sn": { "main": "dist/index.html"