Skip to content

Commit

Permalink
fixes CRLF issue - maybe
Browse files Browse the repository at this point in the history
Here my repo after following the guide and staging everything.
Regarding OfficeDev#168
  • Loading branch information
bockstaller committed Jan 24, 2022
1 parent 5245ecd commit d5b359a
Show file tree
Hide file tree
Showing 23 changed files with 57,457 additions and 109,969 deletions.
9,204 changes: 2,210 additions & 6,994 deletions packages/custom-functions-metadata-plugin/package-lock.json

Large diffs are not rendered by default.

9,156 changes: 2,333 additions & 6,823 deletions packages/custom-functions-metadata/package-lock.json

Large diffs are not rendered by default.

8,058 changes: 2,673 additions & 5,385 deletions packages/eslint-config-office-addins/package-lock.json

Large diffs are not rendered by default.

34,247 changes: 16,206 additions & 18,041 deletions packages/eslint-plugin-excel-custom-functions/package-lock.json

Large diffs are not rendered by default.

93 changes: 43 additions & 50 deletions packages/eslint-plugin-office-addins/package.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,45 @@
{
"name": "eslint-plugin-office-addins",
"version": "1.1.4",
"description": "eslint plugin for office-addins",
"keywords": [
"eslint",
"eslintplugin",
"eslint-plugin"
],
"author": "OfficeDev",
"main": "lib/main.js",
"scripts": {
"build": "rimraf lib && concurrently \"tsc -p tsconfig.json\"",
"lint": "eslint src/**/*.{ts,tsx,js,jsx} --rulesdir lib/rules/",
"lint:fix": "eslint src/**/*.{ts,tsx,js,jsx} --rulesdir lib/rules/ --fix",
"test": "jest"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "^4.31.0",
"@typescript-eslint/experimental-utils": "^4.31.0",
"@typescript-eslint/parser": "^4.31.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-react-native": "^3.11.0",
"office-addin-prettier-config": "^1.1.3",
"prettier": "^2.4.0",
"requireindex": "~1.2.0",
"typescript": "^4.4.2"
},
"devDependencies": {
"@types/jest": "^27.0.1",
"@types/node": "^14.17.2",
"concurrently": "^6.2.1",
"jest": "^27.2.4",
"rimraf": "^3.0.2",
"ts-jest": "^27.0.5"
},
"engines": {
"node": ">=0.10.0"
},
"repository": {
"type": "git",
"url": "https://github.com/OfficeDev/Office-Addin-Scripts"
},
"bugs": {
"url": "https://github.com/OfficeDev/Office-Addin-Scripts/issues"
},
"license": "MIT",
"gitHead": "dffbcd4d1397534105b98fb13ba0fb1c3aba2dea"
"name": "eslint-plugin-office-addins",
"version": "1.1.4",
"description": "eslint plugin for office-addins",
"keywords": [
"eslint",
"eslintplugin",
"eslint-plugin"
],
"author": "OfficeDev",
"main": "lib/main.js",
"dependencies": {
"@typescript-eslint/eslint-plugin": "^4.31.0",
"@typescript-eslint/experimental-utils": "^4.31.0",
"@typescript-eslint/parser": "^4.31.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-react-native": "^3.11.0",
"prettier": "^2.4.0",
"requireindex": "~1.2.0",
"typescript": "^4.4.2"
},
"devDependencies": {
"@types/jest": "^27.0.1",
"@types/node": "^14.17.2",
"concurrently": "^6.2.1",
"jest": "^27.2.4",
"rimraf": "^3.0.2",
"ts-jest": "^27.0.5"
},
"engines": {
"node": ">=0.10.0"
},
"repository": {
"type": "git",
"url": "https://github.com/OfficeDev/Office-Addin-Scripts"
},
"bugs": {
"url": "https://github.com/OfficeDev/Office-Addin-Scripts/issues"
},
"license": "MIT",
"gitHead": "dffbcd4d1397534105b98fb13ba0fb1c3aba2dea"
}
95 changes: 42 additions & 53 deletions packages/office-addin-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,55 +1,44 @@
{
"name": "office-addin-cli",
"version": "1.3.4",
"description": "A command-line interface for Office Add-ins.",
"main": "./lib/main.js",
"scripts": {
"build": "rimraf lib && concurrently \"tsc -p tsconfig.json\"",
"cli": "node lib/cli.js",
"lint": "eslint src/**/*.{ts,tsx,js,jsx}",
"lint:fix": "eslint src/**/*.{ts,tsx,js,jsx} --fix",
"start": "rimraf lib && concurrently \"npm run watch\"",
"test": "mocha -r ts-node/register test/**/*.ts",
"watch": "tsc -p tsconfig.json -w"
},
"author": "Office Dev",
"license": "MIT",
"bin": {
"office-addin-cli": "./cli.js"
},
"keywords": [
"Office"
],
"dependencies": {
"commander": "^6.2.1",
"node-fetch": "^2.6.1",
"read-package-json-fast": "^2.0.2"
},
"devDependencies": {
"@types/mocha": "^8.2.2",
"@types/node": "^14.17.2",
"@types/node-fetch": "^2.5.10",
"@types/sinon": "^7.5.2",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"concurrently": "^6.2.2",
"eslint": "7.32.0",
"eslint-plugin-office-addins": "^1.1.4",
"eslint-plugin-prettier": "^3.4.0",
"mocha": "^9.1.1",
"office-addin-prettier-config": "^1.1.3",
"prettier": "^2.1.2",
"rimraf": "^3.0.2",
"sinon": "^7.5.0",
"ts-node": "^10.1.0",
"typescript": "^4.3.5"
},
"repository": {
"type": "git",
"url": "https://github.com/OfficeDev/Office-Addin-Scripts"
},
"bugs": {
"url": "https://github.com/OfficeDev/Office-Addin-Scripts/issues"
},
"prettier": "office-addin-prettier-config",
"gitHead": "dffbcd4d1397534105b98fb13ba0fb1c3aba2dea"
"name": "office-addin-cli",
"version": "1.3.4",
"description": "A command-line interface for Office Add-ins.",
"main": "./lib/main.js",
"author": "Office Dev",
"license": "MIT",
"bin": {
"office-addin-cli": "./cli.js"
},
"keywords": [
"Office"
],
"dependencies": {
"commander": "^6.2.1",
"node-fetch": "^2.6.1",
"read-package-json-fast": "^2.0.2"
},
"devDependencies": {
"@types/mocha": "^8.2.2",
"@types/node": "^14.17.2",
"@types/node-fetch": "^2.5.10",
"@types/sinon": "^7.5.2",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"concurrently": "^6.2.2",
"eslint": "7.32.0",
"eslint-plugin-prettier": "^3.4.0",
"mocha": "^9.1.1",
"prettier": "^2.1.2",
"rimraf": "^3.0.2",
"sinon": "^7.5.0",
"ts-node": "^10.1.0",
"typescript": "^4.3.5"
},
"repository": {
"type": "git",
"url": "https://github.com/OfficeDev/Office-Addin-Scripts"
},
"bugs": {
"url": "https://github.com/OfficeDev/Office-Addin-Scripts/issues"
},
"prettier": "office-addin-prettier-config",
"gitHead": "dffbcd4d1397534105b98fb13ba0fb1c3aba2dea"
}
Loading

1 comment on commit d5b359a

@millerds
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to change a lot more then would be needed for fixing line ending and includes change that would break the dev process (scripts section being removed from package.json). The only thing changed in the package being discussed in the other issue is the lock file and it's impossible to see what specifically made a difference since the whole file seems to be changed.

Please sign in to comment.