Skip to content

Commit 25eba02

Browse files
wjhsfwjhsf
authored
chore(copyright): update rollup config to use correct copyright (#3967)
new legal name (since 2022) and always use current year
1 parent d9ada42 commit 25eba02

File tree

2 files changed

+110
-104
lines changed

2 files changed

+110
-104
lines changed

‎.eslintrc

Lines changed: 107 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,16 @@
66
"sourceType": "module"
77
},
88

9-
"plugins": [
10-
"jest",
11-
"@lwc/lwc-internal",
12-
"@typescript-eslint",
13-
"import",
14-
"header"
15-
],
16-
"extends": [
17-
"eslint:recommended",
18-
"plugin:@typescript-eslint/eslint-recommended"
19-
],
9+
"plugins": ["jest", "@lwc/lwc-internal", "@typescript-eslint", "import", "header"],
10+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended"],
2011

2112
"env": {
2213
"es6": true
2314
},
2415

2516
"rules": {
2617
"no-unused-vars": "off",
27-
"@typescript-eslint/no-unused-vars": [
28-
"error",
29-
{ "argsIgnorePattern": "^_" }
30-
],
18+
"@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
3119

3220
"block-scoped-var": "error",
3321
"no-alert": "error",
@@ -42,92 +30,121 @@
4230
"no-proto": "error",
4331
"no-prototype-builtins": "error",
4432
"no-new-require": "error",
45-
"no-restricted-properties": ["error", {
46-
"object": "arguments",
47-
"property": "callee",
48-
"message": "arguments.callee is deprecated"
49-
}, {
50-
"object": "global",
51-
"property": "isFinite",
52-
"message": "Please use Number.isFinite instead"
53-
}, {
54-
"object": "self",
55-
"property": "isFinite",
56-
"message": "Please use Number.isFinite instead"
57-
}, {
58-
"object": "window",
59-
"property": "isFinite",
60-
"message": "Please use Number.isFinite instead"
61-
}, {
62-
"object": "global",
63-
"property": "isNaN",
64-
"message": "Please use Number.isNaN instead"
65-
}, {
66-
"object": "self",
67-
"property": "isNaN",
68-
"message": "Please use Number.isNaN instead"
69-
}, {
70-
"object": "window",
71-
"property": "isNaN",
72-
"message": "Please use Number.isNaN instead"
73-
}, {
74-
"property": "__defineGetter__",
75-
"message": "Please use Object.defineProperty instead."
76-
}, {
77-
"property": "__defineSetter__",
78-
"message": "Please use Object.defineProperty instead."
79-
}, {
80-
"object": "Math",
81-
"property": "pow",
82-
"message": "Use the exponentiation operator (**) instead."
83-
}, {
84-
"object": "globalThis",
85-
"property": "lwcRuntimeFlags",
86-
"message": "Use the bare global lwcRuntimeFlags instead."
87-
}],
33+
"no-restricted-properties": [
34+
"error",
35+
{
36+
"object": "arguments",
37+
"property": "callee",
38+
"message": "arguments.callee is deprecated"
39+
},
40+
{
41+
"object": "global",
42+
"property": "isFinite",
43+
"message": "Please use Number.isFinite instead"
44+
},
45+
{
46+
"object": "self",
47+
"property": "isFinite",
48+
"message": "Please use Number.isFinite instead"
49+
},
50+
{
51+
"object": "window",
52+
"property": "isFinite",
53+
"message": "Please use Number.isFinite instead"
54+
},
55+
{
56+
"object": "global",
57+
"property": "isNaN",
58+
"message": "Please use Number.isNaN instead"
59+
},
60+
{
61+
"object": "self",
62+
"property": "isNaN",
63+
"message": "Please use Number.isNaN instead"
64+
},
65+
{
66+
"object": "window",
67+
"property": "isNaN",
68+
"message": "Please use Number.isNaN instead"
69+
},
70+
{
71+
"property": "__defineGetter__",
72+
"message": "Please use Object.defineProperty instead."
73+
},
74+
{
75+
"property": "__defineSetter__",
76+
"message": "Please use Object.defineProperty instead."
77+
},
78+
{
79+
"object": "Math",
80+
"property": "pow",
81+
"message": "Use the exponentiation operator (**) instead."
82+
},
83+
{
84+
"object": "globalThis",
85+
"property": "lwcRuntimeFlags",
86+
"message": "Use the bare global lwcRuntimeFlags instead."
87+
}
88+
],
8889
"no-self-compare": "error",
8990
"no-undef-init": "error",
9091
"no-useless-computed-key": "error",
9192
"no-useless-return": "error",
92-
"prefer-const": ["error", {
93-
"destructuring": "any",
94-
"ignoreReadBeforeAssign": true
95-
}],
93+
"prefer-const": [
94+
"error",
95+
{
96+
"destructuring": "any",
97+
"ignoreReadBeforeAssign": true
98+
}
99+
],
96100
"template-curly-spacing": "error",
97101
"yoda": "error",
98102

99103
"@lwc/lwc-internal/no-invalid-todo": "error",
100104
"import/order": [
101105
"error",
102-
{ "groups": ["builtin", "external", "internal", "parent", "index", "sibling", "object", "type"] }
106+
{
107+
"groups": [
108+
"builtin",
109+
"external",
110+
"internal",
111+
"parent",
112+
"index",
113+
"sibling",
114+
"object",
115+
"type"
116+
]
117+
}
118+
],
119+
"no-restricted-imports": [
120+
"error",
121+
{
122+
"name": "@lwc/features",
123+
"importNames": ["lwcRuntimeFlags", "runtimeFlags", "default"],
124+
"message": "Do not directly import runtime flags from @lwc/features. Use the global lwcRuntimeFlags variable instead."
125+
}
103126
],
104-
"no-restricted-imports": ["error", {
105-
"name": "@lwc/features",
106-
"importNames": ["lwcRuntimeFlags", "runtimeFlags", "default"],
107-
"message": "Do not directly import runtime flags from @lwc/features. Use the global lwcRuntimeFlags variable instead."
108-
}],
109127
"header/header": [
110128
2,
111129
"block",
112130
[
113-
"",
114-
{
115-
"pattern": "^ \\* Copyright \\(c\\) \\d{4}, ([sS]alesforce.com, inc|Salesforce, Inc)\\.$",
116-
"template": " * Copyright (c) 2024, Salesforce, Inc."
117-
},
118-
" * All rights reserved.",
119-
" * SPDX-License-Identifier: MIT",
120-
" * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT",
121-
" "
131+
"",
132+
{
133+
"pattern": "^ \\* Copyright \\(c\\) \\d{4}, ([sS]alesforce.com, inc|Salesforce, Inc)\\.$",
134+
// This copyright text should match the text used in the rollup config
135+
"template": " * Copyright (c) 2024, Salesforce, Inc."
136+
},
137+
" * All rights reserved.",
138+
" * SPDX-License-Identifier: MIT",
139+
" * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT",
140+
" "
122141
]
123-
]
142+
]
124143
},
125144

126145
"overrides": [
127146
{
128-
"files": [
129-
"**/packages/lwc/**"
130-
],
147+
"files": ["**/packages/lwc/**"],
131148
"rules": {
132149
"no-restricted-imports": "off"
133150
}
@@ -145,11 +162,7 @@
145162
}
146163
},
147164
{
148-
"files": [
149-
"**/__tests__/**",
150-
"**/__mocks__/**",
151-
"**/@lwc/integration-karma/**"
152-
],
165+
"files": ["**/__tests__/**", "**/__mocks__/**", "**/@lwc/integration-karma/**"],
153166

154167
"env": {
155168
"jest": true,
@@ -165,21 +178,15 @@
165178
}
166179
},
167180
{
168-
"files": [
169-
"**/@lwc/integration-tests/**"
170-
],
181+
"files": ["**/@lwc/integration-tests/**"],
171182

172183
"globals": {
173184
"$": true,
174185
"browser": true
175186
}
176187
},
177188
{
178-
"files": [
179-
"./*.js",
180-
"**/scripts/**",
181-
"**/jest.config.js"
182-
],
189+
"files": ["./*.js", "**/scripts/**", "**/jest.config.js"],
183190

184191
"env": {
185192
"node": true,
@@ -191,9 +198,7 @@
191198
}
192199
},
193200
{
194-
"files": [
195-
"**/perf-benchmarks/**"
196-
],
201+
"files": ["**/perf-benchmarks/**"],
197202

198203
"globals": {
199204
"after": true,
@@ -204,13 +209,13 @@
204209
},
205210
{
206211
"files": [
207-
"packages/@lwc/integration-tests/src/**/!(*.spec.js)",
208-
"packages/@lwc/integration-karma/test/**",
209-
"packages/@lwc/integration-karma/test-hydration/**"
212+
"packages/@lwc/integration-tests/src/**/!(*.spec.js)",
213+
"packages/@lwc/integration-karma/test/**",
214+
"packages/@lwc/integration-karma/test-hydration/**"
210215
],
211216
"rules": {
212-
"header/header": "off"
217+
"header/header": "off"
213218
}
214-
}
219+
}
215220
]
216221
}

‎scripts/rollup/rollup.config.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, salesforce.com, inc.
2+
* Copyright (c) 2024, Salesforce, Inc.
33
* All rights reserved.
44
* SPDX-License-Identifier: MIT
55
* For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
@@ -19,7 +19,8 @@ const { nodeResolve } = require('@rollup/plugin-node-resolve');
1919
const packageRoot = process.cwd();
2020
const packageJson = JSON.parse(readFileSync(path.resolve(packageRoot, './package.json'), 'utf-8'));
2121
const { name: packageName, version, dependencies, peerDependencies } = packageJson;
22-
let banner = `/**\n * Copyright (C) 2023 salesforce.com, inc.\n */`;
22+
// This copyright text should match the text in the header/header eslint rule
23+
let banner = `/**\n * Copyright (c) ${new Date().getFullYear()} Salesforce, Inc.\n */`;
2324
let footer = `/** version: ${version} */`;
2425
const { ROLLUP_WATCH: watchMode } = process.env;
2526
const formats = ['es', 'cjs'];

0 commit comments

Comments
 (0)