javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle empty env for app resources

Browse Source
This commit is contained in:
Igor Randjelovic
2021-03-02 18:49:51 +01:00
committed by Nathan Walker
parent 84fdc11a8d
commit d3e51bbd33
10 changed files with 53 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
View File

@ -219,9 +219,7 @@ exports[`angular configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -230,9 +228,7 @@ exports[`angular configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -241,9 +237,7 @@ exports[`angular configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]
@ -490,9 +484,7 @@ exports[`angular configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -501,9 +493,7 @@ exports[`angular configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -512,9 +502,7 @@ exports[`angular configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]

24
packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap
View File

@ -228,9 +228,7 @@ exports[`javascript configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -239,9 +237,7 @@ exports[`javascript configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -250,9 +246,7 @@ exports[`javascript configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]
@ -509,9 +503,7 @@ exports[`javascript configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -520,9 +512,7 @@ exports[`javascript configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -531,9 +521,7 @@ exports[`javascript configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]

48
packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap
View File

@ -234,9 +234,7 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -245,9 +243,7 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -256,9 +252,7 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]
@ -510,9 +504,7 @@ exports[`react configuration > android > base config 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -521,9 +513,7 @@ exports[`react configuration > android > base config 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -532,9 +522,7 @@ exports[`react configuration > android > base config 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]
@ -786,9 +774,7 @@ exports[`react configuration > ios > adds ReactRefreshWebpackPlugin when HMR ena
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -797,9 +783,7 @@ exports[`react configuration > ios > adds ReactRefreshWebpackPlugin when HMR ena
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -808,9 +792,7 @@ exports[`react configuration > ios > adds ReactRefreshWebpackPlugin when HMR ena
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]
@ -1065,9 +1047,7 @@ exports[`react configuration > ios > base config 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -1076,9 +1056,7 @@ exports[`react configuration > ios > base config 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -1087,9 +1065,7 @@ exports[`react configuration > ios > base config 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]

24
packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap
View File

@ -242,9 +242,7 @@ exports[`svelte configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -253,9 +251,7 @@ exports[`svelte configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -264,9 +260,7 @@ exports[`svelte configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]
@ -526,9 +520,7 @@ exports[`svelte configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -537,9 +529,7 @@ exports[`svelte configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -548,9 +538,7 @@ exports[`svelte configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]

24
packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap
View File

@ -249,9 +249,7 @@ exports[`vue configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -260,9 +258,7 @@ exports[`vue configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -271,9 +267,7 @@ exports[`vue configuration for android 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]
@ -540,9 +534,7 @@ exports[`vue configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -551,9 +543,7 @@ exports[`vue configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
}, },
{ {
@ -562,9 +552,7 @@ exports[`vue configuration for ios 1`] = `
noErrorOnMissing: true, noErrorOnMissing: true,
globOptions: { globOptions: {
dot: false, dot: false,
ignore: [ ignore: []
'../**'
]
} }
} }
] ]

2
packages/webpack5/__tests__/configuration/angular.spec.ts
View File

@ -14,7 +14,7 @@ jest.mock(
{ virtual: true } { virtual: true }
); );
describe.only('angular configuration', () => { describe('angular configuration', () => {
const platforms = ['ios', 'android']; const platforms = ['ios', 'android'];
for (let platform of platforms) { for (let platform of platforms) {

2
packages/webpack5/__tests__/configuration/javascript.spec.ts
View File

@ -2,7 +2,7 @@ import Config from 'webpack-chain';
import javascript from '../../src/configuration/javascript'; import javascript from '../../src/configuration/javascript';
import { init } from '../../src'; import { init } from '../../src';
describe.only('javascript configuration', () => { describe('javascript configuration', () => {
const platforms = ['ios', 'android']; const platforms = ['ios', 'android'];
for (let platform of platforms) { for (let platform of platforms) {

2
packages/webpack5/__tests__/configuration/svelte.spec.ts
View File

@ -7,7 +7,7 @@ mockFile('./svelte.config.js', '');
// jest.mock('__jest__/svelte.config.js', () => { // jest.mock('__jest__/svelte.config.js', () => {
// }, { virtual: true }) // }, { virtual: true })
describe.only('svelte configuration', () => { describe('svelte configuration', () => {
const platforms = ['ios', 'android']; const platforms = ['ios', 'android'];
for (let platform of platforms) { for (let platform of platforms) {

2
packages/webpack5/__tests__/configuration/vue.spec.ts
View File

@ -2,7 +2,7 @@ import Config from 'webpack-chain';
import vue from '../../src/configuration/vue'; import vue from '../../src/configuration/vue';
import { init } from '../../src'; import { init } from '../../src';
describe.only('vue configuration', () => { describe('vue configuration', () => {
const platforms = ['ios', 'android']; const platforms = ['ios', 'android'];
for (let platform of platforms) { for (let platform of platforms) {

24
packages/webpack5/src/helpers/copyRules.ts
View File

@ -41,21 +41,23 @@ export function removeCopyRule(glob: string) {
*/ */
export function applyCopyRules(config: Config) { export function applyCopyRules(config: Config) {
const entryDir = getEntryDirPath(); const entryDir = getEntryDirPath();
// todo: handle empty appResourcesPath?
// (the CLI should always pass the path - maybe not required)
const appResourcesFullPath = resolve(
getProjectRootPath(),
env.appResourcesPath
);
const globOptions = { const globOptions = {
dot: false, dot: false,
ignore: [ ignore: [],
// ignore everything in App_Resources (regardless where they are located)
`${relative(entryDir, appResourcesFullPath)}/**`,
],
}; };
// todo: do we need to handle empty appResourcesPath?
// (the CLI should always pass the path - maybe not required)
if (env.appResourcesPath) {
const appResourcesFullPath = resolve(
getProjectRootPath(),
env.appResourcesPath
);
// ignore everything in App_Resources (regardless where they are located)
globOptions.ignore.push(`${relative(entryDir, appResourcesFullPath)}/**`);
}
config.plugin('CopyWebpackPlugin').use(CopyWebpackPlugin, [ config.plugin('CopyWebpackPlugin').use(CopyWebpackPlugin, [
{ {
patterns: Array.from(copyRules).map((glob) => ({ patterns: Array.from(copyRules).map((glob) => ({