Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Escape script quotes #303

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Escape script quotes #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deffe7e
Escape quotes in addon's package.json scripts
fdeters Oct 8, 2024
a27dcf4
Escape quotes in root-level package.json scripts
fdeters Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions files/__addonLocation__/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
"dist"
],
"scripts": {<% if (typescript) { %>
"build": "concurrently '<%= packageManager %>:build:*'",
"build": "concurrently \"<%= packageManager %>:build:*\"",
"build:js": "rollup --config",
"build:types": "glint --declaration",<% } else { %>
"build": "rollup --config",<% } %>
"lint": "concurrently '<%= packageManager %>:lint:*(!fix)' --names 'lint:'",
"lint:fix": "concurrently '<%= packageManager %>:lint:*:fix' --names 'fix:'",
"lint": "concurrently \"<%= packageManager %>:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"<%= packageManager %>:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern",
"lint:js": "eslint . --cache",
"lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
"lint:js:fix": "eslint . --fix",<% if (typescript) { %>
"lint:types": "glint",
"start": "concurrently '<%= packageManager %>:start:*'",
"start": "concurrently \"<%= packageManager %>:start:*\"",
"start:js": "rollup --config --watch --no-watch.clearScreen",
"start:types": "glint --declaration --watch",<% } else { %>
"start": "rollup --config --watch",<% } %>
"test": "echo 'A v2 addon does not have tests, run tests in test-app'",
"prepack": <% if (typescript) { %>"concurrently '<%= packageManager %>:build:*'"<% } else { %>"rollup --config"<% } %>
"test": "echo \"A v2 addon does not have tests, run tests in test-app\"",
"prepack": <% if (typescript) { %>"concurrently \"<%= packageManager %>:build:*\""<% } else { %>"rollup --config"<% } %>
},
"dependencies": {
"@embroider/addon-shim": "^1.8.7",
Expand Down
14 changes: 7 additions & 7 deletions src/root-package-json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ let scripts = {
lint: 'npm run lint --workspaces --if-present',
'lint:fix': 'npm run lint:fix --workspaces --if-present',
prepare: 'npm run build',
start: "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
start: "concurrently \"npm:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow",
'start:addon': `npm start --workspace ${addonName} -- --no-watch.clearScreen`,
'start:test-app': `npm start --workspace ${testAppName}`,
test: 'npm run test --workspaces --if-present',
Expand All @@ -73,7 +73,7 @@ let scripts = {
lint: 'yarn workspaces run lint',
'lint:fix': 'yarn workspaces run lint:fix',
prepare: 'yarn build',
start: "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
start: "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow",
'start:addon': `yarn workspace ${addonName} run start`,
'start:test-app': `yarn workspace ${testAppName} run start`,
test: 'yarn workspaces run test',
Expand All @@ -94,8 +94,8 @@ let scripts = {

return {
build: `pnpm --filter ${addonName} build`,
lint: "pnpm --filter '*' lint",
'lint:fix': "pnpm --filter '*' lint:fix",
lint: "pnpm --filter \"*\" lint",
'lint:fix': "pnpm --filter \"*\" lint:fix",
/**
* For most optimized C.I., this will likely want to be removed, but
* the prepare scripts helps folks get going quicker without having to understand
Expand All @@ -110,7 +110,7 @@ let scripts = {
*
* Colors are customizable
*/
start: "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
start: "concurrently \"pnpm:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow",
'start:addon': `pnpm --filter ${addonName} start --no-watch.clearScreen`,
'start:test-app': `pnpm --filter ${testAppName} start`,
/**
Expand All @@ -119,8 +119,8 @@ let scripts = {
* package.json script -- but will be present in C.I.
* (this is a consequence of enforced strict peers)
*/
test: "pnpm --filter '*' test",
'test:ember': "pnpm --filter '*' test:ember",
test: "pnpm --filter \"*\" test",
'test:ember': "pnpm --filter \"*\" test:ember",
};
},
};
Loading